Merge tag 'upstream/2.2.0'

Upstream version 2.2.0

1 files changed, 9 insertions, 9 deletions

diff --git a/README.txt b/README.txt
index 1d63921..d699353 100644
--- a/README.txt
+++ b/README.txt
@@ -2,7 +2,7 @@
 
                  SCons - a software construction tool
 
-                         Version 2.1.0
+                         Version 2.2.0
 
 
 This is SCons, a tool for building software (and other files).  SCons is
@@ -56,7 +56,7 @@ provided Python-standard setup script as follows:
 
 By default, the above command will do the following:
 
-    --  Install the version-numbered "scons-2.1.0" and "sconsign-2.1.0"
+    --  Install the version-numbered "scons-2.2.0" and "sconsign-2.2.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 +70,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.1.0" and
-        "sconsign-2.1.0" scripts by specifying the "--hardlink-scons"
+        scripts be hard links or symbolic links to the "scons-2.2.0" and
+        "sconsign-2.2.0" scripts by specifying the "--hardlink-scons"
         or "--symlink-scons" options on the command line.
 
-    --  Install "scons-2.1.0.bat" and "scons.bat" wrapper scripts in the
+    --  Install "scons-2.2.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.1.0.bat" and "scons.bat" files
+        specified to have "scons-2.2.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 +88,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.1.0 or C:\Python*\scons-2.1.0, for example).
+        (/usr/lib/scons-2.2.0 or C:\Python*\scons-2.2.0, for example).
         See below for more options related to installing the build
         engine library.
 
@@ -239,5 +239,5 @@ With plenty of help from the SCons Development team:
         Greg Spencer
         Christoph Wiedemann
 
-Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation
-src/README.txt 5357 2011/09/09 21:31:03 bdeegan
+Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 The SCons Foundation
+src/README.txt issue-2856:2676:d23b7a2f45e8 2012/08/05 15:38:28 garyo