From: Georg Brandl <georg@python.org>
Date: Wed, 29 Oct 2014 07:37:29 +0000 (+0100)
Subject: Merge with 3.4
X-Git-Tag: v3.5.0a1~588
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cadc3fdcb5ee891b2325f7fa5c98b789ea512aa3;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.4
---

cadc3fdcb5ee891b2325f7fa5c98b789ea512aa3
diff --cc Doc/tools/templates/indexsidebar.html
index 690c3d527745,abdf070772c8..78e9c4f99ef0
--- a/Doc/tools/templates/indexsidebar.html
+++ b/Doc/tools/templates/indexsidebar.html
@@@ -2,9 -2,10 +2,9 @@@
  <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>
+   <li><a href="https://docs.python.org/2.7/">Python 2.7 (stable)</a></li>
 -  <li><a href="https://docs.python.org/3.3/">Python 3.3 (stable)</a></li>
 -  <li><a href="https://docs.python.org/3.5/">Python 3.5 (in development)</a></li>
++  <li><a href="https://docs.python.org/3.4/">Python 3.4 (stable)</a></li>
+   <li><a href="https://www.python.org/doc/versions/">Old versions</a></li>
  </ul>
  
  <h3>Other resources</h3>