[1.8.x] Updated Wikipedia links to use https

Backport of 64982cc2fb from master.

7 files changed, 15 insertions, 15 deletions

diff --git a/docs/ref/clickjacking.txt b/docs/ref/clickjacking.txt
index f236673cd0..2a81f350d9 100644
--- a/docs/ref/clickjacking.txt
+++ b/docs/ref/clickjacking.txt
@@ -10,7 +10,7 @@ against `clickjacking`_.  This type of attack occurs when a malicious site
 tricks a user into clicking on a concealed element of another site which they
 have loaded in a hidden frame or iframe.
 
-.. _clickjacking: http://en.wikipedia.org/wiki/Clickjacking
+.. _clickjacking: https://en.wikipedia.org/wiki/Clickjacking
 
 An example of clickjacking
 ==========================
@@ -128,4 +128,4 @@ See also
 A `complete list`_ of browsers supporting ``X-Frame-Options``.
 
 .. _complete list: https://developer.mozilla.org/en/The_X-FRAME-OPTIONS_response_header#Browser_compatibility
-.. _other clickjacking prevention techniques: http://en.wikipedia.org/wiki/Clickjacking#Prevention
+.. _other clickjacking prevention techniques: https://en.wikipedia.org/wiki/Clickjacking#Prevention
diff --git a/docs/ref/contrib/gis/geoquerysets.txt b/docs/ref/contrib/gis/geoquerysets.txt
index 5063e49b59..da750d779f 100644
--- a/docs/ref/contrib/gis/geoquerysets.txt
+++ b/docs/ref/contrib/gis/geoquerysets.txt
@@ -731,7 +731,7 @@ the distance from the `Tasmanian`__ city of Hobart to every other
     :ref:`supported_units`.
 
 __ https://github.com/django/django/blob/master/tests/gis_tests/distapp/models.py
-__ http://en.wikipedia.org/wiki/Tasmania
+__ https://en.wikipedia.org/wiki/Tasmania
 
 ``length``
 ~~~~~~~~~~
@@ -994,7 +994,7 @@ Keyword Argument       Description
                        of 2 or 3.  The default value is 2.
 =====================  =====================================================
 
-__ http://en.wikipedia.org/wiki/Geography_Markup_Language
+__ https://en.wikipedia.org/wiki/Geography_Markup_Language
 
 ``kml``
 ~~~~~~~
diff --git a/docs/ref/contrib/gis/model-api.txt b/docs/ref/contrib/gis/model-api.txt
index 92f2efc8c8..584177c8b5 100644
--- a/docs/ref/contrib/gis/model-api.txt
+++ b/docs/ref/contrib/gis/model-api.txt
@@ -16,7 +16,7 @@ example::
         poly = models.PolygonField()
         objects = models.GeoManager()
 
-__ http://en.wikipedia.org/wiki/ZIP_code
+__ https://en.wikipedia.org/wiki/ZIP_code
 
 Geometry Field Types
 ====================
@@ -82,7 +82,7 @@ Sets the SRID [#fnogcsrid]_ (Spatial Reference System Identity) of the geometry
 the given value. Defaults to 4326 (also known as `WGS84`__, units are in degrees
 of longitude and latitude).
 
-__ http://en.wikipedia.org/wiki/WGS84
+__ https://en.wikipedia.org/wiki/WGS84
 
 .. _selecting-an-srid:
 
@@ -135,8 +135,8 @@ Additional Resources:
   data encountered will be in one of these coordinate systems rather than
   in a geographic coordinate system such as WGS84.
 
-__ http://en.wikipedia.org/wiki/Geodesy
-__ http://en.wikipedia.org/wiki/Great_circle
+__ https://en.wikipedia.org/wiki/Geodesy
+__ https://en.wikipedia.org/wiki/Great_circle
 __ http://www.spatialreference.org/ref/epsg/2796/
 __ http://spatialreference.org/
 __ http://web.archive.org/web/20080302095452/http://welcome.warnercnr.colostate.edu/class_info/nr502/lg3/datums_coordinates/spcs.html
diff --git a/docs/ref/contrib/gis/tutorial.txt b/docs/ref/contrib/gis/tutorial.txt
index c13ef28ebd..6cb700cbc5 100644
--- a/docs/ref/contrib/gis/tutorial.txt
+++ b/docs/ref/contrib/gis/tutorial.txt
@@ -158,7 +158,7 @@ extensions:
   data stored in the shapefile.
 
 __ http://thematicmapping.org/downloads/TM_WORLD_BORDERS-0.3.zip
-__ http://en.wikipedia.org/wiki/Shapefile
+__ https://en.wikipedia.org/wiki/Shapefile
 
 Use ``ogrinfo`` to examine spatial data
 ---------------------------------------
@@ -259,7 +259,7 @@ longitude, latitude pairs in units of degrees.  To use a different
 coordinate system, set the SRID of the geometry field with the ``srid``
 argument. Use an integer representing the coordinate system's EPSG code.
 
-__ http://en.wikipedia.org/wiki/SRID
+__ https://en.wikipedia.org/wiki/SRID
 
 Run ``migrate``
 ---------------
diff --git a/docs/ref/middleware.txt b/docs/ref/middleware.txt
index cac8c31477..4d34cd8b1f 100644
--- a/docs/ref/middleware.txt
+++ b/docs/ref/middleware.txt
@@ -239,7 +239,7 @@ be vulnerable via an insecure connection to a subdomain.
     it may be because Django doesn't realize that it's on a secure connection;
     you may need to set the :setting:`SECURE_PROXY_SSL_HEADER` setting.
 
-.. _"Strict-Transport-Security" header: http://en.wikipedia.org/wiki/Strict_Transport_Security
+.. _"Strict-Transport-Security" header: https://en.wikipedia.org/wiki/Strict_Transport_Security
 
 .. _x-content-type-options:
 
@@ -298,7 +298,7 @@ header. ``SecurityMiddleware`` will do this for all responses if the
     browsers support the header. Ensure you are still :ref:`validating and
     sanitizing <cross-site-scripting>` all input to prevent XSS attacks.
 
-.. _XSS attack: http://en.wikipedia.org/wiki/Cross-site_scripting
+.. _XSS attack: https://en.wikipedia.org/wiki/Cross-site_scripting
 .. _X-XSS-Protection header: http://blogs.msdn.com/b/ie/archive/2008/07/02/ie8-security-part-iv-the-xss-filter.aspx
 
 .. _ssl-redirect:
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 078907e2d3..1e4992bf54 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -101,7 +101,7 @@ middleware; if so this middleware must be listed first in
     In Django 1.7, the trailing dot is stripped when performing host validation,
     thus an entry with a trailing dot isn't required.
 
-.. _`fully qualified domain name (FQDN)`: http://en.wikipedia.org/wiki/Fully_qualified_domain_name
+.. _`fully qualified domain name (FQDN)`: https://en.wikipedia.org/wiki/Fully_qualified_domain_name
 
 If the ``Host`` header (or ``X-Forwarded-Host`` if
 :setting:`USE_X_FORWARDED_HOST` is enabled) does not match any value in this
@@ -2650,7 +2650,7 @@ to ensure your processes are running in the correct environment.
     If you're running Django on Windows, :setting:`TIME_ZONE` must be set to
     match the system time zone.
 
-.. _list of time zones: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+.. _list of time zones: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 
 .. _pytz: http://pytz.sourceforge.net/
 
diff --git a/docs/ref/templates/language.txt b/docs/ref/templates/language.txt
index c7dcbe1240..4691a07689 100644
--- a/docs/ref/templates/language.txt
+++ b/docs/ref/templates/language.txt
@@ -487,7 +487,7 @@ escaped:
 Again, we stress that this behavior is on by default. If you're using Django's
 template system, you're protected.
 
-.. _Cross Site Scripting: http://en.wikipedia.org/wiki/Cross-site_scripting
+.. _Cross Site Scripting: https://en.wikipedia.org/wiki/Cross-site_scripting
 
 How to turn it off
 ------------------