Imported Upstream version 2.5.0+repackupstream/2.5.0+repack

1 files changed, 21 insertions, 4 deletions

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>