Merge tag 'upstream/2.5.0'

Upstream version 2.5.0

1 files changed, 19 insertions, 6 deletions

diff --git a/scons.1 b/scons.1
index 71d8171..5b1964b 100644
--- a/scons.1
+++ b/scons.1
@@ -2,12 +2,12 @@
 .\"     Title: SCONS
 .\"    Author: Steven Knight
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: <pubdate>2004 - 2015</pubdate>
-.\"    Manual: SCons 2.4.1
-.\"    Source: SCons 2.4.1 version 2.4.1
+.\"      Date: <pubdate>2004 - 2016</pubdate>
+.\"    Manual: SCons 2.5.0
+.\"    Source: SCons 2.5.0 version 2.5.0
 .\"  Language: English
 .\"
-.TH "SCONS" "1" "<pubdate>2004 - 2015</pubdate>" "SCons 2\&.4\&.1 version 2.4.1" "SCons 2\&.4\&.1"
+.TH "SCONS" "1" "<pubdate>2004 - 2016</pubdate>" "SCons 2\&.5\&.0 version 2.5.0" "SCons 2\&.5\&.0"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1122,6 +1122,12 @@ specifies the type of warnings to be enabled or disabled:
 Enables or disables all warnings\&.
 .RE
 .PP
+\-\-warn=cache\-version, \-\-warn=no\-cache\-version
+.RS 4
+Enables or disables warnings about the cache directory not using the latest configuration information
+\fBCacheDir\fR()\&. These warnings are enabled by default\&.
+.RE
+.PP
 \-\-warn=cache\-write\-error, \-\-warn=no\-cache\-write\-error
 .RS 4
 Enables or disables warnings about errors trying to write a copy of a built file to a specified
@@ -18514,7 +18520,8 @@ Chmod(\fIdest\fR, \fImode\fR)
 Returns an Action object that changes the permissions on the specified
 \fIdest\fR
 file or directory to the specified
-\fImode\fR\&. Examples:
+\fImode\fR
+which can be octal or string, similar to the bash command\&. Examples:
 .sp
 .if n \{\
 .RS 4
@@ -18525,6 +18532,12 @@ Execute(Chmod(\*(Aqfile\*(Aq, 0755))
 env\&.Command(\*(Aqfoo\&.out\*(Aq, \*(Aqfoo\&.in\*(Aq,
             [Copy(\*(Aq$TARGET\*(Aq, \*(Aq$SOURCE\*(Aq),
              Chmod(\*(Aq$TARGET\*(Aq, 0755)])
+
+Execute(Chmod(\*(Aqfile\*(Aq, "ugo+w"))
+
+env\&.Command(\*(Aqfoo\&.out\*(Aq, \*(Aqfoo\&.in\*(Aq,
+            [Copy(\*(Aq$TARGET\*(Aq, \*(Aq$SOURCE\*(Aq),
+             Chmod(\*(Aq$TARGET\*(Aq, "ugo+w")])
 .fi
 .if n \{\
 .RE
@@ -19792,5 +19805,5 @@ Author.
 \fBSteven Knight and the SCons Development Team\fR
 .SH "COPYRIGHT"
 .br
-Copyright \(co 2004 - 2015 The SCons Foundation
+Copyright \(co 2004 - 2016 The SCons Foundation
 .br