Make HTTPS the default & update canonical

dbader · dbader · commit 40571f40e828 · 2018-07-16T14:35:36.000-07:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -4,7 +4,7 @@ How to contribute
 This guide is under heavy development. If you would like to contribute, please
 see:
 
-http://docs.python-guide.org/en/latest/notes/contribute/
+https://docs.python-guide.org/en/latest/notes/contribute/
 
 How to test your changes
 ------------------------
@@ -34,4 +34,4 @@ Style Guide
 
 For all contributions, please follow the `Guide Style Guide`:
 
-http://docs.python-guide.org/en/latest/notes/styleguide/
+https://docs.python-guide.org/en/latest/notes/styleguide/
diff --git a/Readme.rst b/Readme.rst
@@ -33,4 +33,4 @@ Topics include:
 
 If you aren't fond of reading reStructuredText, there is an
 almost up-to-date `HTML version at docs.python-guide.org
-<http://docs.python-guide.org>`_.
+<https://docs.python-guide.org>`_.
diff --git a/docs/404.rst b/docs/404.rst
@@ -8,9 +8,9 @@ It looks like this was the result of either:
 - a mistyped address
 - an out-of-date link
 
-`Click here to go back to the homepage. <http://docs.python-guide.org/>`_
+`Click here to go back to the homepage. <https://docs.python-guide.org/>`_
 
-Or, try `searching <http://docs.python-guide.org/en/latest/search/>`_.
+Or, try `searching <https://docs.python-guide.org/en/latest/search/>`_.
 
 .. raw:: html
 
diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
@@ -6,11 +6,11 @@
   <meta name="viewport" content="width=device-width, initial-scale=0.9, maximum-scale=0.9" />
 
   {% if pagename == 'index' %}
-  <link rel="canonical" href="http://docs.python-guide.org/"/>
+  <link rel="canonical" href="https://docs.python-guide.org/"/>
   {% elif pagename == '404' %}
   {# No canonical on our 404 template. #}
   {% else %}
-  <link rel="canonical" href="http://docs.python-guide.org/{{ pagename }}/"/>
+  <link rel="canonical" href="https://docs.python-guide.org/{{ pagename }}/"/>
   {% endif %}
 
   <link rel="icon" type="image/png" href="https://media.readthedocs.org/images/favicon.png">
diff --git a/docs/_templates/sidebarintro.html b/docs/_templates/sidebarintro.html
@@ -50,7 +50,7 @@ <h3>Contributors</h3>
   This guide is the result of the collaboration of
   <a href="https://github.com/kennethreitz/python-guide/graphs/contributors">hundreds of people</a>
   around the world, and your contributions
-  <a href="http://docs.python-guide.org/en/latest/notes/contribute/">are welcome</a>!
+  <a href="https://docs.python-guide.org/en/latest/notes/contribute/">are welcome</a>!
 </p>
 
 
@@ -64,7 +64,7 @@ <h3>Useful Links</h3>
 
 <h3>Translations</h3>
 <ul>
-  <li><a href="http://docs.python-guide.org/en/latest/">English</a></li>
+  <li><a href="https://docs.python-guide.org/en/latest/">English</a></li>
   <li><a href="https://python-guide-fr.readthedocs.io/fr/latest/">French</a></li>
   <li><a href="https://pythonguidecn.readthedocs.io/zh/latest/">Chinese</a></li>
   <li><a href="http://python-guideja.readthedocs.io/ja/latest/">Japanese</a></li>
diff --git a/docs/_templates/sidebarlogo.html b/docs/_templates/sidebarlogo.html
@@ -48,7 +48,7 @@ <h3>Other Projects</h3>
 
 <h3>Translations</h3>
 <ul>
-  <li><a href="http://docs.python-guide.org/en/latest/">English</a></li>
+  <li><a href="https://docs.python-guide.org/en/latest/">English</a></li>
   <li><a href="https://python-guide-fr.readthedocs.io/fr/latest/">French</a></li>
   <li><a href="https://pythonguidecn.readthedocs.io/zh/latest/">Chinese</a></li>
   <li><a href="http://python-guideja.readthedocs.io/ja/latest/">Japanese</a></li>
diff --git a/docs/dev/virtualenvs.rst b/docs/dev/virtualenvs.rst
@@ -62,7 +62,7 @@ using your OS package manager, you may have to `install pip <https://pip.pypa.io
 .. _python.org: https://python.org
 .. _pip: https://pypi.org/project/pip/
 .. _Homebrew: https://brew.sh
-.. _Installing Python: http://docs.python-guide.org/en/latest/starting/installation/
+.. _Installing Python: https://docs.python-guide.org/en/latest/starting/installation/
 
 
 Installing Pipenv
