[Python-checkins] cpython (merge 3.2 -> default): #14405: merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/8a8120ee1202
changeset:   76917:8a8120ee1202
parent:      76914:6fb8151c0579
parent:      76916:b50d4ae6aaa3
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Mon May 14 13:32:26 2012 +0300
summary:
  #14405: merge with 3.2.

files:
  Doc/tools/sphinxext/indexsidebar.html |  5 -----
  1 files changed, 0 insertions(+), 5 deletions(-)


diff --git a/Doc/tools/sphinxext/indexsidebar.html b/Doc/tools/sphinxext/indexsidebar.html
--- a/Doc/tools/sphinxext/indexsidebar.html
+++ b/Doc/tools/sphinxext/indexsidebar.html
@@ -10,13 +10,8 @@
             <h3>Other resources</h3>
             <ul>
               {# XXX: many of these should probably be merged in the main docs #}
-              <li><a href="http://www.python.org/doc/faq/">FAQs</a></li>
-              <li><a href="http://www.python.org/doc/essays/">Guido's Essays</a></li>
-              <li><a href="http://www.python.org/doc/newstyle/">New-style Classes</a></li>
               <li><a href="http://www.python.org/dev/peps/">PEP Index</a></li>
               <li><a href="http://wiki.python.org/moin/BeginnersGuide">Beginner's Guide</a></li>
               <li><a href="http://wiki.python.org/moin/PythonBooks">Book List</a></li>
               <li><a href="http://www.python.org/doc/av/">Audio/Visual Talks</a></li>
-              <li><a href="http://www.python.org/doc/other/">Other Doc Collections</a></li>
-              <li><a href="{{ pathto('bugs') }}">Report a Bug</a></li>
             </ul>

-- 
Repository URL: http://hg.python.org/cpython