Merged revisions 85008,85011,85228,85240 via svnmerge from

svn+ssh://svn.python.org/python/branches/py3k

........
  r85008 | georg.brandl | 2010-09-25 15:30:03 +0200 (Sa, 25 Sep 2010) | 1 line

  #9944: fix typo.
........
  r85011 | georg.brandl | 2010-09-25 18:56:36 +0200 (Sa, 25 Sep 2010) | 1 line

  #9562: slight clarification.
........
  r85228 | georg.brandl | 2010-10-05 09:16:01 +0200 (Di, 05 Okt 2010) | 1 line

  Indent version tags properly.
........
  r85240 | georg.brandl | 2010-10-06 07:08:32 +0200 (Mi, 06 Okt 2010) | 1 line

  #10034: import readline in longer example.
........

diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst
index 02b27ecb65b63b565f97edfbe20ba12ec53de32f..9b2aa40cfdf1d0de35416a3686d08d00d83b6850 100644 (file)
--- a/Doc/library/itertools.rst
+++ b/Doc/library/itertools.rst
@@ -592,7 +592,7 @@ which incur interpreter overhead.
            # feed the entire iterator into a zero-length deque
            collections.deque(iterator, maxlen=0)
        else:
-           # advance to the emtpy slice starting at position n
+           # advance to the empty slice starting at position n
            next(islice(iterator, n, n), None)
 
    def nth(iterable, n, default=None):

diff --git a/Doc/library/readline.rst b/Doc/library/readline.rst
index e99d31707f5e9c7caa4cb914d814f1a9d6b0148b..218f81ea9cdfe218415d02c695e066043adb2917 100644 (file)
--- a/Doc/library/readline.rst
+++ b/Doc/library/readline.rst
@@ -196,6 +196,7 @@ normally be executed automatically during interactive sessions from the user's
 :envvar:`PYTHONSTARTUP` file. ::
 
    import os
+   import readline
    histfile = os.path.join(os.environ["HOME"], ".pyhist")
    try:
        readline.read_history_file(histfile)

diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index c3bf17f95754f84b7c9bd4827578fefb130fa826..011bb6a5a412ebca9dd017badb37342cad70cd85 100644 (file)
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1972,7 +1972,7 @@ pairs within braces, for example: ``{'jack': 4098, 'sjoerd': 4127}`` or ``{4098:
       existing keys.  Return ``None``.
 
       :meth:`update` accepts either another dictionary object or an iterable of
-      key/value pairs (as a tuple or other iterable of length two).  If keyword
+      key/value pairs (as tuples or other iterables of length two).  If keyword
       arguments are specified, the dictionary is then updated with those
       key/value pairs: ``d.update(red=1, blue=2)``.