Merged revisions 85008,85011,85240 via svnmerge from
svn+ssh://pythondev@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.
........
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 d25819b..de46462 100644
--- a/Doc/library/itertools.rst
+++ b/Doc/library/itertools.rst
@@ -677,7 +677,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):
diff --git a/Doc/library/readline.rst b/Doc/library/readline.rst
index 9a7e940..f6e855e 100644
--- a/Doc/library/readline.rst
+++ b/Doc/library/readline.rst
@@ -210,6 +210,7 @@
: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 2862104..8dc36bc 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -2101,7 +2101,7 @@
existing keys. Return ``None``.
:func:`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)``.