From: Senthil Kumaran <senthil@uthcode.com>
Date: Tue, 3 Jun 2014 06:00:43 +0000 (-0700)
Subject: merge from 3.4
X-Git-Tag: v3.5.0a1~1531
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6120ab8150bec7131f8bb2713f3bcba8adad01e5;p=python

merge from 3.4

Update references to Python docs in the sidebar index.
Patch contributed by Auke Willem Oosterhoff.
---

6120ab8150bec7131f8bb2713f3bcba8adad01e5
diff --cc Doc/tools/sphinxext/indexsidebar.html
index ed5da0cd31,83ba1231c4..690c3d5277
--- a/Doc/tools/sphinxext/indexsidebar.html
+++ b/Doc/tools/sphinxext/indexsidebar.html
@@@ -1,17 -1,18 +1,17 @@@
-             <h3>Download</h3>
-             <p><a href="{{ pathto('download') }}">Download these documents</a></p>
- 	    <h3>Docs for other versions</h3>
- 	    <ul>
- 	      <li><a href="http://docs.python.org/2.7/">Python 2.7 (stable)</a></li>
- 	      <li><a href="http://docs.python.org/3.3/">Python 3.3 (stable)</a></li>
-               <li><a href="http://www.python.org/doc/versions/">Old versions</a></li>
-             </ul>
+ <h3>Download</h3>
+ <p><a href="{{ pathto('download') }}">Download these documents</a></p>
+ <h3>Docs for other versions</h3>
+ <ul>
+   <li><a href="http://docs.python.org/2.7/">Python 2.7 (stable)</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.5/">Python 3.5 (in development)</a></li>
++  <li><a href="http://docs.python.org/3.4/">Python 3.4 (stable)</a></li>
+   <li><a href="http://www.python.org/doc/versions/">Old versions</a></li>
+ </ul>
  
-             <h3>Other resources</h3>
-             <ul>
-               {# XXX: many of these should probably be merged in the main docs #}
-               <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>
-             </ul>
+ <h3>Other resources</h3>
+ <ul>
+   {# XXX: many of these should probably be merged in the main docs #}
+   <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>
+ </ul>