Merged revisions 66457-66459,66465-66468,66483-66485,66487-66491 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66457 | antoine.pitrou | 2008-09-13 15:30:30 -0500 (Sat, 13 Sep 2008) | 5 lines
Issue #3850: Misc/find_recursionlimit.py was broken.
Reviewed by A.M. Kuchling.
........
r66458 | benjamin.peterson | 2008-09-13 17:54:43 -0500 (Sat, 13 Sep 2008) | 1 line
fix a name issue; note all doc files should be encoded in utf8
........
r66459 | benjamin.peterson | 2008-09-14 11:02:22 -0500 (Sun, 14 Sep 2008) | 1 line
clarify that radix for int is not 'guessed'
........
r66465 | skip.montanaro | 2008-09-14 21:03:05 -0500 (Sun, 14 Sep 2008) | 3 lines
Review usage. Fix a mistake in the new-style class definition. Add a
couple new definitions (CPython and virtual machine).
........
r66466 | skip.montanaro | 2008-09-14 21:19:53 -0500 (Sun, 14 Sep 2008) | 2 lines
Pick up a few more definitions from the glossary on the wiki.
........
r66467 | benjamin.peterson | 2008-09-14 21:53:23 -0500 (Sun, 14 Sep 2008) | 1 line
mention that object.__init__ no longer takes arbitrary args and kwargs
........
r66468 | andrew.kuchling | 2008-09-15 08:08:32 -0500 (Mon, 15 Sep 2008) | 1 line
Rewrite item a bit
........
r66483 | georg.brandl | 2008-09-16 05:17:45 -0500 (Tue, 16 Sep 2008) | 2 lines
Fix typo.
........
r66484 | benjamin.peterson | 2008-09-16 16:20:28 -0500 (Tue, 16 Sep 2008) | 2 lines
be less wordy
........
r66485 | georg.brandl | 2008-09-17 03:45:54 -0500 (Wed, 17 Sep 2008) | 2 lines
#3888: add some deprecated modules in whatsnew.
........
r66487 | skip.montanaro | 2008-09-17 06:50:36 -0500 (Wed, 17 Sep 2008) | 2 lines
usage
........
r66488 | andrew.kuchling | 2008-09-17 07:57:04 -0500 (Wed, 17 Sep 2008) | 1 line
Markup fixes
........
r66489 | andrew.kuchling | 2008-09-17 07:58:22 -0500 (Wed, 17 Sep 2008) | 2 lines
Remove comment about improvement: pystone is about the same, and
the improvements seem to be difficult to quantify
........
r66490 | andrew.kuchling | 2008-09-17 08:04:53 -0500 (Wed, 17 Sep 2008) | 1 line
Note sqlite3 version; move item
........
r66491 | benjamin.peterson | 2008-09-17 16:54:56 -0500 (Wed, 17 Sep 2008) | 1 line
document compileall command flags
........
diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
index 94b6726..7dd8848 100644
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -359,7 +359,7 @@
.. method:: defaultdict.__missing__(key)
- If the :attr:`default_factory` attribute is ``None``, this raises an
+ If the :attr:`default_factory` attribute is ``None``, this raises a
:exc:`KeyError` exception with the *key* as argument.
If :attr:`default_factory` is not ``None``, it is called without arguments