Changeset 391 for python/trunk/Doc/tools/sphinxext/indexsidebar.html

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Doc/tools/sphinxext/indexsidebar.html (modified) (2 diffs)

python/trunk/Doc/tools/sphinxext/indexsidebar.html

@@ -3 +3 @@
             <h3>Docs for other versions</h3>
             <ul>
-              <li><a href="http://docs.python.org/2.7/">Python 2.7 (in development)</a></li>
-              <li><a href="http://docs.python.org/3.1/">Python 3.1 (stable)</a></li>
-              <li><a href="http://docs.python.org/dev/py3k/">Python 3.2 (in development)</a></li>
+              <li><a href="http://docs.python.org/3.3/">Python 3.3 (stable)</a></li>
+              <li><a href="http://docs.python.org/3.4/">Python 3.4 (in development)</a></li>
               <li><a href="http://www.python.org/doc/versions/">Old versions</a></li>
             </ul>
@@ -12 +11 @@
             <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>
             </ul>