diff options
author | Greg Noel <GregNoel@tigris.org> | 2010-03-25 04:14:28 (GMT) |
---|---|---|
committer | Greg Noel <GregNoel@tigris.org> | 2010-03-25 04:14:28 (GMT) |
commit | 22d352500f1cd6bd0c53d788a5dc44a1fefa676e (patch) | |
tree | 0984fd581082c27cfbfbb7f94d5751b0e6fd2741 /doc/user | |
parent | 75ac32ac8e32076e25b72a19eb56340cc585fa4e (diff) | |
download | SCons-22d352500f1cd6bd0c53d788a5dc44a1fefa676e.zip SCons-22d352500f1cd6bd0c53d788a5dc44a1fefa676e.tar.gz SCons-22d352500f1cd6bd0c53d788a5dc44a1fefa676e.tar.bz2 |
Move 2.0 changes collected in branches/pending back to trunk for further
development. Note that this set of changes is NOT backward-compatible;
the trunk no longer works with Python 1.5.2, 2.0, or 2.1.
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/less-simple.in | 2 | ||||
-rw-r--r-- | doc/user/less-simple.xml | 2 | ||||
-rw-r--r-- | doc/user/tasks.in | 5 | ||||
-rw-r--r-- | doc/user/tasks.xml | 5 |
4 files changed, 6 insertions, 8 deletions
diff --git a/doc/user/less-simple.in b/doc/user/less-simple.in index f7bd7d5..fcffa5e 100644 --- a/doc/user/less-simple.in +++ b/doc/user/less-simple.in @@ -371,7 +371,7 @@ you'll have realized that this is similar to the <function>split()</function> method in the Python standard <function>string</function> module. - Unlike the <function>string.split()</function> method, + Unlike the <function>split()</function> member function of strings, however, the &Split; function does not require a string as input and will wrap up a single non-string object in a list, diff --git a/doc/user/less-simple.xml b/doc/user/less-simple.xml index 0bc382e..8b781dd 100644 --- a/doc/user/less-simple.xml +++ b/doc/user/less-simple.xml @@ -360,7 +360,7 @@ you'll have realized that this is similar to the <function>split()</function> method in the Python standard <function>string</function> module. - Unlike the <function>string.split()</function> method, + Unlike the <function>split()</function> member function of strings, however, the &Split; function does not require a string as input and will wrap up a single non-string object in a list, diff --git a/doc/user/tasks.in b/doc/user/tasks.in index c51ad36..434871f 100644 --- a/doc/user/tasks.in +++ b/doc/user/tasks.in @@ -74,9 +74,8 @@ if filename.find(old_prefix) == 0: <simpara>or in Python 1.5.2:</simpara> <programlisting> -import string -if string.find(filename, old_prefix) == 0: - filename = string.replace(filename, old_prefix, new_prefix) +if filename.find(old_prefix) == 0: + filename = filename.replace(old_prefix, new_prefix) </programlisting> </example> diff --git a/doc/user/tasks.xml b/doc/user/tasks.xml index c51ad36..434871f 100644 --- a/doc/user/tasks.xml +++ b/doc/user/tasks.xml @@ -74,9 +74,8 @@ if filename.find(old_prefix) == 0: <simpara>or in Python 1.5.2:</simpara> <programlisting> -import string -if string.find(filename, old_prefix) == 0: - filename = string.replace(filename, old_prefix, new_prefix) +if filename.find(old_prefix) == 0: + filename = filename.replace(old_prefix, new_prefix) </programlisting> </example> |