From ba9f2f56a7d8fd7a8305ac5dfb85664116f3b51e Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Thu, 6 Dec 2018 18:20:51 -0500
Subject: fix broken xml in docs

---
 doc/generated/examples/caching_ex-random_1.xml     |  6 +--
 doc/generated/examples/troubleshoot_explain1_3.xml |  2 +-
 doc/generated/variables.gen                        |  8 ++--
 doc/user/copyright.xml                             | 54 +++++++++++-----------
 doc/user/main.xml                                  |  7 +++
 5 files changed, 43 insertions(+), 34 deletions(-)

diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml
index 75f2135..d00f1ca 100644
--- a/doc/generated/examples/caching_ex-random_1.xml
+++ b/doc/generated/examples/caching_ex-random_1.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-cc -o f5.o -c f5.c
-cc -o f3.o -c f3.c
+cc -o f4.o -c f4.c
 cc -o f1.o -c f1.c
+cc -o f5.o -c f5.c
 cc -o f2.o -c f2.c
-cc -o f4.o -c f4.c
+cc -o f3.o -c f3.c
 cc -o prog f1.o f2.o f3.o f4.o f5.o
 </screen>
diff --git a/doc/generated/examples/troubleshoot_explain1_3.xml b/doc/generated/examples/troubleshoot_explain1_3.xml
index 4d5d1d8..c3ff407 100644
--- a/doc/generated/examples/troubleshoot_explain1_3.xml
+++ b/doc/generated/examples/troubleshoot_explain1_3.xml
@@ -3,5 +3,5 @@
 cp file.in file.oout
 
 scons: warning: Cannot find target file.out after building
-File "/Users/bdbaddog/devel/scons/git/scons-bugfixes-3/src/script/scons.py", line 204, in &lt;module&gt;
+File "/Users/bdbaddog/devel/scons/git/scons-bugfixes-3/bootstrap/src/script/scons.py", line 204, in &lt;module&gt;
 </screen>
diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen
index d24c5fe..7180489 100644
--- a/doc/generated/variables.gen
+++ b/doc/generated/variables.gen
@@ -38,8 +38,8 @@ if <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> is set. O
             </para>
             <para>
                 The value is specified as X[.Y[.Z]] where X is between 1 and 65535, Y can be omitted or between 1 and
-                255, Z can be omitted or between 1 and 255. This value will be set to <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> if not
-                specified.
+                255, Z can be omitted or between 1 and 255. This value will be derived from <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> if not
+                specified. The lowest digit will be dropped and replaced by a 0.
             </para>
             <para>See MacOS's ld manpage for more details</para>
         </listitem>
@@ -53,8 +53,8 @@ if <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> is set. O
             </para>
             <para>
                 The value is specified as X[.Y[.Z]] where X is between 1 and 65535, Y can be omitted or between 1 and
-                255, Z can be omitted or between 1 and 255. This value will be derived from <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> if not
-                specified. The lowest digit will be dropped and replaced by a 0.
+                255, Z can be omitted or between 1 and 255. This value will be set to <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> if not
+                specified.
             </para>
             <para>See MacOS's ld manpage for more details</para>
 
diff --git a/doc/user/copyright.xml b/doc/user/copyright.xml
index 67817d4..588253c 100644
--- a/doc/user/copyright.xml
+++ b/doc/user/copyright.xml
@@ -1,41 +1,43 @@
 <?xml version='1.0'?>
 <!DOCTYPE sconsdoc [
-    <!ENTITY % scons SYSTEM "../scons.mod">
-    %scons;
-]>
+        <!ENTITY % scons SYSTEM "../scons.mod">
+        %scons;
+        ]>
 
 <legalnotice xmlns="http://www.scons.org/dbxsd/v1.0"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">
 
-<!--
+    <!--
 
-  __COPYRIGHT__
+      __COPYRIGHT__
 
-  Permission is hereby granted, free of charge, to any person obtaining
-  a copy of this software and associated documentation files (the
-  "Software"), to deal in the Software without restriction, including
-  without limitation the rights to use, copy, modify, merge, publish,
-  distribute, sublicense, and/or sell copies of the Software, and to
-  permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
+      Permission is hereby granted, free of charge, to any person obtaining
+      a copy of this software and associated documentation files (the
+      "Software"), to deal in the Software without restriction, including
+      without limitation the rights to use, copy, modify, merge, publish,
+      distribute, sublicense, and/or sell copies of the Software, and to
+      permit persons to whom the Software is furnished to do so, subject to
+      the following conditions:
 
-  The above copyright notice and this permission notice shall be included
-  in all copies or substantial portions of the Software.
+      The above copyright notice and this permission notice shall be included
+      in all copies or substantial portions of the Software.
 
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-  KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-  WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+      KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+      WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+      NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+      LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+      OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+      WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
--->
+    -->
+
+    <blockquote>
+        <para>
+            SCons User's Guide Copyright (c) 2004-2018 Steven Knight
+        </para>
+    </blockquote>
 
-    <copyright>
-      <year>2004 - 2018</year>
-      <holder>The SCons Foundation</holder>
-    </copyright>
 
 </legalnotice>
diff --git a/doc/user/main.xml b/doc/user/main.xml
index 6605e88..a34405b 100644
--- a/doc/user/main.xml
+++ b/doc/user/main.xml
@@ -74,6 +74,13 @@
 
     <corpauthor>Steven Knight and the SCons Development Team</corpauthor>
 
+    <pubdate>2004 - 2018</pubdate>
+
+    <copyright>
+      <year>2004 - 2018</year>
+      <holder>The SCons Foundation</holder>
+    </copyright>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="copyright.xml"/>
 
     <releaseinfo>version &buildversion;</releaseinfo>
-- 
cgit v0.12