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/python-docs.txt b/Doc/python-docs.txt
index 017fece..bf475b6 100644
--- a/Doc/python-docs.txt
+++ b/Doc/python-docs.txt
@@ -180,4 +180,4 @@
whether it's safe to remove, see the "Why is Python Installed on
my Computer?" FAQ, found at:
- http://www.python.org/doc/faq/installed.html
+ http://www.python.org/doc/faq/installed/