Fix tdf#86428 Wrap text help page duplicated

Fix for tdf#86428  Help Page “Wrap” Exists Two Times in Local Help

Wrap text help page 05180000.xhp was replaced by 05060200.xhp but
left there because of a link from the main format help page.

The 05060200.xhp page now carries the recent changes in Writer UI
and context menus.

Wrap page from guide (main0105.xhp) also updated.

Change-Id: Icd0c015ceca89dc1e3f8f7200ffe491ddb03ff7b
Reviewed-on: https://gerrit.libreoffice.org/21023
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

6 files changed, 27 insertions, 90 deletions

diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk
index c55d189026..0dc26d3dca 100644
--- a/AllLangHelp_swriter.mk
+++ b/AllLangHelp_swriter.mk
@@ -152,7 +152,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\
     helpcontent2/source/text/swriter/01/05150200 \
     helpcontent2/source/text/swriter/01/05150300 \
     helpcontent2/source/text/swriter/01/05170000 \
-    helpcontent2/source/text/swriter/01/05180000 \
     helpcontent2/source/text/swriter/01/05190000 \
     helpcontent2/source/text/swriter/01/05200000 \
     helpcontent2/source/text/swriter/01/05990000 \
diff --git a/source/text/swriter/00/00000405.xhp b/source/text/swriter/00/00000405.xhp
index d5d4452d0b..ad2e020d1c 100644
--- a/source/text/swriter/00/00000405.xhp
+++ b/source/text/swriter/00/00000405.xhp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,8 +18,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
- 
-	
+
+
 <meta>
       <topic id="textswriter0000000405xml" indexer="exclude">
          <title xml-lang="en-US" id="tit">Format Menu</title>
@@ -52,7 +52,7 @@
          <paragraph xml-lang="en-US" id="par_id3154470" role="paragraph" l10n="CHG" oldref="131">Choose <emph>Format - Paragraph - Outline &amp; Numbering</emph> tab</paragraph>
          <paragraph xml-lang="en-US" id="par_id3147525" role="paragraph" l10n="CHG" oldref="144">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New - Outline &amp; Numbering</emph> tab (Paragraph Styles)</paragraph>
       </section>
-      <paragraph xml-lang="en-US" id="par_id3152960" role="paragraph" l10n="U" oldref="155"><variable id="spaltenber">Choose <emph>Format - Sections - Options</emph> button 
+      <paragraph xml-lang="en-US" id="par_id3152960" role="paragraph" l10n="U" oldref="155"><variable id="spaltenber">Choose <emph>Format - Sections - Options</emph> button
 </variable></paragraph>
       <section id="spaltens">
          <paragraph xml-lang="en-US" id="par_id3150836" role="paragraph" l10n="U" oldref="20">Choose <emph>Format - Page - Columns</emph> tab</paragraph>
@@ -89,13 +89,13 @@
 </variable></paragraph>
       <paragraph xml-lang="en-US" id="par_id3155870" role="paragraph" l10n="U" oldref="153"><variable id="autoformat3">Choose <emph>Format - AutoCorrect - Apply and Edit Changes</emph>
 </variable></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3147413" role="paragraph" l10n="CHG" oldref="44"><variable id="autoformattab">Choose <emph>Table - AutoFormat</emph> (with cursor in a table) 
+      <paragraph xml-lang="en-US" id="par_id3147413" role="paragraph" l10n="CHG" oldref="44"><variable id="autoformattab">Choose <emph>Table - AutoFormat</emph> (with cursor in a table)
 </variable></paragraph>
       <section id="formatgrafik">
          <paragraph xml-lang="en-US" id="par_id3147484" role="paragraph" l10n="U" oldref="47">Choose <emph>Format - Image</emph>
          </paragraph>
          <paragraph xml-lang="en-US" id="par_id3147504" role="paragraph" l10n="U" oldref="48">Choose <emph>Insert - Image - From File - Properties</emph> button</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3145256" role="paragraph" l10n="U" oldref="151"><switchinline select="appl"><caseinline select="WRITER">Choose <emph>Insert - Image - From File</emph> (when graphics are selected) 
+         <paragraph xml-lang="en-US" id="par_id3145256" role="paragraph" l10n="U" oldref="151"><switchinline select="appl"><caseinline select="WRITER">Choose <emph>Insert - Image - From File</emph> (when graphics are selected)
 </caseinline></switchinline></paragraph>
          <paragraph xml-lang="en-US" id="par_id3149562" role="paragraph" l10n="CHG" oldref="49">On the <emph>Image</emph> Bar (when images are selected), click</paragraph>
          <section id="syeigenschaften">
@@ -121,11 +121,10 @@
          <paragraph xml-lang="en-US" id="par_id3147067" role="paragraph" l10n="U" oldref="55">Choose <emph>Insert - Frame - Type</emph> tab</paragraph>
       </section>
       <section id="grafikumlauf">
-         <paragraph xml-lang="en-US" id="par_id3151082" role="paragraph" l10n="U" oldref="56">Choose <emph>Format - Image - Wrap</emph> tab</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3148437" role="paragraph" l10n="U" oldref="125">Choose <emph>Format - Frame/Object - Wrap</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3151082" role="paragraph" l10n="U" oldref="56">Choose <emph>Format - Image - Properties - Wrap</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3148437" role="paragraph" l10n="U" oldref="125">Choose <emph>Format - Frame/Object - Properties - Wrap</emph> tab</paragraph>
          <paragraph xml-lang="en-US" id="par_id3150169" role="paragraph" l10n="U" oldref="60">Choose <emph>Insert - Frame - Wrap</emph> tab</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3153299" role="paragraph" l10n="U" oldref="61">Choose <emph>Format - Wrap</emph>
-</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153299" role="paragraph" l10n="U" oldref="61">Choose <emph>Format - Wrap - Edit - Wrap</emph> tab</paragraph>
       </section>
       <paragraph xml-lang="en-US" id="par_id3150454" role="paragraph" l10n="U" oldref="62"><variable id="kontureditor">Choose <emph>Format - Wrap - Edit Contour</emph>
 </variable></paragraph>
@@ -136,11 +135,11 @@
       </section>
       <section id="grazusaetze">
          <paragraph xml-lang="en-US" id="par_id3154724" role="paragraph" l10n="U" oldref="65">Choose <emph>Format - Image - Options</emph> tab</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3145636" role="paragraph" l10n="U" oldref="128">Choose <emph>Format - Frame/Object - Options</emph> tab</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3145636" role="paragraph" l10n="U" oldref="128">Choose <emph>Format - Frame and Object - Options</emph> tab</paragraph>
          <paragraph xml-lang="en-US" id="par_id3149774" role="paragraph" l10n="U" oldref="68">Choose <emph>Format - Styles and Formatting -</emph> open context menu <emph>Modify/New - Options</emph> tab</paragraph>
          <paragraph xml-lang="en-US" id="par_id3150922" role="paragraph" l10n="U" oldref="69">Choose <emph>Insert - Frame - Options</emph> tab</paragraph>
       </section>
-      <paragraph xml-lang="en-US" id="par_id3155088" role="paragraph" l10n="U" oldref="70"><variable id="grafik1">Choose <emph>Format - Image - Image</emph> tab 
+      <paragraph xml-lang="en-US" id="par_id3155088" role="paragraph" l10n="U" oldref="70"><variable id="grafik1">Choose <emph>Format - Image - Image</emph> tab
 </variable></paragraph>
       <section id="makrografik">
          <paragraph xml-lang="en-US" id="par_id3146938" role="paragraph" l10n="U" oldref="72">Choose <emph>Insert/Format - Image - Macro</emph> tab</paragraph>
@@ -158,11 +157,11 @@
 </variable></paragraph>
       <paragraph xml-lang="en-US" id="par_id3155810" role="paragraph" l10n="CHG" oldref="154"><variable id="tabverb">Choose <emph>Table - Merge Table</emph>
 </variable></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3151233" role="paragraph" l10n="U" oldref="75"><variable id="tabformat">Choose <emph>Table - Table Properties - Table</emph> tab 
+      <paragraph xml-lang="en-US" id="par_id3151233" role="paragraph" l10n="U" oldref="75"><variable id="tabformat">Choose <emph>Table - Table Properties - Table</emph> tab
 </variable></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3154255" role="paragraph" l10n="U" oldref="76"><variable id="spaltentab">Choose <emph>Table - Table Properties - Columns</emph> tab 
+      <paragraph xml-lang="en-US" id="par_id3154255" role="paragraph" l10n="U" oldref="76"><variable id="spaltentab">Choose <emph>Table - Table Properties - Columns</emph> tab
 </variable></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3153140" role="paragraph" l10n="U" oldref="77"><variable id="tabelletextfluss">Choose <emph>Table - Table Properties - Text Flow</emph> tab 
+      <paragraph xml-lang="en-US" id="par_id3153140" role="paragraph" l10n="U" oldref="77"><variable id="tabelletextfluss">Choose <emph>Table - Table Properties - Text Flow</emph> tab
 </variable></paragraph>
       <paragraph xml-lang="en-US" id="par_id3148823" role="paragraph" l10n="CHG" oldref="78"><variable id="zelle">Right-click in a table, choose <emph>Cell</emph>
 </variable></paragraph>
diff --git a/source/text/swriter/01/05060200.xhp b/source/text/swriter/01/05060200.xhp
index 9b01c4f3bc..7516e1d020 100644
--- a/source/text/swriter/01/05060200.xhp
+++ b/source/text/swriter/01/05060200.xhp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,8 +18,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
- 
-	
+
+
 <meta>
 <topic id="textswriter0105060200xml" indexer="include">
 <title id="tit" xml-lang="en-US">Wrap</title>
@@ -32,7 +32,7 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:TextWrap" id="bm_id6339381" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:WrapMenu" id="bm_id0801200803335347" localize="false"/>
 <paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05060200.xhp" name="Wrap">Wrap</link></paragraph>
-<paragraph role="paragraph" id="par_id3154478" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="umlauftext"><ahelp hid=".uno:TextWrap">Specify the way you want text to wrap around an object.</ahelp> You can also specify the spacing between the text and the object. 
+<paragraph role="paragraph" id="par_id3154478" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="umlauftext"><ahelp hid=".uno:TextWrap">Specify the way you want text to wrap around an object.</ahelp> You can also specify the spacing between the text and the object.
 </variable></paragraph>
 </section>
 <section id="howtoget">
@@ -149,7 +149,7 @@
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wrappage/anchoronly" id="bm_id3153240" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:WrapAnchorOnly" id="bm_id3154324" localize="false"/>
 <paragraph role="heading" id="hd_id3153229" xml-lang="en-US" level="3" l10n="U" oldref="28">First Paragraph</paragraph>
-<paragraph role="paragraph" id="par_id3154333" xml-lang="en-US" l10n="U" oldref="29"><variable id="ersterabsatztext"><ahelp hid=".uno:WrapAnchorOnly">Starts a new paragraph below the object after you press Enter.</ahelp> The space between the paragraphs is determined by the size of the object. 
+<paragraph role="paragraph" id="par_id3154333" xml-lang="en-US" l10n="U" oldref="29"><variable id="ersterabsatztext"><ahelp hid=".uno:WrapAnchorOnly">Starts a new paragraph below the object after you press Enter.</ahelp> The space between the paragraphs is determined by the size of the object.
 </variable></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wrappage/transparent" id="bm_id3150086" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:WrapThroughTransparent" id="bm_id7503356" localize="false"/>
@@ -159,10 +159,10 @@
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wrappage/outline" id="bm_id3149369" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:WrapContour" id="bm_id3149372" localize="false"/>
 <paragraph role="heading" id="hd_id3149358" xml-lang="en-US" level="3" l10n="U" oldref="47">Contour</paragraph>
-<paragraph role="paragraph" id="par_id3155793" xml-lang="en-US" l10n="U" oldref="48"><variable id="konturtext"><ahelp hid=".uno:WrapContour">Wraps text around the shape of the object. This option is not available for the <emph>Through</emph> wrap type, or for frames.</ahelp> To change the contour of an object, select the object, and then choose <emph>Format - Wrap - </emph><link href="text/swriter/01/05060201.xhp" name="Edit Contour"><emph>Edit Contour</emph></link>. 
+<paragraph role="paragraph" id="par_id3155793" xml-lang="en-US" l10n="U" oldref="48"><variable id="konturtext"><ahelp hid=".uno:WrapContour">Wraps text around the shape of the object. This option is not available for the <emph>Through</emph> wrap type, or for frames.</ahelp> To change the contour of an object, select the object, and then choose <emph>Format - Wrap - </emph><link href="text/swriter/01/05060201.xhp" name="Edit Contour"><emph>Edit Contour</emph></link>.
 </variable></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/wrappage/outside" id="bm_id3154632" localize="false"/>
-<paragraph role="heading" id="hd_id3154620" xml-lang="en-US" level="3" l10n="U" oldref="51">Only outside</paragraph>
+<paragraph role="heading" id="hd_id3154620" xml-lang="en-US" level="3" l10n="U" oldref="51">Outside only</paragraph>
 <paragraph role="paragraph" id="par_id3147377" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="modules/swriter/ui/wrappage/outside">Wraps text only around the contour of the object, but not in open areas within the object shape.</ahelp> This option is not available for frames.</paragraph>
 <paragraph role="heading" id="hd_id3147397" xml-lang="en-US" level="2" l10n="U" oldref="33">Gaps</paragraph>
 <paragraph role="paragraph" id="par_id3149637" xml-lang="en-US" l10n="U" oldref="34">Specify the amount of space to leave between the selected object and the text.</paragraph>
diff --git a/source/text/swriter/01/05180000.xhp b/source/text/swriter/01/05180000.xhp
deleted file mode 100644
index 70ce1a612c..0000000000
--- a/source/text/swriter/01/05180000.xhp
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textswriter0105180000xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Wrap</title>
-<filename>/text/swriter/01/05180000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-</history>
-</meta>
-<body>
-  
-  
-  <section id="umlauf">
-  <paragraph id="hd_id3145826" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/swriter/01/05180000.xhp" name="Wrap">Wrap</link></paragraph>
-  <paragraph role="paragraph" id="par_id3153002" l10n="U" xml-lang="en-US" oldref="2">Sets the text wrap options for graphics, objects, and frames.</paragraph>
-  </section>
-  <section id="howtoget">
-  <embed href="text/swriter/00/00000405.xhp#grafikumlauf"/>
-</section>
-  <paragraph id="hd_id3150022" role="heading" level="2" oldref="3" l10n="U" xml-lang="en-US"><link href="text/swriter/01/05060200.xhp" name="No wrap">No wrap</link></paragraph>
-  <embed href="text/swriter/01/05060200.xhp#keinumlauftext"/>
-  <paragraph id="hd_id3150934" role="heading" level="2" oldref="4" l10n="U" xml-lang="en-US"><link href="text/swriter/01/05060200.xhp" name="Page wrap">Page wrap</link></paragraph>
-  <embed href="text/swriter/01/05060200.xhp#seitenumlauftext"/>
-  <paragraph id="hd_id3149027" role="heading" level="2" oldref="5" l10n="U" xml-lang="en-US"><link href="text/swriter/01/05060200.xhp" name="Dynamic page wrap">Dynamic page wrap</link></paragraph>
-  <embed href="text/swriter/01/05060200.xhp#dynamischertext"/>
-  <paragraph id="hd_id3153718" role="heading" level="2" oldref="6" l10n="U" xml-lang="en-US"><link href="text/swriter/01/05060200.xhp" name="Wrap through">Wrap through</link></paragraph>
-  <embed href="text/swriter/01/05060200.xhp#durchlauftext"/>
-  <paragraph id="hd_id3156321" role="heading" level="2" oldref="7" l10n="U" xml-lang="en-US"><link href="text/swriter/01/05060200.xhp" name="In background">In background</link></paragraph>
-  <embed href="text/swriter/01/05060200.xhp#hintergrundtext"/>
-  <paragraph id="hd_id3151180" role="heading" level="2" oldref="10" l10n="U" xml-lang="en-US"><link href="text/swriter/01/05060200.xhp" name="Contour">Contour</link></paragraph>
-  <embed href="text/swriter/01/05060200.xhp#konturtext"/>
-  <paragraph id="hd_id3147566" role="heading" level="2" oldref="9" l10n="U" xml-lang="en-US"><link href="text/swriter/01/05060201.xhp" name="Edit Contour">Edit Contour</link></paragraph>
-  <embed href="text/swriter/01/05060201.xhp#konturtext"/>
-  <paragraph id="hd_id3149294" role="heading" level="2" oldref="8" l10n="U" xml-lang="en-US"><link href="text/swriter/01/05060200.xhp" name="First paragraph">First paragraph</link></paragraph>
-  <embed href="text/swriter/01/05060200.xhp#ersterabsatztext"/>
-  <paragraph id="hd_id3147341" role="heading" level="2" oldref="11" l10n="U" xml-lang="en-US"><link href="text/swriter/01/05060200.xhp" name="Edit">Edit</link></paragraph>
-  <embed href="text/swriter/01/05060200.xhp#umlauftext"/>
- </body>
-</helpdocument>
diff --git a/source/text/swriter/guide/wrap.xhp b/source/text/swriter/guide/wrap.xhp
index b5da37da89..c3c250be18 100644
--- a/source/text/swriter/guide/wrap.xhp
+++ b/source/text/swriter/guide/wrap.xhp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,8 +18,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
- 
-	
+
+
 <meta>
       <topic id="textswriterguidewrapxml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Wrapping Text Around Objects</title>
@@ -44,7 +44,7 @@
             <paragraph xml-lang="en-US" id="par_id3149696" role="listitem" l10n="U" oldref="9">Select the object.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3155907" role="listitem" l10n="U" oldref="10">Choose <emph>Format - Wrap</emph>, and then choose the wrapping style that you want to apply.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3155907" role="listitem" l10n="U" oldref="10">Choose <emph>Format - Frame and Objects - Properties</emph>, and then click the <link href="text/swriter/01/05060200.xhp" name="Wrap"><emph>Wrap</emph></link> tab to choose the wrapping style that you want to apply.</paragraph>
             <paragraph xml-lang="en-US" id="par_id3155859" role="listitem" l10n="U" oldref="4">The current wrapping style is indicated by a bullet.</paragraph>
          </listitem>
       </list>
@@ -55,7 +55,7 @@
             <paragraph xml-lang="en-US" id="par_id3154079" role="listitem" l10n="U" oldref="15">Select the object.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3153396" role="listitem" l10n="U" oldref="11">Choose <emph>Format - Image</emph>, and then click the <link href="text/swriter/01/05060200.xhp" name="Wrap"><emph>Wrap</emph></link> tab.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3153396" role="listitem" l10n="U" oldref="11">Choose <emph>Format - Image - Properties</emph>, and then click the <link href="text/swriter/01/05060200.xhp" name="Wrap"><emph>Wrap</emph></link> tab.</paragraph>
          </listitem>
       </list>
       <list type="ordered" startwith="3">
diff --git a/source/text/swriter/main0105.xhp b/source/text/swriter/main0105.xhp
index 85b50a412a..cbbecfae50 100644
--- a/source/text/swriter/main0105.xhp
+++ b/source/text/swriter/main0105.xhp
@@ -57,7 +57,7 @@
 <embed href="text/swriter/01/02170000.xhp#bereichetext"/>
 <embed href="text/swriter/01/05150000.xhp#autoformat"/>
 <embed href="text/shared/01/05260000.xhp#verankerung"/>
-<embed href="text/swriter/01/05180000.xhp#umlauf"/>
+<embed href="text/swriter/01/05060200.xhp#umlauf"/>
 <embed href="text/shared/01/05070000.xhp#ausrichtung"/>
 <embed href="text/shared/01/05080000.xhp#ausrichtung"/>
 <embed href="text/shared/01/05250000.xhp#anordnung"/>