[Python-checkins] cpython (3.4): Use https:// URLs in the HTML templates.

Wed Oct 29 08:37:43 CET 2014

https://hg.python.org/cpython/rev/d895dc4d2bdc
changeset: 93224:d895dc4d2bdc
branch: 3.4
user: Georg Brandl <georg at python.org>
date: Wed Oct 29 08:36:15 2014 +0100
summary:
 Use https:// URLs in the HTML templates.
files:
 Doc/tools/templates/download.html | 4 +-
 Doc/tools/templates/indexsidebar.html | 16 +++++++-------
 Doc/tools/templates/layout.html | 4 +-
 Doc/tools/templates/opensearch.xml | 2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Doc/tools/templates/download.html b/Doc/tools/templates/download.html
--- 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 @@
 <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
--- a/Doc/tools/templates/indexsidebar.html
+++ b/Doc/tools/templates/indexsidebar.html
@@ -2,17 +2,17 @@
 <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://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://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
--- 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 @@
 © <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
--- 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 %}
-- 
Repository URL: https://hg.python.org/cpython
