Merge with 3.4

5 files changed, 13 insertions, 13 deletions

diff --git a/Doc/tools/static/version_switch.js b/Doc/tools/static/version_switch.js
index e5528eb..edb025b 100644
--- a/Doc/tools/static/version_switch.js
+++ b/Doc/tools/static/version_switch.js
@@ -50,7 +50,7 @@
            window.location.href = new_url;
         },
         error: function() {
-           window.location.href = 'http://docs.python.org/' + selected;
+           window.location.href = 'https://docs.python.org/' + selected;
         }
       });
     }
diff --git a/Doc/tools/templates/download.html b/Doc/tools/templates/download.html
index 0550111..de84ae3 100644
--- a/Doc/tools/templates/download.html
+++ b/Doc/tools/templates/download.html
@@ -3,7 +3,7 @@
 {% if daily is defined %}
   {% set dlbase = pathto('archives', 1) %}
 {% else %}
-  {% set dlbase = 'http://docs.python.org/ftp/python/doc/' + release %}
+  {% set dlbase = 'https://docs.python.org/ftp/python/doc/' + release %}
 {% endif %}
 
 {% block body %}
@@ -42,7 +42,7 @@ in the table are the size of the download files in megabytes.</p>
 <p>These archives contain all the content in the documentation.</p>
 
 <p>HTML Help (<tt>.chm</tt>) files are made available in the "Windows" section
-on the <a href="http://python.org/download/releases/{{ release[:5] }}/">Python
+on the <a href="https://www.python.org/download/releases/{{ release[:5] }}/">Python
 download page</a>.</p>
 
 
diff --git a/Doc/tools/templates/indexsidebar.html b/Doc/tools/templates/indexsidebar.html
index 690c3d5..78e9c4f 100644
--- a/Doc/tools/templates/indexsidebar.html
+++ b/Doc/tools/templates/indexsidebar.html
@@ -2,16 +2,16 @@
 <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.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>
 <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>
+  <li><a href="https://www.python.org/dev/peps/">PEP Index</a></li>
+  <li><a href="https://wiki.python.org/moin/BeginnersGuide">Beginner's Guide</a></li>
+  <li><a href="https://wiki.python.org/moin/PythonBooks">Book List</a></li>
+  <li><a href="https://www.python.org/doc/av/">Audio/Visual Talks</a></li>
 </ul>
diff --git a/Doc/tools/templates/layout.html b/Doc/tools/templates/layout.html
index d3b2801..5abff1b 100644
--- a/Doc/tools/templates/layout.html
+++ b/Doc/tools/templates/layout.html
@@ -2,7 +2,7 @@
 {% block rootrellink %}
         <li><img src="{{ pathto('_static/py.png', 1) }}" alt=""
                  style="vertical-align: middle; margin-top: -1px"/></li>
-        <li><a href="http://www.python.org/">Python</a>{{ reldelim1 }}</li>
+        <li><a href="https://www.python.org/">Python</a>{{ reldelim1 }}</li>
         <li>
           {%- if versionswitcher is defined %}
           <span class="version_switcher_placeholder">{{ release }}</span>
@@ -82,7 +82,7 @@
     &copy; <a href="{{ pathto('copyright') }}">Copyright</a> {{ copyright|e }}.
     <br />
     The Python Software Foundation is a non-profit corporation.
-    <a href="http://www.python.org/psf/donations/">Please donate.</a>
+    <a href="https://www.python.org/psf/donations/">Please donate.</a>
     <br />
     Last updated on {{ last_updated|e }}.
     <a href="{{ pathto('bugs') }}">Found a bug</a>?
diff --git a/Doc/tools/templates/opensearch.xml b/Doc/tools/templates/opensearch.xml
index 69cec80..7a5cddd 100644
--- a/Doc/tools/templates/opensearch.xml
+++ b/Doc/tools/templates/opensearch.xml
@@ -1,4 +1,4 @@
 {% extends "!opensearch.xml" %}
 {% block extra -%}
-<Image height="16" width="16" type="image/x-icon">http://www.python.org/images/favicon16x16.ico</Image>
+<Image height="16" width="16" type="image/x-icon">https://www.python.org/images/favicon16x16.ico</Image>
 {%- endblock %}