summaryrefslogtreecommitdiffstats
path: root/Doc/contents.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-10-27 20:20:38 (GMT)
committerGeorg Brandl <georg@python.org>2009-10-27 20:20:38 (GMT)
commitcb7cb247b32acdd0816663d35ad51057a8571894 (patch)
tree3c0289252f056681f531ba9b6e3f33ae00210c11 /Doc/contents.rst
parentef9c9af915872a9fa2c7480fd637038cc3a445f8 (diff)
downloadcpython-cb7cb247b32acdd0816663d35ad51057a8571894.zip
cpython-cb7cb247b32acdd0816663d35ad51057a8571894.tar.gz
cpython-cb7cb247b32acdd0816663d35ad51057a8571894.tar.bz2
Merged revisions 75374 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ................ r75374 | georg.brandl | 2009-10-11 23:25:26 +0200 (So, 11 Okt 2009) | 9 lines Merged revisions 75363 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75363 | georg.brandl | 2009-10-11 20:31:23 +0200 (So, 11 Okt 2009) | 1 line Add the Python FAQ lists to the documentation. Copied from sandbox/faq. Many thanks to AMK for the preparation work. ........ ................
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 8b99d0e..e938fcd 100644
--- a/Doc/contents.rst
+++ b/Doc/contents.rst
@@ -15,6 +15,7 @@
install/index.rst
documenting/index.rst
howto/index.rst
+ faq/index.rst
glossary.rst
about.rst