summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2014-08-23 20:19:34 -0400
committerGary Oberbrunner <garyo@oberbrunner.com>2014-08-23 20:19:34 -0400
commit61edca4165343ae6361160d05dc2e5d022e9d780 (patch)
tree47ef564bc868d384885ab8b0848c7c2dc3622f5b
parent1f5b82c89db82ce36896933cf0104f6821742cba (diff)
downloadscons-git-61edca4165343ae6361160d05dc2e5d022e9d780.tar.gz
Update doc, change python floor from 2.4 to 2.7.
-rw-r--r--doc/man/scons.xml2
-rw-r--r--doc/python10/process.xml4
-rw-r--r--doc/user/build-install.xml16
-rw-r--r--doc/user/misc.xml9
4 files changed, 15 insertions, 16 deletions
diff --git a/doc/man/scons.xml b/doc/man/scons.xml
index 8d52c1e69..55f2d6345 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.</para>
<para><command>scons</command>
-requires Python version 2.4 or later.
+requires Python version 2.7 or later.
There should be no other dependencies or requirements to run
<emphasis role="bold">scons.</emphasis></para>
diff --git a/doc/python10/process.xml b/doc/python10/process.xml
index 24645e61f..6c790d0b4 100644
--- a/doc/python10/process.xml
+++ b/doc/python10/process.xml
@@ -50,7 +50,7 @@
<listitem>
<para>
- &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).
</para>
@@ -296,7 +296,7 @@
</para>
<para>
-
+
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 ca40b0445..d107b4a79 100644
--- a/doc/user/build-install.xml
+++ b/doc/user/build-install.xml
@@ -6,7 +6,7 @@
<!ENTITY % scons SYSTEM "../scons.mod">
%scons;
-
+
<!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
%builders-mod;
<!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
@@ -15,7 +15,7 @@
%tools-mod;
<!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
%variables-mod;
-
+
]>
<chapter id="chap-build-install"
@@ -79,7 +79,7 @@
to configure simple &SCons; builds without knowing Python,
so you can skip this section if you
want to dive in and pick up things
- by example- -or, of course, if you are
+ by example- -or, of course, if you are
already familiar with Python.
</para>
@@ -147,7 +147,7 @@ Python 2.5.1
<para>
- &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 <filename>/usr/bin</filename>,
and the SCons library modules in
<filename>/usr/lib/scons</filename>.
@@ -530,7 +530,7 @@ Python 2.5.1
This would
install the <application>scons</application> script in
<filename>/opt/scons/bin</filename>
- and the build engine in
+ and the build engine in
<filename>/opt/scons/lib/scons</filename>,
</para>
@@ -566,7 +566,7 @@ Python 2.5.1
relative to the user's <literal>$HOME</literal> directory,
the &scons; script in
<filename>$HOME/bin</filename>
- and the build engine in
+ and the build engine in
<filename>$HOME/lib/scons</filename>,
simply type:
@@ -719,7 +719,7 @@ $ <userinput>python setup.py install --prefix=$HOME</userinput>
while: statements look like
break statements look like
-
+
continue statements look like
</para>
diff --git a/doc/user/misc.xml b/doc/user/misc.xml
index a71663f2a..286963d21 100644
--- a/doc/user/misc.xml
+++ b/doc/user/misc.xml
@@ -2,7 +2,7 @@
<!DOCTYPE sconsdoc [
<!ENTITY % scons SYSTEM "../scons.mod">
%scons;
-
+
<!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
%builders-mod;
<!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
@@ -56,11 +56,10 @@
<para>
- 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