summaryrefslogtreecommitdiff
path: root/doc/user/misc.in
diff options
context:
space:
mode:
authorLuca Falavigna <dktrkranz@debian.org>2011-09-10 11:25:53 +0200
committerLuca Falavigna <dktrkranz@debian.org>2011-09-10 11:25:53 +0200
commitba4425ab5227fd9597fccd368bffff6bf1032149 (patch)
treeb286bf4e65900f6a7604c001dc2ad94fec12e768 /doc/user/misc.in
parent84c6f9729dbbc175431874957d0654310410bd6f (diff)
Imported Upstream version 2.1.0upstream/2.1.0
Diffstat (limited to 'doc/user/misc.in')
-rw-r--r--doc/user/misc.in12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/user/misc.in b/doc/user/misc.in
index 87b5db4..fef1b8f 100644
--- a/doc/user/misc.in
+++ b/doc/user/misc.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
@@ -36,7 +36,7 @@
<para>
Although the &SCons; code itself will run
- on any Python version 2.4 or later,
+ on any 2.x Python version 2.4 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)
@@ -82,7 +82,7 @@
<para>
- And then &SCons will exit with the following error
+ And then &SCons; will exit with the following error
message when a user runs it with an unsupported
earlier version of Python:
@@ -151,7 +151,7 @@
<para>
- And then &SCons will exit with the following error
+ And then &SCons; will exit with the following error
message when a user runs it with an unsupported
earlier version of &SCons;:
@@ -274,13 +274,13 @@
</file>
<directory name="src"></directory>
<directory name="src/include"></directory>
- </file>
<file name="src/include/private.h">
exists
- <directory name="include"></directory>
</file>
+ <directory name="include"></directory>
<file name="include/dist.h">
exists
+ </file>
</scons_example>
<scons_output example="FindFile1b" os="posix">