[Python-checkins] r75374 - in python/branches/py3k: Doc/contents.rst Doc/faq Doc/tools/sphinxext/indexcontent.html

[georg.brandl]

Author: georg.brandl
Date: Sun Oct 11 23:25:26 2009
New Revision: 75374

Log:
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.
........


Added:
   python/branches/py3k/Doc/faq/
      - copied from r75363, /python/trunk/Doc/faq/
Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/contents.rst
   python/branches/py3k/Doc/tools/sphinxext/indexcontent.html

Modified: python/branches/py3k/Doc/contents.rst
==============================================================================
--- python/branches/py3k/Doc/contents.rst	(original)
+++ python/branches/py3k/Doc/contents.rst	Sun Oct 11 23:25:26 2009
@@ -15,6 +15,7 @@
    install/index.rst
    documenting/index.rst
    howto/index.rst
+   faq/index.rst
    glossary.rst
 
    about.rst

Modified: python/branches/py3k/Doc/tools/sphinxext/indexcontent.html
==============================================================================
--- python/branches/py3k/Doc/tools/sphinxext/indexcontent.html	(original)
+++ python/branches/py3k/Doc/tools/sphinxext/indexcontent.html	Sun Oct 11 23:25:26 2009
@@ -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>