From 738149c9bfb9965d013d01ef99f9bb1c2819e7e8 Mon Sep 17 00:00:00 2001
From: Luca Falavigna <dktrkranz@debian.org>
Date: Tue, 15 Jun 2010 14:28:22 +0000
Subject: Imported Upstream version 2.0.0

---
 doc/user/build-install.xml | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

(limited to 'doc/user/build-install.xml')

diff --git a/doc/user/build-install.xml b/doc/user/build-install.xml
index 577c140..05ead9d 100644
--- a/doc/user/build-install.xml
+++ b/doc/user/build-install.xml
@@ -111,17 +111,6 @@
 
     <para>
 
-    (Note that the <option>-V</option> option
-    was added to Python version 2.0,
-    so if your system only has an earlier version available
-    you may see an
-    <literal>"Unknown option: -V"</literal>
-    error message.)
-
-    </para>
-
-    <para>
-
     The standard location for information
     about downloading and installing Python is
     <ulink url="http://www.python.org/download/">http://www.python.org/download/</ulink>.
@@ -132,10 +121,10 @@
 
     <para>
 
-    &SCons; will work with any version of Python from 1.5.2 or later.
+    &SCons; will work with any version of Python from 2.4 or later.
     If you need to install Python and have a choice,
-    we recommend using the most recent Python 2.5 version available.
-    Python 2.5 has significant improvements
+    we recommend using the most recent Python version available.
+    Newer Pythons have significant improvements
     that help speed up the performance of &SCons;.
 
     </para>
@@ -209,7 +198,7 @@
       </para>
 
       <screen>
-        # <userinput>rpm -Uvh scons-1.3.0-1.noarch.rpm</userinput>
+        # <userinput>rpm -Uvh scons-2.0.0.final.0-1.noarch.rpm</userinput>
       </screen>
 
       <para>
@@ -271,7 +260,7 @@
 
       &SCons; provides a Windows installer
       that makes installation extremely easy.
-      Download the <filename>scons-1.3.0.win32.exe</filename>
+      Download the <filename>scons-2.0.0.final.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
@@ -381,8 +370,8 @@
     <para>
 
     The first step is to download either the
-    <filename>scons-1.3.0.tar.gz</filename>
-    or <filename>scons-1.3.0.zip</filename>,
+    <filename>scons-2.0.0.final.0.tar.gz</filename>
+    or <filename>scons-2.0.0.final.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>.
 
@@ -395,7 +384,7 @@
     on Linux or UNIX,
     or <application>WinZip</application> on Windows.
     This will create a directory called
-    <filename>scons-1.3.0</filename>,
+    <filename>scons-2.0.0.final.0</filename>,
     usually in your local directory.
     Then change your working directory to that directory
     and install &SCons; by executing the following commands:
@@ -403,7 +392,7 @@
     </para>
 
     <screen>
-      # <userinput>cd scons-1.3.0</userinput>
+      # <userinput>cd scons-2.0.0.final.0</userinput>
       # <userinput>python setup.py install</userinput>
     </screen>
 
@@ -471,9 +460,9 @@
 
       This will install the &SCons; build engine
       in the
-      <filename>/usr/lib/scons-1.3.0</filename>
+      <filename>/usr/lib/scons-2.0.0.final.0</filename>
       or
-      <filename>C:\Python25\scons-1.3.0</filename>
+      <filename>C:\Python25\scons-2.0.0.final.0</filename>
       directory, for example.
 
       </para>
@@ -530,7 +519,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-1.3.0</filename>.
+      <filename>/opt/scons/lib/scons-2.0.0.final.0</filename>.
 
       </para>
 
-- 
cgit v1.2.3