Merge commit 'upstream/2.1.0'

1 files changed, 13 insertions, 12 deletions

diff --git a/doc/user/build-install.in b/doc/user/build-install.in
index 8d1c005..aad4a44 100644
--- a/doc/user/build-install.in
+++ b/doc/user/build-install.in
@@ -1,6 +1,6 @@
 <!--
 
-  Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
+  Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
@@ -121,9 +121,10 @@
 
     <para>
 
-    &SCons; will work with any version of Python from 2.4 or later.
+    &SCons; will work with any 2.x version of Python from 2.4 on;
+    3.0 and later are not yet supported.
     If you need to install Python and have a choice,
-    we recommend using the most recent Python version available.
+    we recommend using the most recent 2.x Python version available.
     Newer Pythons have significant improvements
     that help speed up the performance of &SCons;.
 
@@ -198,7 +199,7 @@
       </para>
 
       <screen>
-        # <userinput>rpm -Uvh scons-2.0.1-1.noarch.rpm</userinput>
+        # <userinput>rpm -Uvh scons-2.1.0-1.noarch.rpm</userinput>
       </screen>
 
       <para>
@@ -260,7 +261,7 @@
 
       &SCons; provides a Windows installer
       that makes installation extremely easy.
-      Download the <filename>scons-2.0.1.win32.exe</filename>
+      Download the <filename>scons-2.1.0.win32.exe</filename>
       file from the &SCons; download page at
       <ulink url="http://www.scons.org/download.php">http://www.scons.org/download.php</ulink>.
       Then all you need to do is execute the file
@@ -370,8 +371,8 @@
     <para>
 
     The first step is to download either the
-    <filename>scons-2.0.1.tar.gz</filename>
-    or <filename>scons-2.0.1.zip</filename>,
+    <filename>scons-2.1.0.tar.gz</filename>
+    or <filename>scons-2.1.0.zip</filename>,
     which are available from the SCons download page at
     <ulink url="http://www.scons.org/download.html">http://www.scons.org/download.html</ulink>.
 
@@ -384,7 +385,7 @@
     on Linux or UNIX,
     or <application>WinZip</application> on Windows.
     This will create a directory called
-    <filename>scons-2.0.1</filename>,
+    <filename>scons-2.1.0</filename>,
     usually in your local directory.
     Then change your working directory to that directory
     and install &SCons; by executing the following commands:
@@ -392,7 +393,7 @@
     </para>
 
     <screen>
-      # <userinput>cd scons-2.0.1</userinput>
+      # <userinput>cd scons-2.1.0</userinput>
       # <userinput>python setup.py install</userinput>
     </screen>
 
@@ -460,9 +461,9 @@
 
       This will install the &SCons; build engine
       in the
-      <filename>/usr/lib/scons-2.0.1</filename>
+      <filename>/usr/lib/scons-2.1.0</filename>
       or
-      <filename>C:\Python25\scons-2.0.1</filename>
+      <filename>C:\Python25\scons-2.1.0</filename>
       directory, for example.
 
       </para>
@@ -519,7 +520,7 @@
       relative to the specified prefix.
       Adding <option>--version-lib</option> to the
       above example would install the build engine in
-      <filename>/opt/scons/lib/scons-2.0.1</filename>.
+      <filename>/opt/scons/lib/scons-2.1.0</filename>.
 
       </para>