summaryrefslogtreecommitdiffstats
path: root/Doc/contents.rst
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-08-17 18:30:38 (GMT)
committerGuido van Rossum <guido@python.org>2007-08-17 18:30:38 (GMT)
commitf10aa9825e49e8652f30bc6d92c736fe47bb134c (patch)
treec804ba7c7ea948e6814767246b6ba2dec41bac5d /Doc/contents.rst
parenteb1cf4e73beca52f8bc3b5ba9d5cef3632470a5b (diff)
downloadcpython-f10aa9825e49e8652f30bc6d92c736fe47bb134c.zip
cpython-f10aa9825e49e8652f30bc6d92c736fe47bb134c.tar.gz
cpython-f10aa9825e49e8652f30bc6d92c736fe47bb134c.tar.bz2
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.
Diffstat (limited to 'Doc/contents.rst')
-rw-r--r--Doc/contents.rst1
1 files changed, 1 insertions, 0 deletions
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