| commit | f10aa9825e49e8652f30bc6d92c736fe47bb134c | [log] [tgz] |
|---|---|---|
| author | Guido van Rossum <guido@python.org> | Fri Aug 17 18:30:38 2007 +0000 |
| committer | Guido van Rossum <guido@python.org> | Fri Aug 17 18:30:38 2007 +0000 |
| tree | c804ba7c7ea948e6814767246b6ba2dec41bac5d | |
| parent | eb1cf4e73beca52f8bc3b5ba9d5cef3632470a5b [diff] [blame] |
Another merge. Only doc stuff was affected (but this aligns the UTF-32 codec changes in trubk and branch). Hopefully the Py3k glossary wasn't different from the trunk one.
diff --git a/Doc/contents.rst b/Doc/contents.rst index 59a72fa..0fba7e3 100644 --- a/Doc/contents.rst +++ b/Doc/contents.rst
@@ -14,6 +14,7 @@ install/index.rst documenting/index.rst howto/index.rst + glossary.rst about.rst bugs.rst