From 8c39d43f9a9f00e8990d7d9ed52dd0a7e36555b9 Mon Sep 17 00:00:00 2001
From: Andras Timar <andras.timar@collabora.com>
Date: Mon, 26 Dec 2016 20:15:03 +0100
Subject: Fix validation errors against xmlhelp.dtd

Change-Id: I453fb62f45b445b360d4722db83023a633053fb8
Reviewed-on: https://gerrit.libreoffice.org/32437
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
---
 source/text/scalc/01/04060102.xhp          |  6 +++---
 source/text/scalc/01/04060106.xhp          |  2 +-
 source/text/shared/optionen/01010500.xhp   | 11 ++++++-----
 source/text/simpress/guide/photo_album.xhp | 12 +++---------
 4 files changed, 13 insertions(+), 18 deletions(-)

(limited to 'source')

diff --git a/source/text/scalc/01/04060102.xhp b/source/text/scalc/01/04060102.xhp
index 47e8ce1dca..62550e76a7 100644
--- a/source/text/scalc/01/04060102.xhp
+++ b/source/text/scalc/01/04060102.xhp
@@ -165,11 +165,11 @@
 </section>
 
 <section id="networkdaysintl">
-<paragraph id="par_id231020162315043955" role="paragraph" xml-lang="en-US"><embed href="text/scalc/01/func_networkdays.intl.xhp#networkdaysintl"/></paragraph>
+<paragraph id="par_id231020162315043955" role="paragraph" xml-lang="en-US"> <embedvar href="text/scalc/01/func_networkdays.intl.xhp#networkdaysintl"/> </paragraph>
 </section>
 
 <section id="workdaysintl">
-<paragraph id="par_id231020163315043955" role="paragraph" xml-lang="en-US"><embed href="text/scalc/01/func_workdays.intl.xhp#workdaysintl"/></paragraph>
+<paragraph id="par_id231020163315043955" role="paragraph" xml-lang="en-US"> <embedvar href="text/scalc/01/func_workdays.intl.xhp#workdaysintl"/> </paragraph>
 </section>
 
 <section id="eastersunday">
@@ -214,4 +214,4 @@
 </section>
 </body>
 
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/source/text/scalc/01/04060106.xhp b/source/text/scalc/01/04060106.xhp
index eb746e39b2..ec11f80459 100644
--- a/source/text/scalc/01/04060106.xhp
+++ b/source/text/scalc/01/04060106.xhp
@@ -913,7 +913,7 @@
 </section>
 
 <section id="Section67">
-<paragraph id="par_2016112109351" role="heading" level="2" localize="false" xml-lang="en-US"><embed href="text/scalc/01/func_rawsubtract.xhp#rawsubtract_function"/></paragraph>
+<paragraph id="par_2016112109351" role="heading" level="2" localize="false" xml-lang="en-US"><embedvar href="text/scalc/01/func_rawsubtract.xhp#rawsubtract_function"/></paragraph>
 </section>
 
 <section id="Section21">
diff --git a/source/text/shared/optionen/01010500.xhp b/source/text/shared/optionen/01010500.xhp
index 79feab7554..f70642719a 100644
--- a/source/text/shared/optionen/01010500.xhp
+++ b/source/text/shared/optionen/01010500.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="textsharedoptionen01010500xml" indexer="include">
 <title id="tit" xml-lang="en-US">Color</title>
@@ -69,8 +69,9 @@
 <bookmark xml-lang="en-US" branch="hid/cui/ui/colorpage/hex_custom" id="bm_id31543191" localize="false"/>
 <paragraph role="heading" id="hd_id31535731" xml-lang="en-US" level="3">Hex</paragraph>
 <paragraph role="paragraph" id="par_id31537261" xml-lang="en-US"><ahelp hid="cui/ui/colorpage/hex_custom">The color code of the color expressed as a hexadecimal value.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3154754" xml-lang="en-US" level="3"><link href="text/shared/optionen/01010501.xhp" name="Pick">Pick</link>
-<ahelp hid="cui/ui/colorpage/edit"><embed href="text/shared/optionen/01010501.xhp#farbentext"/></ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpage/edit" id="bm_id31543192" localize="false"/>
+<paragraph role="heading" id="hd_id3154754" xml-lang="en-US" level="3"><link href="text/shared/optionen/01010501.xhp" name="Pick">Pick</link></paragraph>
+<embed href="text/shared/optionen/01010501.xhp#farbentext"/>
 
 </body>
 </helpdocument>
diff --git a/source/text/simpress/guide/photo_album.xhp b/source/text/simpress/guide/photo_album.xhp
index c84455470f..cb7a41513f 100644
--- a/source/text/simpress/guide/photo_album.xhp
+++ b/source/text/simpress/guide/photo_album.xhp
@@ -64,18 +64,12 @@
   </listitem>
   <listitem>
     <paragraph id="par_id221120161524597741" role="ol_item" xml-lang="en-US">Locate the files you want to insert. </paragraph>
+    <paragraph id="par_id221120161524594919" role="note" xml-lang="en-US">Note: If several images are in the same folder, you can select a group of photos using the Shift or Ctrl keys while clicking on their filenames.</paragraph>
   </listitem>
-
-<paragraph id="par_id221120161524594919" role="note" xml-lang="en-US">Note: If several images are in the same folder, you can select a group of photos using the Shift or Ctrl keys while clicking on their filenames.</paragraph>
-
-
   <listitem>
     <paragraph id="par_id221120161524595472" role="ol_item" xml-lang="en-US">Click <item type="menuitem">Open</item> to add the files to the Photo Album.</paragraph>
+    <paragraph id="par_id221120161524591012" role="tip" xml-lang="en-US">Tip: Click on a file name to display it in the <item type="menuitem">Preview</item> area</paragraph>
   </listitem>
-
-<paragraph id="par_id221120161524591012" role="tip" xml-lang="en-US">Tip: Click on a file name to display it in the <item type="menuitem">Preview</item> area</paragraph>
-
-
   <listitem>
     <paragraph id="par_id221120161524595468" role="ol_item" xml-lang="en-US">Select the number of images per slide in the <item type="menuitem">Slide layout</item> list box.</paragraph>
   </listitem>
@@ -103,4 +97,4 @@
 </section>
 </body>
 
-</helpdocument>
\ No newline at end of file
+</helpdocument>
-- 
cgit