Update upstream source from tag 'upstream/3.1.0'

Update to upstream version '3.1.0'
with Debian dir e69b7671114411c368722827d87d86b44ed7cd40

2 files changed, 19 insertions, 10 deletions

diff --git a/doc/user/depends.xml b/doc/user/depends.xml
index 35372e7..bb0a142 100644
--- a/doc/user/depends.xml
+++ b/doc/user/depends.xml
@@ -517,7 +517,7 @@ cc -o hello hello.o
       <scons_example name="depends_function">
         <file name="SConstruct" printme="1">
 Program('hello.c')
-def decide_if_changed(dependency, target, prev_ni):
+def decide_if_changed(dependency, target, prev_ni, repo_node=None):
     if dependency.get_timestamp() != prev_ni.timestamp:
         dep = str(dependency)
         tgt = str(target)
@@ -561,6 +561,13 @@ int main() { printf("Hello, world!\n"); }
 
       </para>
 
+        <para>
+            The fourth argument <varname>repo_node</varname>,
+            is the &Node; to use if it is not None when comparing &BuildInfo;.
+            This is typically only set when the target node only exists in a
+            &Repository;
+        </para>
+
       <variablelist>
 
         <varlistentry>
@@ -637,7 +644,7 @@ int main() { printf("Hello, world!\n"); }
       <sconstruct>
 env = Environment()
 
-def config_file_decider(dependency, target, prev_ni):
+def config_file_decider(dependency, target, prev_ni, repo_node=None):
     import os.path
 
     # We always have to init the .csig value...
diff --git a/doc/user/less-simple.xml b/doc/user/less-simple.xml
index 6de1075..e8ff44a 100644
--- a/doc/user/less-simple.xml
+++ b/doc/user/less-simple.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE sconsdoc [
     <!ENTITY % scons SYSTEM "../scons.mod">
     %scons;
-    
+
     <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
     %builders-mod;
     <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
@@ -257,7 +257,7 @@ Program('program', Glob('*.c'))
     (see <xref linkend="chap-variants"></xref>, below)
     and repositories
     (see <xref linkend="chap-repositories"></xref>, below),
-    excluding some files 
+    excluding some files
     and returning strings rather than Nodes.
 
     </para>
@@ -311,7 +311,7 @@ Program('hello', ['hello.c'])
     </para>
 
     <important>
-    
+
     <para>
 
     Although &SCons; functions
@@ -359,7 +359,7 @@ Program('program2', common_sources + ['program2.c'])
     <para>
 
     One drawback to the use of a Python list
-    for source files is that 
+    for source files is that
     each file name must be enclosed in quotes
     (either single quotes or double quotes).
     This can get cumbersome and difficult to read
@@ -675,8 +675,10 @@ env.SharedLibrary('word', 'word.cpp',
 
     <para>
 
-    It is also possible to use the <literal>parse_flags</literal> keyword argument in an
-    override:
+    It is also possible to use the <literal>parse_flags</literal>
+    keyword argument in an override to merge command-line
+    style arguments into the appropriate construction
+    variables (see &f-link-env-MergeFlags;).
 
     </para>
 
@@ -688,7 +690,7 @@ env.SharedLibrary('word', 'word.cpp',
     </para>
 
     <programlisting>
-env = Program('hello', 'hello.c', parse_flags = '-Iinclude -DEBUG -lm')
+env = Program('hello', 'hello.c', parse_flags='-Iinclude -DEBUG -lm')
     </programlisting>
 
     <para>
@@ -701,4 +703,4 @@ env = Program('hello', 'hello.c', parse_flags = '-Iinclude -DEBUG -lm')
 
   </section>
 
-</chapter>
\ No newline at end of file
+</chapter>