hcshared26: merge with DEV300_m79 second try

1 files changed, 4 insertions, 4 deletions

diff --git a/helpcontent2/source/text/swriter/01/02110100.xhp b/helpcontent2/source/text/swriter/01/02110100.xhp
index c027ea6fa8..416b83b53d 100644
--- a/helpcontent2/source/text/swriter/01/02110100.xhp
+++ b/helpcontent2/source/text/swriter/01/02110100.xhp
@@ -4,7 +4,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
@@ -29,7 +29,7 @@
  ************************************************************************-->
 
 
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textswriter0102110100xml" indexer="include" status="PUBLISH">
@@ -56,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>
@@ -97,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"/>