diff options
| author | Georg Brandl <georg@python.org> | 2010-09-21 14:48:28 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-09-21 14:48:28 (GMT) |
| commit | 6faee4e2ce8ee107bfe92bac74afa2c30ed4aebd (patch) | |
| tree | 2493738443750be19a421393c8b20fde0f1a195e /Doc/faq | |
| parent | af38dc5b0c6f4a0308555199a07fcaba8f27e94d (diff) | |
| download | cpython-6faee4e2ce8ee107bfe92bac74afa2c30ed4aebd.zip cpython-6faee4e2ce8ee107bfe92bac74afa2c30ed4aebd.tar.gz cpython-6faee4e2ce8ee107bfe92bac74afa2c30ed4aebd.tar.bz2 | |
#9911: doc copyedits.
Diffstat (limited to 'Doc/faq')
| -rw-r--r-- | Doc/faq/design.rst | 2 | ||||
| -rw-r--r-- | Doc/faq/programming.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/faq/design.rst b/Doc/faq/design.rst index 68e5b8a..217ee18 100644 --- a/Doc/faq/design.rst +++ b/Doc/faq/design.rst @@ -28,7 +28,7 @@ coding-style conflicts. In C there are many different ways to place the braces. If you're used to reading and writing code that uses one style, you will feel at least slightly uneasy when reading (or being required to write) another style. -Many coding styles place begin/end brackets on a line by themself. This makes +Many coding styles place begin/end brackets on a line by themselves. This makes programs considerably longer and wastes valuable screen space, making it harder to get a good overview of a program. Ideally, a function should fit on one screen (say, 20-30 lines). 20 lines of Python can do a lot more work than 20 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:: |