Merge tag 'upstream/2.4.1'

Upstream version 2.4.1

4 files changed, 17 insertions, 19 deletions

diff --git a/doc/man/scons-time.xml b/doc/man/scons-time.xml
index 0601823..37a3655 100644
--- a/doc/man/scons-time.xml
+++ b/doc/man/scons-time.xml
@@ -32,8 +32,8 @@
 <refmeta>
 <refentrytitle>SCONS-TIME</refentrytitle>
 <manvolnum>1</manvolnum>
-<refmiscinfo class='source'>SCons 2.4.0</refmiscinfo>
-<refmiscinfo class='manual'>SCons 2.4.0</refmiscinfo>
+<refmiscinfo class='source'>SCons 2.4.1</refmiscinfo>
+<refmiscinfo class='manual'>SCons 2.4.1</refmiscinfo>
 </refmeta>
 <refnamediv id='name'>
 <refname>scons-time</refname>
diff --git a/doc/man/scons.xml b/doc/man/scons.xml
index 460e993..8eb56a9 100644
--- a/doc/man/scons.xml
+++ b/doc/man/scons.xml
@@ -75,8 +75,8 @@
 <refmeta>
 <refentrytitle>SCONS</refentrytitle>
 <manvolnum>1</manvolnum>
-<refmiscinfo class='source'>SCons 2.4.0</refmiscinfo>
-<refmiscinfo class='manual'>SCons 2.4.0</refmiscinfo>
+<refmiscinfo class='source'>SCons 2.4.1</refmiscinfo>
+<refmiscinfo class='manual'>SCons 2.4.1</refmiscinfo>
 </refmeta>
 <refnamediv id='name'>
 <refname>scons</refname>
@@ -7040,7 +7040,7 @@ env.Program('MyApp', ['Foo.cpp', 'Bar.cpp'])
 
 <para>For more information see the document for the PCH builder, and the PCH and
 PCHSTOP construction variables. To learn about the details of precompiled
-headers consult the MSDN documention for /Yc, /Yu, and /Yp.</para>
+headers consult the MSDN documentation for /Yc, /Yu, and /Yp.</para>
 
 </refsect2>
 
diff --git a/doc/man/sconsign.xml b/doc/man/sconsign.xml
index 8cba837..0a96069 100644
--- a/doc/man/sconsign.xml
+++ b/doc/man/sconsign.xml
@@ -32,8 +32,8 @@
 <refmeta>
 <refentrytitle>SCONSIGN</refentrytitle>
 <manvolnum>1</manvolnum>
-<refmiscinfo class='source'>SCons 2.4.0</refmiscinfo>
-<refmiscinfo class='manual'>SCons 2.4.0</refmiscinfo>
+<refmiscinfo class='source'>SCons 2.4.1</refmiscinfo>
+<refmiscinfo class='manual'>SCons 2.4.1</refmiscinfo>
 </refmeta>
 <refnamediv id='name'>
 <refname>sconsign</refname>
diff --git a/doc/man/titlepage/SConsBuildBricks_path.svg b/doc/man/titlepage/SConsBuildBricks_path.svg
index ed0c60d..0d7f63e 100644
--- a/doc/man/titlepage/SConsBuildBricks_path.svg
+++ b/doc/man/titlepage/SConsBuildBricks_path.svg
@@ -14,9 +14,9 @@
    height="80.330002"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.4 r9939"
    version="1.0"
-   sodipodi:docname="SConsBuildBricks.svg"
+   sodipodi:docname="SConsBuildBricks_path.svg"
    inkscape:export-filename="Constructs-using-SCons.png"
    inkscape:export-xdpi="100"
    inkscape:export-ydpi="100">
@@ -77,24 +77,22 @@
           </cc:Agent>
         </dc:contributor>
         <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-nc-sa/2.0/" />
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
       </cc:Work>
       <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-nc-sa/2.5/">
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
         <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
+           rdf:resource="http://creativecommons.org/ns#Notice" />
         <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:prohibits
-           rdf:resource="http://web.resource.org/cc/CommercialUse" />
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
         <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
       </cc:License>
     </rdf:RDF>
   </metadata>