# HG changeset patch
# User Uwe Fischer <ufi@openoffice.org>
# Date 1299148086 -3600
# Node ID c2941bbb25d9bce0d4348e6297c7f7835d760e82
# Parent  a22158b47c13242e2b8ed81f28ff8ad91036a060
hcshared30: merge with DEV300_m101

diff --git a/helpcontent2/source/text/sdraw/04/01020000.xhp b/helpcontent2/source/text/sdraw/04/01020000.xhp
--- a/helpcontent2/source/text/sdraw/04/01020000.xhp
+++ b/helpcontent2/source/text/sdraw/04/01020000.xhp
@@ -341,8 +341,8 @@
          </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>
+               <paragraph xml-lang="en-US" id="hd_id3152484" role="tablecontent" l10n="CHG" oldref="79">Hold down <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key while dragging an object. Note: you can disable 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.</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>
diff --git a/helpcontent2/source/text/shared/00/00000020.xhp b/helpcontent2/source/text/shared/00/00000020.xhp
--- a/helpcontent2/source/text/shared/00/00000020.xhp
+++ b/helpcontent2/source/text/shared/00/00000020.xhp
@@ -56,10 +56,10 @@
 </bookmark>
 <paragraph role="heading" id="hd_id3152952" xml-lang="en-US" level="1" l10n="U" oldref="1">About Import and Export Filters</paragraph>
 <paragraph role="paragraph" id="par_id3143272" xml-lang="en-US" l10n="U" oldref="2">In $[officename], apart from its own <link href="text/shared/00/00000021.xhp" name="XML formats">XML formats</link> you can also open and save many foreign XML formats.</paragraph>
-<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="paragraph" id="par_id3152414" xml-lang="en-US" l10n="CHG" 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 document in comma separated text format that you want to open as a Calc sheet, 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 <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="paragraph" id="par_id3156211" xml-lang="en-US" l10n="CHG" 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] (except some basic Excel code); 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".
diff --git a/helpcontent2/source/text/shared/01/01100300.xhp b/helpcontent2/source/text/shared/01/01100300.xhp
--- a/helpcontent2/source/text/shared/01/01100300.xhp
+++ b/helpcontent2/source/text/shared/01/01100300.xhp
@@ -1,11 +1,11 @@
 <?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
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textshared0101100300xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Custom Properties</title>
@@ -56,5 +56,32 @@
 <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>
+
+<bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:RID_EDIT_DURATIONS:CB_NEGATIVE" id="bm_id0101" localize="false"/>
+<paragraph role="paragraph" id="par_id0101" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enable to enter a negative duration.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/sfx2:NumericField:RID_EDIT_DURATIONS:ED_YEAR" id="bm_id0102" localize="false"/>
+<paragraph role="paragraph" id="par_id0102" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the number of years.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/sfx2:NumericField:RID_EDIT_DURATIONS:ED_MONTH" id="bm_id0103" localize="false"/>
+<paragraph role="paragraph" id="par_id0103" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the number of months.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/sfx2:NumericField:RID_EDIT_DURATIONS:ED_DAY" id="bm_id0104" localize="false"/>
+<paragraph role="paragraph" id="par_id0104" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the number of days.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/sfx2:NumericField:RID_EDIT_DURATIONS:ED_HOUR" id="bm_id0105" localize="false"/>
+<paragraph role="paragraph" id="par_id0105" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the number of hours.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/sfx2:NumericField:RID_EDIT_DURATIONS:ED_MINUTE" id="bm_id0106" localize="false"/>
+<paragraph role="paragraph" id="par_id0106" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the number of minutes.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/sfx2:NumericField:RID_EDIT_DURATIONS:ED_SECOND" id="bm_id0107" localize="false"/>
+<paragraph role="paragraph" id="par_id0107" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the number of seconds.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/sfx2:NumericField:RID_EDIT_DURATIONS:ED_MSECOND" id="bm_id0108" localize="false"/>
+<paragraph role="paragraph" id="par_id0108" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the number of milliseconds.</ahelp></paragraph>
+
+<paragraph role="paragraph" id="par_id0110" xml-lang="en-US" l10n="NEW">External programs can be used to read the pairs of name and value as meta information from the saved ODF file. The meta information also gets exported to HTML meta tags when you save the document to HTML format.</paragraph>
+
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05020200.xhp b/helpcontent2/source/text/shared/01/05020200.xhp
--- a/helpcontent2/source/text/shared/01/05020200.xhp
+++ b/helpcontent2/source/text/shared/01/05020200.xhp
@@ -88,7 +88,7 @@
       </list>
 <switch select="appl">
 <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>
+<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 text in 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>
 <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>
diff --git a/helpcontent2/source/text/shared/01/05100200.xhp b/helpcontent2/source/text/shared/01/05100200.xhp
--- a/helpcontent2/source/text/shared/01/05100200.xhp
+++ b/helpcontent2/source/text/shared/01/05100200.xhp
@@ -1,11 +1,11 @@
 <?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
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textshared0105100200xhp" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Split Cells</title>
@@ -39,20 +39,18 @@
 </meta>
 <body>
 <section id="zellenteilen">
-<bookmark xml-lang="en-US" branch="hid/.uno:SplitCell" id="bm_id3525727" localize="false"/>
+
 <bookmark xml-lang="en-US" branch="hid/.uno:SplitCell" id="bm_id3147403" localize="false"/>
 <paragraph role="heading" id="hd_id3154654" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05100200.xhp" name="Split Cells">Split Cells</link></paragraph>
 <paragraph role="paragraph" id="par_id3083451" xml-lang="en-US" l10n="U" oldref="2"><variable id="teilentext"><ahelp hid=".uno:SplitCell">Splits the cell or group of cells horizontally or vertically into the number of cells that you enter.</ahelp>
 </variable></paragraph>
 </section>
 <section id="howtoget">
-<switch select="appl">
-<case select="WRITER">
-<paragraph role="paragraph" id="par_id3154024" xml-lang="en-US" l10n="U" oldref="82">Choose <emph>Table - Split Cells</emph>
+
+<paragraph role="paragraph" id="par_id3154024" xml-lang="en-US" l10n="U" oldref="82">In Writer, Impress, or Draw: Choose <emph>Table - Split Cells.</emph>
 </paragraph>
-</case>
-</switch>
-<paragraph role="paragraph" id="par_id3154042" xml-lang="en-US" l10n="U" oldref="83">On the <emph>Table</emph> Bar, click</paragraph>
+
+<paragraph role="paragraph" id="par_id3154042" xml-lang="en-US" l10n="U" oldref="83">In Writer, Impress, or Draw: On the <emph>Table</emph> Bar, click</paragraph>
 <section id="syzellenteilen">
 <table id="tbl_id3149972">
 <tablerow>
@@ -70,16 +68,20 @@
 </section>
 </section>
 <!-- removed HID SW_NUMERICFIELD_DLG_SPLIT_ED_COUNT -->
+<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVX_SPLITCELLDLG:ED_COUNT" id="bm_id35251212727" localize="false"/>
 <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>
 <!-- removed HID SW_IMAGERADIOBUTTON_DLG_SPLIT_RB_HORZ -->
+<bookmark xml-lang="en-US" branch="hid/cui:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_HORZ" id="bm_id3333525727" localize="false"/>
 <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>
 <!-- removed HID SW_CHECKBOX_DLG_SPLIT_CB_PROP -->
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVX_SPLITCELLDLG:CB_PROP" id="bm_id3525734527" localize="false"/>
 <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>
 <!-- removed HID SW_IMAGERADIOBUTTON_DLG_SPLIT_RB_VERT -->
+<bookmark xml-lang="en-US" branch="hid/cui:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_VERT" id="bm_id3529875727" localize="false"/>
 <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/05220000.xhp b/helpcontent2/source/text/shared/01/05220000.xhp
--- a/helpcontent2/source/text/shared/01/05220000.xhp
+++ b/helpcontent2/source/text/shared/01/05220000.xhp
@@ -6,7 +6,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2000, 2011 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
@@ -103,6 +103,6 @@
 <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="CHG" oldref="28"><ahelp hid=".">Anchors the text to the full width of the drawing object or text object.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150244" role="paragraph" l10n="CHG" oldref="28"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_FULL_WIDTH">Distributes multiple line text over the full width of the drawing or text object. If not enabled, the text will be restricted to a rectangle with narrower margins than the object.</ahelp></paragraph>
    </body>
 </helpdocument>
\ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/grid.xhp b/helpcontent2/source/text/shared/01/grid.xhp
old mode 100755
new mode 100644
--- a/helpcontent2/source/text/shared/01/grid.xhp
+++ b/helpcontent2/source/text/shared/01/grid.xhp
@@ -7,7 +7,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2000, 2011 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
@@ -52,7 +52,8 @@
 <paragraph role="heading" id="par_idN1057E" xml-lang="en-US" level="2" l10n="NEW">Display Grid</paragraph>
 <paragraph role="paragraph" id="par_idN10582" xml-lang="en-US" l10n="NEW">Displays or hides grid lines that you can use to align objects such as graphics on a page.</paragraph>
 <paragraph role="heading" id="par_idN10585" xml-lang="en-US" level="2" l10n="NEW">Snap to Grid</paragraph>
-<comment>issue 112000 for new key</comment><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">Option key</caseinline><defaultinline>Alt 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_idN10589" xml-lang="en-US" l10n="NEW">Automatically aligns objects to vertical and horizontal grid lines. To override this feature in Impress/Draw, hold down the <switchinline select="sys"><caseinline select="MAC">Option key</caseinline><defaultinline>Alt key</defaultinline></switchinline> when you drag an object.</paragraph>
+<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 <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>
diff --git a/helpcontent2/source/text/shared/01/guides.xhp b/helpcontent2/source/text/shared/01/guides.xhp
old mode 100755
new mode 100644
--- a/helpcontent2/source/text/shared/01/guides.xhp
+++ b/helpcontent2/source/text/shared/01/guides.xhp
@@ -7,7 +7,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2000, 2011 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
@@ -52,7 +52,8 @@
 <paragraph role="heading" id="par_idN1057B" xml-lang="en-US" level="2" l10n="NEW">Display Guides</paragraph>
 <paragraph role="paragraph" id="par_idN1057F" xml-lang="en-US" l10n="NEW">Displays or hides guides that you can use to align objects on a page.</paragraph>
 <paragraph role="heading" id="par_idN10582" xml-lang="en-US" level="2" l10n="NEW">Snap to Guides</paragraph>
-<comment>changed in BetterDefaults_Gridhandling issue 112000</comment><paragraph role="paragraph" id="par_idN10586" xml-lang="en-US" l10n="CHG">Automatically aligns objects to vertical and horizontal guides. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Option key</caseinline><defaultinline>Alt key </defaultinline></switchinline>when you drag an object.<comment>UFI: test it! copied from shared\01\grid.xhp</comment></paragraph><comment>UFI: removed double help id</comment><paragraph role="heading" id="par_idN105C6" xml-lang="en-US" level="2" l10n="NEW">Guides to Front</paragraph>
+<paragraph role="paragraph" id="par_idN10586" xml-lang="en-US" l10n="CHG">Automatically aligns objects to vertical and horizontal guides. To override this feature in Impress/Draw, hold down the <switchinline select="sys"><caseinline select="MAC">Option key</caseinline><defaultinline>Alt key</defaultinline></switchinline> when you drag an object.<comment>UFI: renaissance changed ctrl to alt keys</comment></paragraph>
+<paragraph role="heading" id="par_idN105C6" xml-lang="en-US" level="2" l10n="NEW">Guides to Front</paragraph>
 <paragraph role="paragraph" id="par_idN105CA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays the guides in front of the objects on the slide or page.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp b/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp
--- a/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp
+++ b/helpcontent2/source/text/shared/guide/hyperlink_edit.xhp
@@ -6,8 +6,8 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * Copyright 2000, 2011 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
@@ -59,7 +59,7 @@
 <paragraph role="listitem" id="par_id1983092" xml-lang="en-US" l10n="NEW">If you leave the hyperlink by entering a space character directly following the last character, the AutoCorrect - if enabled - will change the target URL to be the same as the visible text.</paragraph>
 <list type="unordered">
 <listitem>
-<paragraph role="listitem" id="par_id333262" xml-lang="en-US" l10n="NEW">In all document types, you can open the Hyperlink dialog to edit a hyperlink. First set the cursor into the hyperlink or directly in front of the hyperlink, then click the Hyperlink icon on the Standard bar.</paragraph>
+<paragraph role="listitem" id="par_id333262" xml-lang="en-US" l10n="CHG">In all document types, you can open the Hyperlink dialog to edit a hyperlink. First set the cursor into the hyperlink (Writer) or directly in front of the hyperlink (Calc) or select the whole hyperlink (Impress and Draw), then click the Hyperlink icon on the Standard bar.</paragraph>
 </listitem>
 </list>
 <paragraph role="heading" id="hd_id3158432" xml-lang="en-US" level="2" l10n="U" oldref="30">Change the URL of a hyperlink as follows</paragraph>
@@ -70,9 +70,11 @@
 </list>
 <list type="unordered">
 <listitem>
-<paragraph role="listitem" id="par_id3145119" xml-lang="en-US" l10n="CHG" oldref="32">Option 2: Open <link href="text/shared/main0209.xhp" name="Hyperlink Bar">Hyperlink Bar</link> (<emph>View - Toolbars - Hyperlink Bar</emph>). Click on the hyperlink, do not release the mouse button and drag the hyperlink to the Hyperlink Bar. Edit the URL on the Hyperlink Bar and press the Return key.</paragraph>
+<paragraph role="listitem" id="par_id3145119" xml-lang="en-US" l10n="CHG" oldref="32">Option 2: Open <link href="text/shared/main0209.xhp" name="Hyperlink Bar">Hyperlink Bar</link> (<emph>View - Toolbars - Hyperlink Bar</emph>).</paragraph>
 </listitem>
 </list>
+<paragraph role="paragraph" id="par_id3148943444" xml-lang="en-US" l10n="NEW">To remove the link and leave the visible text, you select the link and choose Format - Default Formatting.</paragraph>
+
 <paragraph role="heading" id="hd_id3148686" xml-lang="en-US" level="2" l10n="U" oldref="33">Change the attribute of all hyperlinks</paragraph>
 <list type="ordered">
 <listitem>
diff --git a/helpcontent2/source/text/shared/guide/print_blackwhite.xhp b/helpcontent2/source/text/shared/guide/print_blackwhite.xhp
--- a/helpcontent2/source/text/shared/guide/print_blackwhite.xhp
+++ b/helpcontent2/source/text/shared/guide/print_blackwhite.xhp
@@ -1,11 +1,11 @@
 <?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
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textsharedguideprint_blackwhitexml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Printing in Black and White</title>
@@ -91,7 +91,7 @@
             <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_id3154910" role="listitem" l10n="CHG" oldref="22">Under <emph>Contents,</emph> mark <emph>Print text in 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>
diff --git a/helpcontent2/source/text/shared/optionen/01030300.xhp b/helpcontent2/source/text/shared/optionen/01030300.xhp
--- a/helpcontent2/source/text/shared/optionen/01030300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01030300.xhp
@@ -76,7 +76,7 @@
 <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/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="paragraph" id="par_id79042" xml-lang="en-US" l10n="CHG"><ahelp hid=".">If enabled, you must hold down the Ctrl key while clicking a hyperlink in a text document 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/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>
diff --git a/helpcontent2/source/text/shared/optionen/01040400.xhp b/helpcontent2/source/text/shared/optionen/01040400.xhp
--- a/helpcontent2/source/text/shared/optionen/01040400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040400.xhp
@@ -6,7 +6,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2000, 2011 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
@@ -86,11 +86,11 @@
 <bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_BACKGROUND" id="bm_id3999210" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153968" role="heading" level="2" l10n="CHG" oldref="13">Page 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/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="CHG" oldref="40">Print text in 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>
@@ -117,8 +117,8 @@
       <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"/>
 <comment>
-<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>
 </comment>
@@ -127,7 +127,7 @@
 <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/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>
diff --git a/helpcontent2/source/text/shared/optionen/01050100.xhp b/helpcontent2/source/text/shared/optionen/01050100.xhp
--- a/helpcontent2/source/text/shared/optionen/01050100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01050100.xhp
@@ -6,7 +6,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2000, 2011 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
@@ -55,10 +55,10 @@
 <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
+         <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 in Impress/Draw, drag an object while holding down the <switchinline select="sys"><caseinline select="MAC">Control key
 </caseinline><defaultinline>Ctrl key</defaultinline></switchinline>.</paragraph>
       </section>
-<bookmark xml-lang="en-US" branch="hid/.uno:GridVisible" 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 xml-lang="en-US" id="hd_id3153824" role="heading" level="3" l10n="U" oldref="7">Visible grid</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01070300.xhp b/helpcontent2/source/text/shared/optionen/01070300.xhp
--- a/helpcontent2/source/text/shared/optionen/01070300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070300.xhp
@@ -6,7 +6,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2000, 2011 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
@@ -50,7 +50,7 @@
          <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>
+      <paragraph xml-lang="en-US" id="par_id3149177" role="paragraph" l10n="CHG" 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 key</caseinline><defaultinline>Alt key</defaultinline></switchinline> 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/.uno:HelplinesUse" id="bm_id3147335" localize="false"/>
diff --git a/helpcontent2/source/text/shared/optionen/01140000.xhp b/helpcontent2/source/text/shared/optionen/01140000.xhp
--- a/helpcontent2/source/text/shared/optionen/01140000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01140000.xhp
@@ -70,7 +70,7 @@
       <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_idN106E2" role="paragraph" l10n="CHG"><ahelp hid=".">When you press the decimal separator key on the number pad, then a comma or period as shown is inserted.</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"
diff --git a/helpcontent2/source/text/simpress/01/02110000.xhp b/helpcontent2/source/text/simpress/01/02110000.xhp
--- a/helpcontent2/source/text/simpress/01/02110000.xhp
+++ b/helpcontent2/source/text/simpress/01/02110000.xhp
@@ -6,7 +6,7 @@
  ***********************************************************************
  *
  * 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
@@ -55,7 +55,7 @@
 </section>
 <paragraph role="tip" id="par_id3156448" xml-lang="en-US" l10n="CHG" oldref="48">Press <item type="keycode">Ctrl+Shift+F5</item> to open the Navigator when you are editing a presentation.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SD_HID_SD_NAVIGATOR_TBI_PEN" id="bm_id3150538" localize="false"/><paragraph role="heading" id="hd_id3145235" xml-lang="en-US" level="2" l10n="U" oldref="8">Pointer</paragraph>
-<paragraph role="paragraph" id="par_id3157874" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_SD_NAVIGATOR_TBI_PEN">Switches the mouse pointer to a pen that you can use to write on slides during a slide show.</ahelp> You cannot change the color of the pen.</paragraph>
+<paragraph role="paragraph" id="par_id3157874" xml-lang="en-US" l10n="CHG" oldref="9"><ahelp hid=".">Switches the mouse pointer to a pen that you can use to write on slides during a slide show.</ahelp> The color and width of the pen can be changed using the context menu.</paragraph>
 <table id="tbl_id3150651">
 <tablerow>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/simpress/01/06080000.xhp b/helpcontent2/source/text/simpress/01/06080000.xhp
--- a/helpcontent2/source/text/simpress/01/06080000.xhp
+++ b/helpcontent2/source/text/simpress/01/06080000.xhp
@@ -95,7 +95,7 @@
 <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>
+<paragraph role="note" id="par_id3150475" xml-lang="en-US" l10n="CHG" oldref="19">Anything you write with the pen is not saved when you exit the slide show. The color and width of the pen can be changed using the context menu. Choose Erase All Ink On Slide from the context menu to remove the mouse markings.</paragraph>
 <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>
diff --git a/helpcontent2/source/text/simpress/02/10020000.xhp b/helpcontent2/source/text/simpress/02/10020000.xhp
--- a/helpcontent2/source/text/simpress/02/10020000.xhp
+++ b/helpcontent2/source/text/simpress/02/10020000.xhp
@@ -5,7 +5,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2000, 2011 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
@@ -34,10 +34,6 @@
 <title id="tit" xml-lang="en-US">Zoom</title>
 <filename>/text/simpress/02/10020000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-04-29T11:48:00">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="zoom">
@@ -48,7 +44,6 @@
 <bookmark_value>views; shift function</bookmark_value>
 <bookmark_value>hand icon for moving slides</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:ZoomToolBox" id="bm_id2780843" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ZoomToolBox" id="bm_id3147436" localize="false"/>
 <paragraph role="heading" id="hd_id3159153" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/02/10020000.xhp" name="Zoom">Zoom</link></paragraph>
 <paragraph role="paragraph" id="par_id3147339" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:ZoomToolBox">Reduces or enlarges the screen display of the current document. Click the arrow next to the icon to open the <emph>Zoom</emph> toolbar.</ahelp></paragraph>
@@ -83,7 +78,6 @@
 </table>
 
 </section>
-<bookmark xml-lang="en-US" branch="hid/.uno:ZoomPlus" id="bm_id1487383" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ZoomPlus" id="bm_id3157900" localize="false"/>
 <paragraph role="heading" id="hd_id3150537" xml-lang="en-US" level="2" l10n="U" oldref="7">Zoom In</paragraph>
 <paragraph role="paragraph" id="par_id3157906" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid=".uno:ZoomPlus">Displays the slide at two times its current size.</ahelp></paragraph>
@@ -100,7 +94,7 @@
 </tablecell>
 </tablerow>
 </table>
-
+<bookmark xml-lang="en-US" branch="hid/.uno:ZoomMinus" id="bm_id9029511" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ZoomIn" id="bm_id3155931" localize="false"/>
 <paragraph role="heading" id="hd_id3145167" xml-lang="en-US" level="2" l10n="U" oldref="12">Zoom Out</paragraph>
 <paragraph role="paragraph" id="par_id3153734" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid=".">Displays the slide at half its current size.</ahelp></paragraph>
@@ -117,7 +111,6 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/.uno:Zoom100Percent" id="bm_id8510910" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Zoom100Percent" id="bm_id3149025" localize="false"/>
 <paragraph role="heading" id="hd_id3156060" xml-lang="en-US" level="2" l10n="U" oldref="16">Zoom 100%</paragraph>
 <paragraph role="paragraph" id="par_id3149031" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid=".uno:Zoom100Percent">Displays the slide at its actual size.</ahelp></paragraph>
@@ -134,7 +127,6 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/.uno:ZoomPrevious" id="bm_id7891597" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ZoomPrevious" id="bm_id3149450" localize="false"/>
 <paragraph role="heading" id="hd_id3150964" xml-lang="en-US" level="2" l10n="U" oldref="19">Previous Zoom</paragraph>
 <paragraph role="paragraph" id="par_id3152926" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid=".uno:ZoomPrevious">Returns the display of the slide to the previous zoom factor you applied.</ahelp> You can also press <switchinline select="sys"><caseinline select="MAC">Command
@@ -152,7 +144,6 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/.uno:ZoomNext" id="bm_id3385016" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ZoomNext" id="bm_id3149291" localize="false"/>
 <paragraph role="heading" id="hd_id3153151" xml-lang="en-US" level="2" l10n="U" oldref="22">Next Zoom</paragraph>
 <paragraph role="paragraph" id="par_id3143228" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid=".uno:ZoomNext">Undoes the action of the <emph>Previous Zoom </emph>command.</ahelp> You can also press <switchinline select="sys"><caseinline select="MAC">Command
@@ -170,7 +161,6 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/.uno:ZoomPage" id="bm_id8340372" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ZoomPage" id="bm_id3147508" localize="false"/>
 <paragraph role="heading" id="hd_id3154260" xml-lang="en-US" level="2" l10n="U" oldref="25">Zoom Page</paragraph>
 <paragraph role="paragraph" id="par_id3153582" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid=".uno:ZoomPage">Displays the entire slide on your screen.</ahelp></paragraph>
@@ -187,7 +177,6 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/.uno:ZoomPageWidth" id="bm_id7170534" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ZoomPageWidth" id="bm_id3154610" localize="false"/>
 <paragraph role="heading" id="hd_id3154599" xml-lang="en-US" level="2" l10n="U" oldref="28">Zoom Page Width</paragraph>
 <paragraph role="paragraph" id="par_id3153530" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid=".uno:ZoomPageWidth">Displays the complete width of the slide. The top and bottom edges of the slide may not be visible.</ahelp></paragraph>
@@ -204,7 +193,6 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/.uno:ZoomOptimal" id="bm_id9218296" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ZoomOptimal" id="bm_id3153779" localize="false"/>
 <paragraph role="heading" id="hd_id3151108" xml-lang="en-US" level="2" l10n="U" oldref="31">Optimal</paragraph>
 <paragraph role="paragraph" id="par_id3146135" xml-lang="en-US" l10n="U" oldref="32"><ahelp hid=".uno:ZoomOptimal">Resizes the display to include all of the objects on the slide.</ahelp></paragraph>
@@ -221,7 +209,6 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/.uno:ZoomObjects" id="bm_id2919366" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ZoomObjects" id="bm_id3156212" localize="false"/>
 <paragraph role="heading" id="hd_id3156202" xml-lang="en-US" level="2" l10n="U" oldref="34">Object Zoom</paragraph>
 <paragraph role="paragraph" id="par_id3151277" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid=".uno:ZoomObjects">Resizes the display to fit the object(s) you selected.</ahelp></paragraph>
@@ -238,7 +225,6 @@
 </tablerow>
 </table>
 
-<bookmark xml-lang="en-US" branch="hid/.uno:ZoomPanning" id="bm_id3625141" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:ZoomPanning" id="bm_id3148994" localize="false"/>
 <paragraph role="heading" id="hd_id3155188" xml-lang="en-US" level="2" l10n="U" oldref="37">Shift</paragraph>
 <paragraph role="paragraph" id="par_id3149488" xml-lang="en-US" l10n="CHG" oldref="38"><ahelp hid=".uno:ZoomPanning">Moves the slide within the $[officename] window.</ahelp> Place the pointer on the slide, and drag to move the slide. When you release the mouse, the last tool you used is selected.</paragraph>
diff --git a/helpcontent2/source/text/smath/01/06010000.xhp b/helpcontent2/source/text/smath/01/06010000.xhp
--- a/helpcontent2/source/text/smath/01/06010000.xhp
+++ b/helpcontent2/source/text/smath/01/06010000.xhp
@@ -65,5 +65,7 @@
 <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"/>
+<bookmark xml-lang="en-US" branch="hid/starmath:PushButton:RID_SYMBOLDIALOG:3" id="bm_id3143326964" localize="false"/><comment>Close button: don't show any extended help</comment>
+<bookmark xml-lang="en-US" branch="hid/STARMATH_HID_SMA_CONTROL_SYMBOLSET_VIEW" id="bm_id311236964" localize="false"/><comment>View: don't show any extended help</comment>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/swriter/02/10020000.xhp b/helpcontent2/source/text/swriter/02/10020000.xhp
--- a/helpcontent2/source/text/swriter/02/10020000.xhp
+++ b/helpcontent2/source/text/swriter/02/10020000.xhp
@@ -5,7 +5,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2000, 2011 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
diff --git a/helpcontent2/source/text/swriter/main0503.xhp b/helpcontent2/source/text/swriter/main0503.xhp
old mode 100755
new mode 100644
--- a/helpcontent2/source/text/swriter/main0503.xhp
+++ b/helpcontent2/source/text/swriter/main0503.xhp
@@ -1,11 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<helpdocument version="1.0">
-	
-<!--
-***********************************************************************
+<?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
@@ -27,41 +24,38 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************
- -->
+ ************************************************************************ -->
  
-	
 <meta>
-<topic id="textswritermain0503xml" indexer="include">
-<title id="tit" xml-lang="en-US">$[officename] Writer Features</title>
+<topic id="textswritermain0503xml" indexer="include" status="PUBLISH">
+<title xml-lang="en-US" id="tit">$[officename] Writer Features</title>
 <filename>/text/swriter/main0503.xhp</filename>
 </topic>
 </meta>
 <body>
 <section id="waskann">
-<paragraph role="heading" id="hd_id3154243" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="main0503"><link href="text/swriter/main0503.xhp" name="$[officename] Writer Features">$[officename] Writer Features</link>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154263" xml-lang="en-US" l10n="CHG" oldref="2">$[officename] Writer lets you design and produce text documents that can include graphics, tables, or charts. You can then save the documents in a variety of formats, including the standardized OpenDocument format (ODF), Microsoft Word .doc format, or HTML. And you can easily export your document to the Portable Document Format (PDF).</paragraph>
+<paragraph id="hd_id3154243" role="heading" xml-lang="en-US" level="1"><variable id="main0503"><link href="text/swriter/main0503.xhp" name="$[officename] Writer Features">$[officename] Writer Features</link></variable></paragraph>
+<paragraph id="par_id3154263" role="paragraph" xml-lang="en-US">$[officename] Writer lets you design and produce text documents that can include graphics, tables, or charts. You can then save the documents in a variety of formats, including the standardized OpenDocument format (ODF), Microsoft Word .doc format, or HTML. And you can easily export your document to the Portable Document Format (PDF).</paragraph>
 </section>
-<paragraph role="heading" id="hd_id3147755" xml-lang="en-US" level="2" l10n="U" oldref="4">Writing</paragraph>
-<paragraph role="paragraph" id="par_id3147768" xml-lang="en-US" l10n="U" oldref="5">$[officename] Writer lets you create both basic documents, such as memos, <link href="text/shared/guide/fax.xhp" name="faxes">faxes</link>, letters , resumes and <link href="text/swriter/01/01150000.xhp" name="merge documents">merge documents</link>, as well as long and complex or multi-part documents, complete with bibliographies, reference tables and indexes.</paragraph>
-<paragraph role="paragraph" id="par_id3147797" xml-lang="en-US" l10n="U" oldref="29">$[officename] Writer also includes such useful features as a <link href="text/shared/01/06010000.xhp" name="spellchecker">spellchecker</link>, a <link href="text/swriter/guide/using_thesaurus.xhp" name="thesaurus">thesaurus</link>, <link href="text/shared/01/06040000.xhp" name="AutoCorrect">AutoCorrect</link>, and <link href="text/swriter/01/06030000.xhp" name="Hyphenation">hyphenation</link> as well as a variety of <link href="text/shared/01/01010100.xhp" name="templates">templates</link> for almost every purpose. You can also create your own templates using the wizards.</paragraph>
-<paragraph role="heading" id="hd_id3147225" xml-lang="en-US" level="2" l10n="U" oldref="9">Designing and Structuring</paragraph>
-<paragraph role="paragraph" id="par_id3147239" xml-lang="en-US" l10n="U" oldref="10">$[officename] offers a wide variety of options to design documents. Use the <link href="text/swriter/01/05140000.xhp" name="Styles">Styles and Formatting window</link> to create, assign and modify styles for paragraphs, individual characters, frames and pages. In addition, the <link href="text/swriter/01/02110000.xhp" name="Navigator">Navigator</link> helps you to quickly move around inside your documents, lets you look at your document in an outline view, and keeps track of the objects that you have inserted into your document.</paragraph>
-<paragraph role="paragraph" id="par_id3147272" xml-lang="en-US" l10n="U" oldref="12">You can also create various <link href="text/swriter/01/04120000.xhp" name="indexes and tables">indexes and tables</link> in text documents. You can define the structure and appearance of the indexes and tables according to your individual needs. Live hyperlinks and bookmarks let you jump directly to the corresponding items in the text.</paragraph>
-<paragraph role="heading" id="hd_id3145596" xml-lang="en-US" level="2" l10n="U" oldref="30">Desktop Publishing with $[officename] Writer</paragraph>
-<paragraph role="paragraph" id="par_id3145610" xml-lang="en-US" l10n="U" oldref="31">$[officename] Writer contains numerous desktop publishing and drawing tools to assist you in creating professionally styled documents, such as brochures, newsletters and invitations. You can format your documents with multi-column layouts, <link href="text/swriter/guide/text_frame.xhp" name="text frames">text frames</link>, <link href="text/swriter/guide/insert_graphic.xhp" name="graphics">graphics</link>, <link href="text/swriter/guide/table_insert.xhp" name="tables">tables</link>, and other objects.</paragraph>
-<paragraph role="heading" id="hd_id3145649" xml-lang="en-US" level="2" l10n="U" oldref="13">Calculations</paragraph>
-<paragraph role="paragraph" id="par_id3145663" xml-lang="en-US" l10n="U" oldref="14">Text documents in $[officename] have an integrated <link href="text/swriter/main0214.xhp" name="calculation function">calculation function</link> that helps you execute sophisticated calculations or logical links. You can easily create a table in a text document in order to perform calculations.</paragraph>
-<paragraph role="heading" id="hd_id3151192" xml-lang="en-US" level="2" l10n="U" oldref="15">Creating Drawings</paragraph>
-<paragraph role="paragraph" id="par_id3151206" xml-lang="en-US" l10n="U" oldref="16">The $[officename] Writer <link href="text/shared/02/01140000.xhp" name="drawing tool">drawing tool</link> lets you create drawings, graphics, legends, and other types of drawings directly in text documents.</paragraph>
-<paragraph role="heading" id="hd_id3151229" xml-lang="en-US" level="2" l10n="U" oldref="17">Inserting Graphics</paragraph>
-<paragraph role="paragraph" id="par_id3151243" xml-lang="en-US" l10n="CHG" oldref="18">You can insert pictures with <link href="text/shared/00/00000020.xhp" name="different formats">different formats</link> into a text document, including graphics with a JPG or GIF format. In addition, the <link href="text/shared/01/gallery.xhp" name="Gallery">Gallery</link> provides a collection of clipart graphics, and the <link href="text/shared/guide/fontwork.xhp">Fontwork Gallery</link> creates stunning font effects.</paragraph>
-<paragraph role="heading" id="hd_id3155084" xml-lang="en-US" level="2" l10n="U" oldref="21">Flexible Application Interface</paragraph>
-<paragraph role="paragraph" id="par_id3155098" xml-lang="en-US" l10n="U" oldref="22">The program interface is designed so that you can configure it according to your preferences, including customizing icons and menus. You can position various program windows, such as the Styles and Formatting window or the Navigator as floating windows anywhere on the screen. You can also <link href="text/shared/guide/autohide.xhp" name="dock">dock</link> some windows to the edge of the workspace.</paragraph>
-<paragraph role="heading" id="hd_id3155123" xml-lang="en-US" level="2" l10n="U" oldref="23">Drag&amp;Drop</paragraph>
-<paragraph role="paragraph" id="par_id3155137" xml-lang="en-US" l10n="U" oldref="24">The <link href="text/shared/guide/dragdrop.xhp" name="drag-and-drop">drag-and-drop</link> feature enables you to work quickly and efficiently with text documents in $[officename]. For example, you can drag-and-drop objects, such as graphics from the Gallery, from one location to another in the same document, or between open $[officename] documents.</paragraph>
-<paragraph role="heading" id="hd_id3155162" xml-lang="en-US" level="2" l10n="CHG" oldref="27">Help Functions</paragraph>
-<paragraph role="paragraph" id="par_id3145675" xml-lang="en-US" l10n="CHG" oldref="28">You can use the <link href="text/shared/05/00000110.xhp" name="Help system">Help system</link> as a complete reference for $[officename] applications, including <link href="text/swriter/guide/main.xhp" name="instructions">instructions</link> for simple and complex tasks.</paragraph>
+<paragraph id="hd_id3147755" role="heading" xml-lang="en-US" level="2">Writing</paragraph>
+<paragraph id="par_id3147768" role="paragraph" xml-lang="en-US">$[officename] Writer lets you create both basic documents, such as memos, <link href="text/shared/guide/fax.xhp" name="faxes">faxes</link>, letters , resumes and <link href="text/swriter/01/01150000.xhp" name="merge documents">merge documents</link>, as well as long and complex or multi-part documents, complete with bibliographies, reference tables and indexes.</paragraph>
+<paragraph id="par_id3147797" role="paragraph" xml-lang="en-US">$[officename] Writer also includes such useful features as a <link href="text/shared/01/06010000.xhp" name="spellchecker">spellchecker</link>, a <link href="text/swriter/guide/using_thesaurus.xhp" name="thesaurus">thesaurus</link>, <link href="text/shared/01/06040000.xhp" name="AutoCorrect">AutoCorrect</link>, and <link href="text/swriter/01/06030000.xhp" name="Hyphenation">hyphenation</link> as well as a variety of <link href="text/shared/01/01010100.xhp" name="templates">templates</link> for almost every purpose. You can also create your own templates using the wizards.</paragraph>
+<paragraph id="hd_id3147225" role="heading" xml-lang="en-US" level="2">Designing and Structuring</paragraph>
+<paragraph id="par_id3147239" role="paragraph" xml-lang="en-US">$[officename] offers a wide variety of options to design documents. Use the <link href="text/swriter/01/05140000.xhp" name="Styles">Styles and Formatting window</link> to create, assign and modify styles for paragraphs, individual characters, frames and pages. In addition, the <link href="text/swriter/01/02110000.xhp" name="Navigator">Navigator</link> helps you to quickly move around inside your documents, lets you look at your document in an outline view, and keeps track of the objects that you have inserted into your document.</paragraph>
+<paragraph id="par_id3147272" role="paragraph" xml-lang="en-US">You can also create various <link href="text/swriter/01/04120000.xhp" name="indexes and tables">indexes and tables</link> in text documents. You can define the structure and appearance of the indexes and tables according to your individual needs. Live hyperlinks and bookmarks let you jump directly to the corresponding items in the text.</paragraph>
+<paragraph id="hd_id3145596" role="heading" xml-lang="en-US" level="2">Desktop Publishing with $[officename] Writer</paragraph>
+<paragraph id="par_id3145610" role="paragraph" xml-lang="en-US">$[officename] Writer contains numerous desktop publishing and drawing tools to assist you in creating professionally styled documents, such as brochures, newsletters and invitations. You can format your documents with multi-column layouts, <link href="text/swriter/guide/text_frame.xhp" name="text frames">text frames</link>, <link href="text/swriter/guide/insert_graphic.xhp" name="graphics">graphics</link>, <link href="text/swriter/guide/table_insert.xhp" name="tables">tables</link>, and other objects.</paragraph>
+<paragraph id="hd_id3145649" role="heading" xml-lang="en-US" level="2">Calculations</paragraph>
+<paragraph id="par_id3145663" role="paragraph" xml-lang="en-US">Text documents in $[officename] have an integrated <link href="text/swriter/main0214.xhp" name="calculation function">calculation function</link> that helps you execute sophisticated calculations or logical links. You can easily create a table in a text document in order to perform calculations.</paragraph>
+<paragraph id="hd_id3151192" role="heading" xml-lang="en-US" level="2">Creating Drawings</paragraph>
+<paragraph id="par_id3151206" role="paragraph" xml-lang="en-US">The $[officename] Writer <link href="text/shared/02/01140000.xhp" name="drawing tool">drawing tool</link> lets you create drawings, graphics, legends, and other types of drawings directly in text documents.</paragraph>
+<paragraph id="hd_id3151229" role="heading" xml-lang="en-US" level="2">Inserting Graphics</paragraph>
+<paragraph id="par_id3151243" role="paragraph" xml-lang="en-US">You can insert pictures with <link href="text/shared/00/00000020.xhp" name="different formats">different formats</link> into a text document, including graphics with a JPG or GIF format. In addition, the <link href="text/shared/01/gallery.xhp" name="Gallery">Gallery</link> provides a collection of clipart graphics, and the <link href="text/shared/guide/fontwork.xhp">Fontwork Gallery</link> creates stunning font effects.</paragraph>
+<paragraph id="hd_id3155084" role="heading" xml-lang="en-US" level="2">Flexible Application Interface</paragraph>
+<paragraph id="par_id3155098" role="paragraph" xml-lang="en-US">The program interface is designed so that you can configure it according to your preferences, including customizing icons and menus. You can position various program windows, such as the Styles and Formatting window or the Navigator as floating windows anywhere on the screen. You can also <link href="text/shared/guide/autohide.xhp" name="dock">dock</link> some windows to the edge of the workspace.</paragraph>
+<paragraph id="hd_id3155123" role="heading" xml-lang="en-US" level="2">Drag&amp;Drop</paragraph>
+<paragraph id="par_id3155137" role="paragraph" xml-lang="en-US">The <link href="text/shared/guide/dragdrop.xhp" name="drag-and-drop">drag-and-drop</link> feature enables you to work quickly and efficiently with text documents in $[officename]. For example, you can drag-and-drop objects, such as graphics from the Gallery, from one location to another in the same document, or between open $[officename] documents.</paragraph>
+<paragraph id="hd_id3155162" role="heading" xml-lang="en-US" level="2">Help Functions</paragraph>
+<paragraph id="par_id3145675" role="paragraph" xml-lang="en-US">You can use the <link href="text/shared/05/00000110.xhp" name="Help system">Help system</link> as a complete reference for $[officename] applications, including <link href="text/swriter/guide/main.xhp" name="instructions">instructions</link> for simple and complex tasks.</paragraph>
 </body>
-</helpdocument>
+</helpdocument>
\ No newline at end of file
