Merge tag 'upstream/2.5.0+repack'

Upstream version 2.5.0+repack

8 files changed, 32 insertions, 15 deletions

diff --git a/doc/man/SConstruct b/doc/man/SConstruct
index e531e7d..11443cf 100644
--- a/doc/man/SConstruct
+++ b/doc/man/SConstruct
@@ -3,7 +3,7 @@
 #
 
 #
-# Copyright (c) 2001 - 2015 The SCons Foundation
+# Copyright (c) 2001 - 2016 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
diff --git a/doc/man/epub.xsl b/doc/man/epub.xsl
index a46d8bf..2621e52 100644
--- a/doc/man/epub.xsl
+++ b/doc/man/epub.xsl
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>

 <!--

 

-  Copyright (c) 2001 - 2015 The SCons Foundation

+  Copyright (c) 2001 - 2016 The SCons Foundation

 

   Permission is hereby granted, free of charge, to any person obtaining

   a copy of this software and associated documentation files (the

diff --git a/doc/man/html.xsl b/doc/man/html.xsl
index fa6b370..da72d52 100644
--- a/doc/man/html.xsl
+++ b/doc/man/html.xsl
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>

 <!--

 

-  Copyright (c) 2001 - 2015 The SCons Foundation

+  Copyright (c) 2001 - 2016 The SCons Foundation

 

   Permission is hereby granted, free of charge, to any person obtaining

   a copy of this software and associated documentation files (the

diff --git a/doc/man/pdf.xsl b/doc/man/pdf.xsl
index 9e8318a..a55e29c 100644
--- a/doc/man/pdf.xsl
+++ b/doc/man/pdf.xsl
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>

 <!--

 

-  Copyright (c) 2001 - 2015 The SCons Foundation

+  Copyright (c) 2001 - 2016 The SCons Foundation

 

   Permission is hereby granted, free of charge, to any person obtaining

   a copy of this software and associated documentation files (the

diff --git a/doc/man/scons-time.xml b/doc/man/scons-time.xml
index 37a3655..328b76a 100644
--- a/doc/man/scons-time.xml
+++ b/doc/man/scons-time.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-  Copyright (c) 2001 - 2015 The SCons Foundation
+  Copyright (c) 2001 - 2016 The SCons Foundation
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
@@ -32,8 +32,8 @@
 <refmeta>
 <refentrytitle>SCONS-TIME</refentrytitle>
 <manvolnum>1</manvolnum>
-<refmiscinfo class='source'>SCons 2.4.1</refmiscinfo>
-<refmiscinfo class='manual'>SCons 2.4.1</refmiscinfo>
+<refmiscinfo class='source'>SCons 2.5.0</refmiscinfo>
+<refmiscinfo class='manual'>SCons 2.5.0</refmiscinfo>
 </refmeta>
 <refnamediv id='name'>
 <refname>scons-time</refname>
diff --git a/doc/man/scons.xml b/doc/man/scons.xml
index 8eb56a9..ef7bff9 100644
--- a/doc/man/scons.xml
+++ b/doc/man/scons.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-  Copyright (c) 2001 - 2015 The SCons Foundation
+  Copyright (c) 2001 - 2016 The SCons Foundation
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
@@ -75,8 +75,8 @@
 <refmeta>
 <refentrytitle>SCONS</refentrytitle>
 <manvolnum>1</manvolnum>
-<refmiscinfo class='source'>SCons 2.4.1</refmiscinfo>
-<refmiscinfo class='manual'>SCons 2.4.1</refmiscinfo>
+<refmiscinfo class='source'>SCons 2.5.0</refmiscinfo>
+<refmiscinfo class='manual'>SCons 2.5.0</refmiscinfo>
 </refmeta>
 <refnamediv id='name'>
 <refname>scons</refname>
@@ -1707,6 +1707,16 @@ specifies the type of warnings to be enabled or disabled:</para>
   </listitem>
   </varlistentry>
   <varlistentry>
+  <term>--warn=cache-version, --warn=no-cache-version</term>
+  <listitem>
+<para>Enables or disables warnings about the cache directory not using
+the latest configuration information
+<emphasis role="bold">CacheDir</emphasis>().
+These warnings are enabled by default.</para>
+
+  </listitem>
+  </varlistentry>
+  <varlistentry>
   <term>--warn=cache-write-error, --warn=no-cache-write-error</term>
   <listitem>
 <para>Enables or disables warnings about errors trying to
@@ -5630,7 +5640,8 @@ env.Command('foo.out', 'foo.in',
 changes the permissions on the specified
 <emphasis>dest</emphasis>
 file or directory to the specified
-<emphasis>mode</emphasis>.
+<emphasis>mode</emphasis>
+which can be octal or string, similar to the bash command.
 Examples:</para>
 
 <literallayout class="monospaced">
@@ -5639,6 +5650,12 @@ Execute(Chmod('file', 0755))
 env.Command('foo.out', 'foo.in',
             [Copy('$TARGET', '$SOURCE'),
              Chmod('$TARGET', 0755)])
+
+Execute(Chmod('file', "ugo+w"))
+
+env.Command('foo.out', 'foo.in',
+            [Copy('$TARGET', '$SOURCE'),
+             Chmod('$TARGET', "ugo+w")])
 </literallayout>
 
   </listitem>
diff --git a/doc/man/scons_title.xsl b/doc/man/scons_title.xsl
index f5c65f2..11de773 100644
--- a/doc/man/scons_title.xsl
+++ b/doc/man/scons_title.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-  Copyright (c) 2001 - 2015 The SCons Foundation
+  Copyright (c) 2001 - 2016 The SCons Foundation
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/doc/man/sconsign.xml b/doc/man/sconsign.xml
index 0a96069..7d86eb3 100644
--- a/doc/man/sconsign.xml
+++ b/doc/man/sconsign.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-  Copyright (c) 2001 - 2015 The SCons Foundation
+  Copyright (c) 2001 - 2016 The SCons Foundation
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
@@ -32,8 +32,8 @@
 <refmeta>
 <refentrytitle>SCONSIGN</refentrytitle>
 <manvolnum>1</manvolnum>
-<refmiscinfo class='source'>SCons 2.4.1</refmiscinfo>
-<refmiscinfo class='manual'>SCons 2.4.1</refmiscinfo>
+<refmiscinfo class='source'>SCons 2.5.0</refmiscinfo>
+<refmiscinfo class='manual'>SCons 2.5.0</refmiscinfo>
 </refmeta>
 <refnamediv id='name'>
 <refname>sconsign</refname>