Merge branch 'master' into feature/gnumake4 feature/gnumake4

14 files changed, 19 insertions, 138 deletions

diff --git a/helpcontent2/source/text/sbasic/shared/02/11040000.xhp b/helpcontent2/source/text/sbasic/shared/02/11040000.xhp
index 4955c1a9a7..54bf40de04 100644
--- a/helpcontent2/source/text/sbasic/shared/02/11040000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/11040000.xhp
@@ -55,7 +55,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3146797" xml-lang="en-US" l10n="E">
-<image id="img_id3148538" src="cmd/sc_stop.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148538" xml-lang="en-US">Icon</alt>
+<image id="img_id3148538" src="cmd/sc_basicstop.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148538" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/scalc/01/02110000.xhp b/helpcontent2/source/text/scalc/01/02110000.xhp
index e2e84bc15e..502a41198a 100644
--- a/helpcontent2/source/text/scalc/01/02110000.xhp
+++ b/helpcontent2/source/text/scalc/01/02110000.xhp
@@ -147,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">Icon</alt>
+<image id="img_id3159256" src="sc/imglst/navipi/na07.png" width="0.2228in" height="0.2228in"><alt id="alt_id3159256" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell>
diff --git a/helpcontent2/source/text/scalc/01/02150000.xhp b/helpcontent2/source/text/scalc/01/02150000.xhp
index 38d70ba0a6..6f1bc4e4fa 100644
--- a/helpcontent2/source/text/scalc/01/02150000.xhp
+++ b/helpcontent2/source/text/scalc/01/02150000.xhp
@@ -52,8 +52,8 @@
 <section id="howtoget">
   <embed href="text/scalc/00/00000402.xhp#binhalt"/>
 </section>
-<paragraph role="tip" id="par_id3159154" xml-lang="en-US" l10n="U" oldref="21">This dialog is also called by pressing Del after the cell cursor has been activated on the sheet.</paragraph>
-<paragraph role="tip" id="par_id3145367" xml-lang="en-US" l10n="U" oldref="22">Pressing Backspace deletes content without calling the dialog or changing formats.</paragraph>
+<paragraph role="tip" id="par_id3159154" xml-lang="en-US" l10n="U" oldref="21">This dialog is also called by pressing Backspace after the cell cursor has been activated on the sheet.</paragraph>
+<paragraph role="tip" id="par_id3145367" xml-lang="en-US" l10n="U" oldref="22">Pressing Delete deletes content without calling the dialog or changing formats.</paragraph>
 <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>
diff --git a/helpcontent2/source/text/scalc/02/06040000.xhp b/helpcontent2/source/text/scalc/02/06040000.xhp
index a6b4cd96b0..25a9e0dc09 100644
--- a/helpcontent2/source/text/scalc/02/06040000.xhp
+++ b/helpcontent2/source/text/scalc/02/06040000.xhp
@@ -50,7 +50,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3153770" xml-lang="en-US" l10n="E">
-<image id="img_id3145785" src="sc/res/imglst/apptbx/sc26049.png" width="5.64mm" height="5.64mm"><alt id="alt_id3145785" xml-lang="en-US">Icon</alt>
+<image id="img_id3145785" src="sc/imglst/sc26049.png" width="5.64mm" height="5.64mm"><alt id="alt_id3145785" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/scalc/guide/scenario.xhp b/helpcontent2/source/text/scalc/guide/scenario.xhp
index fe889eef44..1fc9e30174 100644
--- a/helpcontent2/source/text/scalc/guide/scenario.xhp
+++ b/helpcontent2/source/text/scalc/guide/scenario.xhp
@@ -68,7 +68,7 @@
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3155764" xml-lang="en-US" l10n="CHG" oldref="13">Click the <emph>Scenarios</emph> icon 
-<image id="img_id7617114" src="sc/res/imglst/navipi/na07.png" width="0.222inch" height="0.222inch"><alt id="alt_id7617114" xml-lang="en-US">Scenarios icon</alt>
+<image id="img_id7617114" src="sc/imglst/navipi/na07.png" width="0.222inch" height="0.222inch"><alt id="alt_id7617114" xml-lang="en-US">Scenarios icon</alt>
 	</image> in the Navigator.</paragraph>
 </listitem>
 </list>
diff --git a/helpcontent2/source/text/scalc/guide/table_view.xhp b/helpcontent2/source/text/scalc/guide/table_view.xhp
index 8413a2640f..1af9c74733 100644
--- a/helpcontent2/source/text/scalc/guide/table_view.xhp
+++ b/helpcontent2/source/text/scalc/guide/table_view.xhp
@@ -59,8 +59,7 @@
 <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><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>
+<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. Choose to hide <emph>Grid lines</emph> from the drop-down. Confirm with <emph>OK</emph>.</paragraph>
 </listitem>
 </list>
 <section id="relatedtopics">
diff --git a/helpcontent2/source/text/schart/01/smooth_line_properties.xhp b/helpcontent2/source/text/schart/01/smooth_line_properties.xhp
index 463c4a5ffa..0551b43829 100644
--- a/helpcontent2/source/text/schart/01/smooth_line_properties.xhp
+++ b/helpcontent2/source/text/schart/01/smooth_line_properties.xhp
@@ -55,22 +55,22 @@
 <list type="ordered">
 <listitem>
 <paragraph role="paragraph" id="par_id1601611" xml-lang="en-US" l10n="NEW">Select Cubic Spline or B-Spline.</paragraph>
-<paragraph role="paragraph" id="par_id879848" xml-lang="en-US" l10n="NEW">These are mathematical models that influence the display of the curves. The cubic spline line passes through all points, while the B-spline line connects the first and last point and passes by the intermediate points.</paragraph>
+<paragraph role="paragraph" id="par_id879848" xml-lang="en-US" l10n="NEW">These are mathematical models that influence the display of the curves. The curves are created by joining together segments of polynomials.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_id3464461" xml-lang="en-US" l10n="NEW">Optionally set the resolution. A higher value leads to a smoother line.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_id6998809" xml-lang="en-US" l10n="NEW">For B-spline lines optionally set the data points order.</paragraph>
+<paragraph role="paragraph" id="par_id6998809" xml-lang="en-US" l10n="NEW">For B-spline lines optionally set the degree of the polynomials.</paragraph>
 </listitem>
-</list><comment>1088553477 cubic spline</comment>
+</list>
 <bookmark xml-lang="en-US" branch="hid/chart2:RadioButton:DLG_SPLINE_PROPERTIES:RB_SPLINES_CUBIC" id="bm_id1593676" localize="false"/>
-<paragraph role="paragraph" id="par_id3424481" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Apply a cubic spline model.</ahelp></paragraph><comment>1088553478 b-spline</comment>
+<paragraph role="paragraph" id="par_id3424481" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Apply a cubic spline model.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/chart2:RadioButton:DLG_SPLINE_PROPERTIES:RB_SPLINES_B" id="bm_id1243629" localize="false"/>
-<paragraph role="paragraph" id="par_id1068758" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Apply a B-spline model.</ahelp></paragraph><comment>1088559618 resolution</comment>
+<paragraph role="paragraph" id="par_id1068758" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Apply a B-spline model.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/chart2:MetricField:DLG_SPLINE_PROPERTIES:MF_SPLINE_RESOLUTION" id="bm_id9044770" localize="false"/>
-<paragraph role="paragraph" id="par_id2320932" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Set the resolution.</ahelp></paragraph><comment>1088559617 data points order</comment>
+<paragraph role="paragraph" id="par_id2320932" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Set the resolution.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/chart2:MetricField:DLG_SPLINE_PROPERTIES:MF_SPLINE_ORDER" id="bm_id3674123" localize="false"/>
-<paragraph role="paragraph" id="par_id8638874" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Set the data points order.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id8638874" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Set the degree of the polynomials.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/schart/01/type_xy.xhp b/helpcontent2/source/text/schart/01/type_xy.xhp
index 967eecc780..a3199ebfe7 100644
--- a/helpcontent2/source/text/schart/01/type_xy.xhp
+++ b/helpcontent2/source/text/schart/01/type_xy.xhp
@@ -94,7 +94,7 @@
 <emph>Cubic Spline</emph> interpolates your data points with polynomials of degree 3. The transitions between the polynomial pieces are smooth, having the same slope and curvature. </paragraph>
 <paragraph role="paragraph" id="par_id6128421" xml-lang="en-US" l10n="NEW">The <emph>Resolution</emph> determines how many line segments are calculated to draw a piece of polynomial between two data points. You can see the intermediate points if you click any data point.</paragraph>
 <paragraph role="paragraph" id="par_id9280373" xml-lang="en-US" l10n="NEW">
-<emph>B-Spline</emph> uses the data points as control points to form a B-spline curve. Those curves are built piecewise from polynomials. The <emph>Data points order</emph> sets the degree k of these polynomials. <comment>Besides the first and last point the curve doesn't go through the data points but lays inside the convex hull of each k+1 adjacent data points. Having Resolution r and n+1 data points, r times n uniform line segments are used to draw the whole curve.</comment></paragraph><comment>Regina: watch issue 72218, which would bring a change to UI</comment>
+<emph>B-Spline</emph> uses a parametric, interpolating B-spline curve. Those curves are built piecewise from polynomials. The <emph>Degree of polynomials</emph> sets the degree of these polynomials.</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"/>
diff --git a/helpcontent2/source/text/shared/02/09070100.xhp b/helpcontent2/source/text/shared/02/09070100.xhp
index 9230de8559..b8e473de71 100644
--- a/helpcontent2/source/text/shared/02/09070100.xhp
+++ b/helpcontent2/source/text/shared/02/09070100.xhp
@@ -53,14 +53,10 @@
 <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/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/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/CUI_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/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/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/CUI_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/CUI_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/CUI_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>
diff --git a/helpcontent2/source/text/shared/main0213.xhp b/helpcontent2/source/text/shared/main0213.xhp
index f279ab8322..3218e25960 100644
--- a/helpcontent2/source/text/shared/main0213.xhp
+++ b/helpcontent2/source/text/shared/main0213.xhp
@@ -69,7 +69,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3154013" xml-lang="en-US" l10n="E">
-<image id="img_id3150010" src="res/sc10616.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150010" xml-lang="en-US">Icon</alt>
+<image id="img_id3150010" src="cmd/sc_firstrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3150010" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -117,7 +117,7 @@
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3155337" xml-lang="en-US" l10n="E">
-<image id="img_id3163808" src="res/sc10619.png" width="0.222inch" height="0.222inch"><alt id="alt_id3163808" xml-lang="en-US">Icon</alt>
+<image id="img_id3163808" src="cmd/sc_lastrecord.png" width="0.222inch" height="0.222inch"><alt id="alt_id3163808" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/optionen/01020200.xhp b/helpcontent2/source/text/shared/optionen/01020200.xhp
deleted file mode 100644
index a6c81059cb..0000000000
--- a/helpcontent2/source/text/shared/optionen/01020200.xhp
+++ /dev/null
@@ -1,111 +0,0 @@
-<?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="textsharedoptionen01020200xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Search</title>
-<filename>/text/shared/optionen/01020200.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-03T13:59:21">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="suche">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3154515"><bookmark_value>search engines; selecting</bookmark_value>
-</bookmark>
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_OPTIONS_SEARCH" id="bm_id3156346" localize="false"/>
-<paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01020200.xhp" name="Search">Search</link></paragraph>
-<paragraph role="paragraph" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OPTIONS_SEARCH">Use this tab page to define the settings for searching in the Internet.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-  <embed href="text/shared/00/00000406.xhp#internet4"/>
-</section>
-<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/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/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/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/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/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/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>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3159255" xml-lang="en-US" l10n="U" oldref="28">Activate the search engine and perform a search with at least two words.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147434" xml-lang="en-US" l10n="CHG" oldref="29">Copy the URL from your browser's <emph>URL</emph> field and paste it into a blank document.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148647" xml-lang="en-US" l10n="U" oldref="30">Change the conditions for the search in the search engine, if it offers you the choice.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3147317" xml-lang="en-US" l10n="U" oldref="31">Again, copy the contents of the <emph>URL</emph> field.</paragraph>
-</listitem>
-<listitem>
-<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/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/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/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/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/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>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01030000.xhp b/helpcontent2/source/text/shared/optionen/01030000.xhp
index 79d344000a..83c35e0c0b 100644
--- a/helpcontent2/source/text/shared/optionen/01030000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01030000.xhp
@@ -45,7 +45,6 @@
          <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>
diff --git a/helpcontent2/source/text/shared/optionen/01060100.xhp b/helpcontent2/source/text/shared/optionen/01060100.xhp
index 7c5b936e56..7976bb48bf 100644
--- a/helpcontent2/source/text/shared/optionen/01060100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060100.xhp
@@ -76,11 +76,10 @@
       <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"/>
+<bookmark xml-lang="en-US" branch="hid/sc:ListBox:RID_SCPAGE_CONTENT:LB_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>
+      <paragraph xml-lang="en-US" id="par_id3153088" role="paragraph" l10n="U" oldref="31"><ahelp hid="sc:ListBox:RID_SCPAGE_CONTENT:LB_GRID" visibility="visible">Specifies when grid lines will be displayed. Default is to display grid lines only on cells that do not have a background color. You can choose to also display grid lines on cells with background color, or to hide them.</ahelp> 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>
 <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><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>
diff --git a/helpcontent2/source/text/shared/optionen/makefile.mk b/helpcontent2/source/text/shared/optionen/makefile.mk
index c685eb4a7b..1ae8f58da0 100644
--- a/helpcontent2/source/text/shared/optionen/makefile.mk
+++ b/helpcontent2/source/text/shared/optionen/makefile.mk
@@ -64,7 +64,6 @@ XHPFILES = \
    01014000.xhp \
    01020000.xhp \
    01020100.xhp \
-   01020200.xhp \
    01020300.xhp \
    01020400.xhp \
    01030000.xhp \