Merge tag 'upstream/2.5.0+repack'

Upstream version 2.5.0+repack

4 files changed, 4 insertions, 4 deletions

diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml
index 6a0337b..232e96f 100644
--- a/doc/generated/examples/caching_ex-random_1.xml
+++ b/doc/generated/examples/caching_ex-random_1.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+cc -o f4.o -c f4.c
 cc -o f2.o -c f2.c
 cc -o f1.o -c f1.c
 cc -o f5.o -c f5.c
 cc -o f3.o -c f3.c
-cc -o f4.o -c f4.c
 cc -o prog f1.o f2.o f3.o f4.o f5.o
 </screen>
diff --git a/doc/generated/examples/tasks_ex1_1.xml b/doc/generated/examples/tasks_ex1_1.xml
index 5760a45..4885fde 100644
--- a/doc/generated/examples/tasks_ex1_1.xml
+++ b/doc/generated/examples/tasks_ex1_1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
+cat &lt; test.bar &gt; test.h
 cc -o app main.cpp
 cat &lt; foo.bar2 &gt; foo.cpp
 cc -o app2 main2.cpp foo.cpp
-cat &lt; test.bar &gt; test.h
 </screen>
diff --git a/doc/generated/examples/troubleshoot_Dump_1.xml b/doc/generated/examples/troubleshoot_Dump_1.xml
index bf141a0..99d1399 100644
--- a/doc/generated/examples/troubleshoot_Dump_1.xml
+++ b/doc/generated/examples/troubleshoot_Dump_1.xml
@@ -47,7 +47,7 @@ scons: Reading SConscript files ...
   'PROGSUFFIX': '',
   'PSPAWN': &lt;function piped_env_spawn at 0x700000&amp;gt;,
   'RDirs': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&amp;gt;,
-  'SCANNERS': [],
+  'SCANNERS': [&lt;SCons.Scanner.Base object at 0x700000&amp;gt;],
   'SHELL': 'sh',
   'SHLIBPREFIX': '$LIBPREFIX',
   'SHLIBSUFFIX': '.so',
diff --git a/doc/generated/examples/troubleshoot_Dump_2.xml b/doc/generated/examples/troubleshoot_Dump_2.xml
index 0ae8fe1..a621422 100644
--- a/doc/generated/examples/troubleshoot_Dump_2.xml
+++ b/doc/generated/examples/troubleshoot_Dump_2.xml
@@ -71,7 +71,7 @@ scons: Reading SConscript files ...
   'RCFLAGS': [],
   'RCSUFFIXES': ['.rc', '.rc2'],
   'RDirs': &lt;SCons.Defaults.Variable_Method_Caller object at 0x700000&amp;gt;,
-  'SCANNERS': [],
+  'SCANNERS': [&lt;SCons.Scanner.Base object at 0x700000&amp;gt;],
   'SHCC': '$CC',
   'SHCCCOM': &lt;SCons.Action.FunctionAction object at 0x700000&amp;gt;,
   'SHCCFLAGS': ['$CCFLAGS'],