In documentation, prefer https over http when available

diff --git a/README.rst b/README.rst
index c36b9426d62cd14c6dda2f9424ea2dd3721e2779..8ac573f485ace0a02db3041b5e6572850b64b0bb 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -33,8 +33,8 @@ For more information visit the new `Jinja2 webpage`_ and `documentation`_.
 The `Jinja2 tip`_ is installable via ``pip`` with ``pip install
 https://github.com/pallets/jinja/zipball/master``.
 
-.. _sandboxed: http://en.wikipedia.org/wiki/Sandbox_(computer_security)
-.. _Django: http://www.djangoproject.com/
+.. _sandboxed: https://en.wikipedia.org/wiki/Sandbox_(computer_security)
+.. _Django: https://www.djangoproject.com/
 .. _Jinja2 webpage: http://jinja.pocoo.org/
 .. _documentation: http://jinja.pocoo.org/docs/
 .. _Jinja2 tip: http://jinja.pocoo.org/docs/intro/#as-a-python-egg-via-easy-install

diff --git a/docs/_templates/sidebarintro.html b/docs/_templates/sidebarintro.html
index 9c430c0c5f8f37670eed41ba7f14be45db34e9a3..d642d141956756239eb8e26798bfdf48a94f01de 100644 (file)
--- a/docs/_templates/sidebarintro.html
+++ b/docs/_templates/sidebarintro.html
@@ -15,6 +15,6 @@
 <h3>Useful Links</h3>
 <ul>
   <li><a href="http://jinja.pocoo.org/">The Jinja2 Website</a></li>
-  <li><a href="http://pypi.python.org/pypi/Jinja2">Jinja2 @ PyPI</a></li>
-  <li><a href="http://github.com/pallets/jinja">Jinja2 @ github</a></li>
+  <li><a href="https://pypi.python.org/pypi/Jinja2">Jinja2 @ PyPI</a></li>
+  <li><a href="https://github.com/pallets/jinja">Jinja2 @ github</a></li>
 </ul>

diff --git a/docs/api.rst b/docs/api.rst
index bbe6c366e5032cf009ade9d7a69f21de554e5bc9..ee88d110a042d7ba86d9c787bd75fe685e4d76c2 100644 (file)
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -114,7 +114,7 @@ for everything else `unicode`:
 u'f\xf6\xf6'
 
 
-.. _Unicode documentation: http://docs.python.org/dev/howto/unicode.html
+.. _Unicode documentation: https://docs.python.org/dev/howto/unicode.html
 
 High Level API
 --------------

diff --git a/docs/extensions.rst b/docs/extensions.rst
index 635d1e4c34d193683503f559d767f49c59764658..cd0934696eac1f134f575e8c3e5038b326065ecf 100644 (file)
--- a/docs/extensions.rst
+++ b/docs/extensions.rst
@@ -106,7 +106,7 @@ current configuration.  (For example by using `gettext.find`)
 The usage of the `i18n` extension for template designers is covered as part
 :ref:`of the template documentation <i18n-in-templates>`.
 
-.. _gettext: http://docs.python.org/dev/library/gettext
+.. _gettext: https://docs.python.org/dev/library/gettext
 .. _Babel: http://babel.pocoo.org/
 
 .. _newstyle-gettext:

diff --git a/docs/faq.rst b/docs/faq.rst
index 9dd348f59bcb7d0c1c7454e0f260a72901dd1a45..624a797a42941027a4bdfee98f2eb6c142cff8dd 100644 (file)
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -145,7 +145,7 @@ work in production environments::
         sandbox._WHITE_LIST_C_MODULES += ['_ctypes', 'gestalt']
 
 Credit for this snippet goes to `Thomas Johansson
-<http://stackoverflow.com/questions/3086091/debug-jinja2-in-google-app-engine/3694434#3694434>`_
+<https://stackoverflow.com/questions/3086091/debug-jinja2-in-google-app-engine/3694434#3694434>`_
 
 Why is there no Python 2.3/2.4/2.5/3.1/3.2 support?
 ---------------------------------------------------

diff --git a/docs/intro.rst b/docs/intro.rst
index e097718e3d4597460eeef598a7f427099bdb9d72..2df94d41511775fdb5e48621ff7499c1c3b45e46 100644 (file)
--- a/docs/intro.rst
+++ b/docs/intro.rst
@@ -60,12 +60,12 @@ As an alternative to steps 4 you can also do ``python setup.py develop``
 which will install the package via `distribute` in development mode.  This also
 has the advantage that the C extensions are compiled.
 
-.. _download page: http://pypi.python.org/pypi/Jinja2
-.. _distribute: http://pypi.python.org/pypi/distribute 
+.. _download page: https://pypi.python.org/pypi/Jinja2
+.. _distribute: https://pypi.python.org/pypi/distribute 
 .. _setuptools: http://peak.telecommunity.com/DevCenter/setuptools
 .. _easy_install: http://peak.telecommunity.com/DevCenter/EasyInstall
-.. _pip: http://pypi.python.org/pypi/pip
-.. _git: http://git-scm.org/
+.. _pip: https://pypi.python.org/pypi/pip
+.. _git: https://git-scm.org/
 
 
 MarkupSafe Dependency
@@ -75,7 +75,7 @@ As of version 2.7 Jinja2 depends on the `MarkupSafe`_ module.  If you
 install Jinja2 via `pip` or `easy_install` it will be installed
 automatically for you.
 
-.. _MarkupSafe: http://pypi.python.org/pypi/MarkupSafe
+.. _MarkupSafe: https://pypi.python.org/pypi/MarkupSafe
 
 Basic API Usage
 ---------------
@@ -117,4 +117,4 @@ in mind, so you will have to adapt the shown code examples to Python 3 syntax
 for yourself.
 
 
-.. _Jinja bug tracker: http://github.com/pallets/jinja/issues
+.. _Jinja bug tracker: https://github.com/pallets/jinja/issues

diff --git a/jinja2/bccache.py b/jinja2/bccache.py
index d687d036fb73a4cca1cae49990496ff9efc74f74..080e527cabf33b0422f6b8e5b172c17d7c039d39 100644 (file)
--- a/jinja2/bccache.py
+++ b/jinja2/bccache.py
@@ -297,7 +297,7 @@ class MemcachedBytecodeCache(BytecodeCache):
     Libraries compatible with this class:
 
     -   `werkzeug <http://werkzeug.pocoo.org/>`_.contrib.cache
-    -   `python-memcached <http://www.tummy.com/Community/software/python-memcached/>`_
+    -   `python-memcached <https://www.tummy.com/Community/software/python-memcached/>`_
     -   `cmemcache <http://gijsbert.org/cmemcache/>`_
 
     (Unfortunately the django cache interface is not compatible because it

diff --git a/jinja2/sandbox.py b/jinja2/sandbox.py
index 32e24350104ba0731f5e0d9e88ec7027a0a157eb..93fb9d45f32d8b511a83c3271a45e0abe01e77fe 100644 (file)
--- a/jinja2/sandbox.py
+++ b/jinja2/sandbox.py
@@ -107,7 +107,7 @@ class _MagicFormatMapping(Mapping):
     """This class implements a dummy wrapper to fix a bug in the Python
     standard library for string formatting.
 
-    See http://bugs.python.org/issue13598 for information about why
+    See https://bugs.python.org/issue13598 for information about why
     this is necessary.
     """
 

diff --git a/setup.py b/setup.py
index b77ff428ec5a3000fe138feb11834666dbc3b5ce..ce83c52d1bda7c492eded06bc7d9707c62c50fd0 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -30,8 +30,8 @@ for the template designer too hard by giving him too few functionality.
 
 For more informations visit the new `Jinja2 webpage`_ and `documentation`_.
 
-.. _sandboxed: http://en.wikipedia.org/wiki/Sandbox_(computer_security)
-.. _Django: http://www.djangoproject.com/
+.. _sandboxed: https://en.wikipedia.org/wiki/Sandbox_(computer_security)
+.. _Django: https://www.djangoproject.com/
 .. _Jinja2 webpage: http://jinja.pocoo.org/
 .. _documentation: http://jinja.pocoo.org/2/documentation/
 """