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.
This commit is contained in:
Guido van Rossum 2007-08-17 18:30:38 +00:00
parent eb1cf4e73b
commit f10aa9825e
6 changed files with 349 additions and 335 deletions

View file

@ -41,6 +41,8 @@ language's flavor and style. After reading it, you will be able to read and
write Python modules and programs, and you will be ready to learn more about the
various Python library modules described in the Python Library Reference.
The :ref:`glossary` is also worth going through.
.. toctree::
appetite.rst
@ -57,4 +59,3 @@ various Python library modules described in the Python Library Reference.
whatnow.rst
interactive.rst
floatingpoint.rst
glossary.rst