summaryrefslogtreecommitdiff
path: root/doc/user/misc.xml
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2014-08-25 15:33:13 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2014-08-25 15:33:13 +0200
commitf762ee6d16ccdd40317608b11e685e2f17c06f22 (patch)
tree8424afe37359fbcde2e014eda338869947e11c2e /doc/user/misc.xml
parent02292cfec56d773f3e3e8607f5b7f76f97c9c874 (diff)
parent16bc58049adac72cb1f398d9f89e42757bb4a22f (diff)
Merge tag 'upstream/2.3.3'
Upstream version 2.3.3
Diffstat (limited to 'doc/user/misc.xml')
-rw-r--r--doc/user/misc.xml9
1 files changed, 4 insertions, 5 deletions
diff --git a/doc/user/misc.xml b/doc/user/misc.xml
index 0c56b43..2410714 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