summaryrefslogtreecommitdiffstats
path: root/Doc/faq/programming.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-09-21 14:48:28 (GMT)
committerGeorg Brandl <georg@python.org>2010-09-21 14:48:28 (GMT)
commit6faee4e2ce8ee107bfe92bac74afa2c30ed4aebd (patch)
tree2493738443750be19a421393c8b20fde0f1a195e /Doc/faq/programming.rst
parentaf38dc5b0c6f4a0308555199a07fcaba8f27e94d (diff)
downloadcpython-6faee4e2ce8ee107bfe92bac74afa2c30ed4aebd.zip
cpython-6faee4e2ce8ee107bfe92bac74afa2c30ed4aebd.tar.gz
cpython-6faee4e2ce8ee107bfe92bac74afa2c30ed4aebd.tar.bz2
#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 a35459b..4113664 100644
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -953,7 +953,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::