summaryrefslogtreecommitdiffstats
path: root/Doc/faq/programming.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-10-06 09:32:48 (GMT)
committerGeorg Brandl <georg@python.org>2010-10-06 09:32:48 (GMT)
commit0930228aee0fd70066b5d7fe6afd41c2bce0dca6 (patch)
tree38aee6527a2a3e27010b9eaa801ccedc34104b1e /Doc/faq/programming.rst
parent21946afe3f2d21ac6b50021802e503686abb9347 (diff)
downloadcpython-0930228aee0fd70066b5d7fe6afd41c2bce0dca6.zip
cpython-0930228aee0fd70066b5d7fe6afd41c2bce0dca6.tar.gz
cpython-0930228aee0fd70066b5d7fe6afd41c2bce0dca6.tar.bz2
Merged revisions 84945 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84945 | georg.brandl | 2010-09-21 16:48:28 +0200 (Di, 21 Sep 2010) | 1 line #9911: doc copyedits. ........
Diffstat (limited to 'Doc/faq/programming.rst')
-rw-r--r--Doc/faq/programming.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
index d506a8e..e53facd 100644
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -944,7 +944,7 @@ Is there an equivalent to Perl's chomp() for removing trailing newlines from str
-------------------------------------------------------------------------------------
Starting with Python 2.2, you can use ``S.rstrip("\r\n")`` to remove all
-occurences of any line terminator from the end of the string ``S`` without
+occurrences of any line terminator from the end of the string ``S`` without
removing other trailing whitespace. If the string ``S`` represents more than
one line, with several empty lines at the end, the line terminators for all the
blank lines will be removed::