Merge tag 'upstream/2.4.0'

Upstream version 2.4.0

1 files changed, 30 insertions, 23 deletions

diff --git a/README.txt b/README.txt
index c3480ad..7f4db66 100644
--- a/README.txt
+++ b/README.txt
@@ -2,7 +2,7 @@
 
                  SCons - a software construction tool
 
-                         Version 2.3.6
+                         Version 2.4.0
 
 
 This is SCons, a tool for building software (and other files).  SCons is
@@ -28,7 +28,8 @@ the latest version by checking the SCons download page at:
 EXECUTION REQUIREMENTS
 ======================
 
-Running SCons requires Python version 2.4 or later.  There should be
+Running SCons requires Python version 2.7.*.  Currently it does not 
+run on the Python 3.x release.  There should be
 no other dependencies or requirements to run SCons.  (There is, however,
 an additional requirement to *install* SCons from this particular
 package; see the next section.)
@@ -56,7 +57,7 @@ provided Python-standard setup script as follows:
 
 By default, the above command will do the following:
 
-    --  Install the version-numbered "scons-2.3.6" and "sconsign-2.3.6"
+    --  Install the version-numbered "scons-2.4.0" and "sconsign-2.4.0"
         scripts in the default system script directory (/usr/bin or
         C:\Python*\Scripts, for example).  This can be disabled by
         specifying the "--no-version-script" option on the command
@@ -70,17 +71,17 @@ By default, the above command will do the following:
         making it the default on your system.
 
         On UNIX or Linux systems, you can have the "scons" and "sconsign"
-        scripts be hard links or symbolic links to the "scons-2.3.6" and
-        "sconsign-2.3.6" scripts by specifying the "--hardlink-scons"
+        scripts be hard links or symbolic links to the "scons-2.4.0" and
+        "sconsign-2.4.0" scripts by specifying the "--hardlink-scons"
         or "--symlink-scons" options on the command line.
 
-    --  Install "scons-2.3.6.bat" and "scons.bat" wrapper scripts in the
+    --  Install "scons-2.4.0.bat" and "scons.bat" wrapper scripts in the
         Python prefix directory on Windows (C:\Python*, for example).
         This can be disabled by specifying the "--no-install-bat" option
         on the command line.
 
         On UNIX or Linux systems, the "--install-bat" option may be
-        specified to have "scons-2.3.6.bat" and "scons.bat" files
+        specified to have "scons-2.4.0.bat" and "scons.bat" files
         installed in the default system script directory, which is useful
         if you want to install SCons in a shared file system directory
         that can be used to execute SCons from both UNIX/Linux and
@@ -88,7 +89,7 @@ By default, the above command will do the following:
 
     --  Install the SCons build engine (a Python module) in an
         appropriate version-numbered SCons library directory
-        (/usr/lib/scons-2.3.6 or C:\Python*\scons-2.3.6, for example).
+        (/usr/lib/scons-2.4.0 or C:\Python*\scons-2.4.0, for example).
         See below for more options related to installing the build
         engine library.
 
@@ -224,20 +225,26 @@ Check the SCons web site at:
 
 AUTHOR INFO
 ===========
-
-Steven Knight
-knight at baldmt dot com
-http://www.baldmt.com/~knight/
-
-With plenty of help from the SCons Development team:
-        Chad Austin
-        Charles Crain
-        Steve Leblanc
-        Greg Noel
-        Gary Oberbrunner
-        Anthony Roach
-        Greg Spencer
-        Christoph Wiedemann
+SCons was originally written by Steven Knight, knight at baldmt dot com.
+Since around 2010 it has been maintained by the SCons
+development team, co-managed by Bill Deegan and Gary Oberbrunner, with
+many contributors, including but not at all limited to:
+
+- Chad Austin
+- Dirk Baechle
+- Charles Crain
+- William Deegan
+- Steve Leblanc
+- Rob Managan
+- Greg Noel
+- Gary Oberbrunner
+- Anthony Roach
+- Greg Spencer
+- Tom Tanner
+- Anatoly Techtonik
+- Christoph Wiedemann
+- Russel Winder
+
+\... and many others.
 
 Copyright (c) 2001 - 2015 The SCons Foundation
-src/README.txt rel_2.3.5:3347:d31d5a4e74b6 2015/07/31 14:36:10 bdbaddog