[Python-checkins] cpython (merge 3.4 -> default): merge from 3.4

[senthil.kumaran]

http://hg.python.org/cpython/rev/50c9df76bb77
changeset:   90992:50c9df76bb77
parent:      90989:f59afe34fe50
parent:      90991:e6dce5611dae
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Mon Jun 02 23:00:43 2014 -0700
summary:
  merge from 3.4

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

files:
  Doc/tools/sphinxext/indexsidebar.html |  32 +++++++-------
  1 files changed, 16 insertions(+), 16 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
@@ -1,17 +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.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>

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