summaryrefslogtreecommitdiffstats
path: root/Doc/contents.rst
Commit message (Collapse)AuthorAgeFilesLines
* Another merge. Only doc stuff was affected (but this aligns the UTF-32Guido van Rossum2007-08-171-0/+1
| | | | | codec changes in trubk and branch). Hopefully the Py3k glossary wasn't different from the trunk one.
* Move the 3k reST doc tree in place.Georg Brandl2007-08-151-0/+21