Merged revisions 3611-3763,3765-3794,3796-3811,3813-3839,3841-3847 via svnmerge from

http://scons.tigris.org/svn/scons/checkpoint

................
  r3765 | stevenknight | 2008-11-04 07:57:03 -0800 (Tue, 04 Nov 2008) | 2 lines

  Update release info for checkpoint.
................
  r3796 | stevenknight | 2008-11-25 21:56:26 -0800 (Tue, 25 Nov 2008) | 2 lines

  Updates for 20081125 checkpoint release.
................
  r3797 | stevenknight | 2008-11-26 08:21:04 -0800 (Wed, 26 Nov 2008) | 2 lines

  User's Guide updates for changes to error messages.
................
  r3813 | stevenknight | 2008-12-07 19:13:17 -0800 (Sun, 07 Dec 2008) | 2 lines

  Update lines for the 20081207 checkpoint release (candidate for 1.2.0).
................
  r3814 | stevenknight | 2008-12-07 19:35:09 -0800 (Sun, 07 Dec 2008) | 2 lines

  Update troubleshoot.xml for the changes to taskmastertrace output.
................
  r3847 | stevenknight | 2008-12-21 07:57:50 -0800 (Sun, 21 Dec 2008) | 9 lines

  Merged revisions 3610-3840,3842-3846 via svnmerge from
  http://scons.tigris.org/svn/scons/release

  ........
    r3842 | stevenknight | 2008-12-20 22:48:14 -0800 (Sat, 20 Dec 2008) | 2 lines

    Update files for 1.2.0.
  ........
................

1 files changed, 20 insertions, 20 deletions

diff --git a/README b/README
index c59911a..6eff34c 100644
--- a/README
+++ b/README
@@ -83,11 +83,11 @@ In this case, your options are:
     --  (Optional.)  Install from a pre-packaged SCons package that
         does not require distutils:
 
-            Red Hat Linux       scons-1.1.0.noarch.rpm
+            Red Hat Linux       scons-1.2.0.noarch.rpm
 
             Debian GNU/Linux    use apt-get to get the official package
 
-            Windows             scons-1.1.0.win32.exe
+            Windows             scons-1.2.0.win32.exe
 
     --  (Recommended.)  Download the latest distutils package from the
         following URL:
@@ -159,7 +159,7 @@ And on Windows:
 
 By default, the above commands will do the following:
 
-    --  Install the version-numbered "scons-1.1.0" and "sconsign-1.1.0"
+    --  Install the version-numbered "scons-1.2.0" and "sconsign-1.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
@@ -173,24 +173,24 @@ By default, the above commands 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.1.0" and
-        "sconsign-1.1.0" scripts by specifying the "--hardlink-scons" or
+        scripts be hard links or symbolic links to the "scons-1.2.0" and
+        "sconsign-1.2.0" scripts by specifying the "--hardlink-scons" or
         "--symlink-scons" options on the command line.
 
-    --  Install "scons-1.1.0.bat" and "scons.bat" wrapper scripts in the
+    --  Install "scons-1.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-1.1.0.bat" and "scons.bat" files installed
+        specified to have "scons-1.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 Windows systems.
 
     --  Install the SCons build engine (a Python module) in an
         appropriate version-numbered SCons library directory
-        (/usr/lib/scons-1.1.0 or C:\Python*\scons-1.1.0, for example).
+        (/usr/lib/scons-1.2.0 or C:\Python*\scons-1.2.0, for example).
         See below for more options related to installing the build
         engine library.
 
@@ -527,18 +527,18 @@ On Windows:
 Depending on the utilities installed on your system, any or all of the
 following packages will be built:
 
-        build/dist/scons-1.1.0-1.noarch.rpm
-        build/dist/scons-1.1.0-1.src.rpm
-        build/dist/scons-1.1.0.linux-i686.tar.gz
-        build/dist/scons-1.1.0.tar.gz
-        build/dist/scons-1.1.0.win32.exe
-        build/dist/scons-1.1.0.zip
-        build/dist/scons-doc-1.1.0.tar.gz
-        build/dist/scons-local-1.1.0.tar.gz
-        build/dist/scons-local-1.1.0.zip
-        build/dist/scons-src-1.1.0.tar.gz
-        build/dist/scons-src-1.1.0.zip
-        build/dist/scons_1.1.0-1_all.deb
+        build/dist/scons-1.2.0-1.noarch.rpm
+        build/dist/scons-1.2.0-1.src.rpm
+        build/dist/scons-1.2.0.linux-i686.tar.gz
+        build/dist/scons-1.2.0.tar.gz
+        build/dist/scons-1.2.0.win32.exe
+        build/dist/scons-1.2.0.zip
+        build/dist/scons-doc-1.2.0.tar.gz
+        build/dist/scons-local-1.2.0.tar.gz
+        build/dist/scons-local-1.2.0.zip
+        build/dist/scons-src-1.2.0.tar.gz
+        build/dist/scons-src-1.2.0.zip
+        build/dist/scons_1.2.0-1_all.deb
 
 The SConstruct file is supposed to be smart enough to avoid trying to
 build packages for which you don't have the proper utilities installed.