]> granicus.if.org Git - python/commit
Another merge. Only doc stuff was affected (but this aligns the UTF-32
authorGuido van Rossum <guido@python.org>
Fri, 17 Aug 2007 18:30:38 +0000 (18:30 +0000)
committerGuido van Rossum <guido@python.org>
Fri, 17 Aug 2007 18:30:38 +0000 (18:30 +0000)
commitf10aa9825e49e8652f30bc6d92c736fe47bb134c
treec804ba7c7ea948e6814767246b6ba2dec41bac5d
parenteb1cf4e73beca52f8bc3b5ba9d5cef3632470a5b
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.
Doc/contents.rst
Doc/documenting/markup.rst
Doc/glossary.rst [new file with mode: 0644]
Doc/tutorial/glossary.rst [deleted file]
Doc/tutorial/index.rst
Doc/tutorial/stdlib.rst