summaryrefslogtreecommitdiffstats
path: root/Doc/tools
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/tools
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/tools')
-rw-r--r--Doc/tools/sphinxext/indexcontent.html2
1 files changed, 2 insertions, 0 deletions
diff --git a/Doc/tools/sphinxext/indexcontent.html b/Doc/tools/sphinxext/indexcontent.html
index c9b331d..ef61e80 100644
--- a/Doc/tools/sphinxext/indexcontent.html
+++ b/Doc/tools/sphinxext/indexcontent.html
@@ -26,6 +26,8 @@
<span class="linkdescr">sharing modules with others</span></p>
<p class="biglink"><a class="biglink" href="{{ pathto("documenting/index") }}">Documenting Python</a><br/>
<span class="linkdescr">guide for documentation authors</span></p>
+ <p class="biglink"><a class="biglink" href="{{ pathto("faq/index") }}">FAQs</a><br/>
+ <span class="linkdescr">frequently asked questions (with answers!)</span></p>
</td></tr>
</table>