Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
number of tests, all because of the codecs/_multibytecodecs issue described
here (it's not a Py3K issue, just something Py3K discovers):
http://mail.python.org/pipermail/python-dev/2006-April/064051.html
Hye-Shik Chang promised to look for a fix, so no need to fix it here. The
tests that are expected to break are:
test_codecencodings_cn
test_codecencodings_hk
test_codecencodings_jp
test_codecencodings_kr
test_codecencodings_tw
test_codecs
test_multibytecodec
This merge fixes an actual test failure (test_weakref) in this branch,
though, so I believe merging is the right thing to do anyway.
diff --git a/Doc/lib/libgc.tex b/Doc/lib/libgc.tex
index 54ca26c..0d3408b 100644
--- a/Doc/lib/libgc.tex
+++ b/Doc/lib/libgc.tex
@@ -35,7 +35,8 @@
\begin{funcdesc}{collect}{\optional{generation}}
With no arguments, run a full collection. The optional argument
\var{generation} may be an integer specifying which generation to collect
-(from 0 to 2). A ValueError is raised if the generation number is invalid.
+(from 0 to 2). A \exception{ValueError} is raised if the generation number
+is invalid.
The number of unreachable objects found is returned.
\versionchanged[The optional \var{generation} argument was added]{2.5}