From 61edca4165343ae6361160d05dc2e5d022e9d780 Mon Sep 17 00:00:00 2001 From: Gary Oberbrunner Date: Sat, 23 Aug 2014 20:19:34 -0400 Subject: Update doc, change python floor from 2.4 to 2.7. --- doc/man/scons.xml | 2 +- doc/python10/process.xml | 4 ++-- doc/user/build-install.xml | 16 ++++++++-------- doc/user/misc.xml | 9 ++++----- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/doc/man/scons.xml b/doc/man/scons.xml index 8d52c1e..55f2d63 100644 --- a/doc/man/scons.xml +++ b/doc/man/scons.xml @@ -425,7 +425,7 @@ try to access a list member that does not exist. scons -requires Python version 2.4 or later. +requires Python version 2.7 or later. There should be no other dependencies or requirements to run scons. diff --git a/doc/python10/process.xml b/doc/python10/process.xml index 24645e6..6c790d0 100644 --- a/doc/python10/process.xml +++ b/doc/python10/process.xml @@ -50,7 +50,7 @@ - &SCons; will be written to Python version 2.4 (to ensure + &SCons; will be written to Python version 2.7 (to ensure usability by a wide install base). @@ -296,7 +296,7 @@ - + In practice, simple tests only need to initialize a test object, use the object to write some input files, run &SCons;, and then check whatever criteria diff --git a/doc/user/build-install.xml b/doc/user/build-install.xml index ca40b04..d107b4a 100644 --- a/doc/user/build-install.xml +++ b/doc/user/build-install.xml @@ -6,7 +6,7 @@ %scons; - + %builders-mod; @@ -15,7 +15,7 @@ %tools-mod; %variables-mod; - + ]> @@ -147,7 +147,7 @@ Python 2.5.1 - &SCons; will work with any 2.x version of Python from 2.4 on; + &SCons; will work with any 2.x version of Python from 2.7 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 2.x Python version available. @@ -209,7 +209,7 @@ Python 2.5.1 a specific &SCons; RPM file, you can download and install from the generic RPM provided by the &SCons; project. - This will install the + This will install the SCons script(s) in /usr/bin, and the SCons library modules in /usr/lib/scons. @@ -530,7 +530,7 @@ Python 2.5.1 This would install the scons script in /opt/scons/bin - and the build engine in + and the build engine in /opt/scons/lib/scons, @@ -566,7 +566,7 @@ Python 2.5.1 relative to the user's $HOME directory, the &scons; script in $HOME/bin - and the build engine in + and the build engine in $HOME/lib/scons, simply type: @@ -719,7 +719,7 @@ $ python setup.py install --prefix=$HOME while: statements look like break statements look like - + continue statements look like diff --git a/doc/user/misc.xml b/doc/user/misc.xml index a71663f..286963d 100644 --- a/doc/user/misc.xml +++ b/doc/user/misc.xml @@ -2,7 +2,7 @@ %scons; - + %builders-mod; @@ -56,11 +56,10 @@ - Although the &SCons; code itself will run - on any 2.x Python version 2.4 or later, + Although the &SCons; code itself will run + on any 2.x Python version 2.7 or later, you are perfectly free to make use of - Python syntax and modules from more modern versions - (for example, Python 2.5 or 2.6) + Python syntax and modules from later versions when writing your &SConscript; files or your own local modules. If you do this, it's usually helpful to -- cgit v0.12