Merge commit 'upstream/1.2.0.d20100306'

1 files changed, 11 insertions, 11 deletions

diff --git a/README.txt b/README.txt
index f2034b2..ee00097 100644
--- a/README.txt
+++ b/README.txt
@@ -1,10 +1,10 @@
 # Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
-# src/README.txt 4629 2010/01/17 22:23:21 scons
+# src/README.txt 4691 2010/03/06 16:22:36 bdbaddog
 
 
                  SCons - a software construction tool
 
-                         Version 1.2.0.d20100117
+                         Version 1.2.0.d20100306
 
 
 This is SCons, a tool for building software (and other files).  SCons is
@@ -60,12 +60,12 @@ In this case, your options are:
     --  (Recommended.)  Install from a pre-packaged SCons package that
         does not require distutils:
 
-            Red Hat Linux       scons-1.2.0.d20100117-1.noarch.rpm
+            Red Hat Linux       scons-1.2.0.d20100306-1.noarch.rpm
 
-            Debian GNU/Linux    scons_1.2.0.d20100117-1_all.deb
+            Debian GNU/Linux    scons_1.2.0.d20100306-1_all.deb
                                 (or use apt-get)
 
-            Windows             scons-1.2.0.d20100117.win32.exe
+            Windows             scons-1.2.0.d20100306.win32.exe
 
     --  (Optional.)  Download the latest distutils package from the
         following URL:
@@ -88,7 +88,7 @@ provided Python-standard setup script as follows:
 
 By default, the above command will do the following:
 
-    --  Install the version-numbered "scons-1.2.0.d20100117" and "sconsign-1.2.0.d20100117"
+    --  Install the version-numbered "scons-1.2.0.d20100306" and "sconsign-1.2.0.d20100306"
         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
@@ -102,17 +102,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-1.2.0.d20100117" and
-        "sconsign-1.2.0.d20100117" scripts by specifying the "--hardlink-scons"
+        scripts be hard links or symbolic links to the "scons-1.2.0.d20100306" and
+        "sconsign-1.2.0.d20100306" scripts by specifying the "--hardlink-scons"
         or "--symlink-scons" options on the command line.
 
-    --  Install "scons-1.2.0.d20100117.bat" and "scons.bat" wrapper scripts in the
+    --  Install "scons-1.2.0.d20100306.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-1.2.0.d20100117.bat" and "scons.bat" files
+        specified to have "scons-1.2.0.d20100306.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
@@ -120,7 +120,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-1.2.0.d20100117 or C:\Python*\scons-1.2.0.d20100117, for example).
+        (/usr/lib/scons-1.2.0.d20100306 or C:\Python*\scons-1.2.0.d20100306, for example).
         See below for more options related to installing the build
         engine library.