[Python-checkins] r85256 - in python/branches/release31-maint: Doc/library/itertools.rst Doc/library/readline.rst Doc/library/stdtypes.rst

[georg.brandl]

Author: georg.brandl
Date: Wed Oct  6 10:57:55 2010
New Revision: 85256

Log:
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.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/itertools.rst
   python/branches/release31-maint/Doc/library/readline.rst
   python/branches/release31-maint/Doc/library/stdtypes.rst

Modified: python/branches/release31-maint/Doc/library/itertools.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/itertools.rst	(original)
+++ python/branches/release31-maint/Doc/library/itertools.rst	Wed Oct  6 10:57:55 2010
@@ -592,7 +592,7 @@
            # 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):

Modified: python/branches/release31-maint/Doc/library/readline.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/readline.rst	(original)
+++ python/branches/release31-maint/Doc/library/readline.rst	Wed Oct  6 10:57:55 2010
@@ -196,6 +196,7 @@
 :envvar:`PYTHONSTARTUP` file. ::
 
    import os
+   import readline
    histfile = os.path.join(os.environ["HOME"], ".pyhist")
    try:
        readline.read_history_file(histfile)

Modified: python/branches/release31-maint/Doc/library/stdtypes.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/stdtypes.rst	(original)
+++ python/branches/release31-maint/Doc/library/stdtypes.rst	Wed Oct  6 10:57:55 2010
@@ -1972,7 +1972,7 @@
       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)``.