[1.9.x] Fixed #25778 -- Updated docs links to use https when available.

Backport of 7aabd6238028f4bb78d0687bbccc97bcf634e28b from master

15 files changed, 40 insertions, 40 deletions

diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 0a8e692e45..79fb333bcc 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -1260,8 +1260,8 @@ subclass::
 
         class PersonAdmin(admin.ModelAdmin):
             def view_on_site(self, obj):
-                return 'http://example.com' + reverse('person-detail',
-                                                      kwargs={'slug': obj.slug})
+                return 'https://example.com' + reverse('person-detail',
+                                                       kwargs={'slug': obj.slug})
 
 Custom template options
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -1943,7 +1943,7 @@ files for the forms and/or formsets. If :setting:`DEBUG` is ``True`` it will
 return the uncompressed versions of the various JavaScript files, including
 ``jquery.js``; if not, it will return the 'minified' versions.
 
-.. _jQuery: http://jquery.com
+.. _jQuery: https://jquery.com
 
 .. _admin-custom-validation:
 
diff --git a/docs/ref/contrib/gis/admin.txt b/docs/ref/contrib/gis/admin.txt
index b91a2158f3..62f7a78b0f 100644
--- a/docs/ref/contrib/gis/admin.txt
+++ b/docs/ref/contrib/gis/admin.txt
@@ -64,6 +64,6 @@ GeoDjango's admin site
 .. class:: OSMGeoAdmin
 
    A subclass of :class:`GeoModelAdmin` that uses a spherical mercator projection
-   with `OpenStreetMap <http://www.openstreetmap.org/>`_ street data tiles.
+   with `OpenStreetMap <https://www.openstreetmap.org/>`_ street data tiles.
    See the :ref:`OSMGeoAdmin introduction <osmgeoadmin-intro>`
    in the tutorial for a usage example.
diff --git a/docs/ref/contrib/gis/db-api.txt b/docs/ref/contrib/gis/db-api.txt
index c9bbec037c..efb357bef3 100644
--- a/docs/ref/contrib/gis/db-api.txt
+++ b/docs/ref/contrib/gis/db-api.txt
@@ -28,7 +28,7 @@ MySQL Spatial Limitations
 MySQL's spatial extensions only support bounding box operations
 (what MySQL calls minimum bounding rectangles, or MBR).  Specifically,
 `MySQL does not conform to the OGC standard
-<http://dev.mysql.com/doc/refman/5.6/en/spatial-relation-functions.html>`_:
+<https://dev.mysql.com/doc/refman/5.6/en/spatial-relation-functions.html>`_:
 
     Currently, MySQL does not implement these functions
     [``Contains``, ``Crosses``, ``Disjoint``, ``Intersects``, ``Overlaps``,
@@ -357,7 +357,7 @@ Aggregate                PostGIS  Oracle  SpatiaLite
 .. [#fnewkb] *See* `PostGIS EWKB, EWKT and Canonical Forms <http://postgis.net/docs/manual-2.1/using_postgis_dbmanagement.html#EWKB_EWKT>`_, PostGIS documentation at Ch. 4.1.2.
 .. [#fngeojson] *See* Howard Butler, Martin Daly, Allan Doyle, Tim Schaub, & Christopher Schmidt, `The GeoJSON Format Specification <http://geojson.org/geojson-spec.html>`_, Revision 1.0 (June 16, 2008).
 .. [#fndistsphere15] *See* `PostGIS documentation <http://postgis.net/docs/manual-2.1/ST_Distance_Sphere.html>`_ on ``ST_distance_sphere``.
-.. [#fnmysqlidx] *See* `Creating Spatial Indexes <http://dev.mysql.com/doc/refman/5.6/en/creating-spatial-indexes.html>`_
+.. [#fnmysqlidx] *See* `Creating Spatial Indexes <https://dev.mysql.com/doc/refman/5.6/en/creating-spatial-indexes.html>`_
    in the MySQL Reference Manual:
 
        For MyISAM tables, ``SPATIAL INDEX`` creates an R-tree index. For storage
diff --git a/docs/ref/contrib/gis/geoip.txt b/docs/ref/contrib/gis/geoip.txt
index efe33ebef3..f46770e5ea 100644
--- a/docs/ref/contrib/gis/geoip.txt
+++ b/docs/ref/contrib/gis/geoip.txt
@@ -22,10 +22,10 @@ datasets in binary format (the CSV files will not work!).  These datasets may be
 you set :setting:`GEOIP_PATH` with in your settings.  See the example and
 reference below for more details.
 
-__ http://www.maxmind.com/app/c
-__ http://www.maxmind.com/app/country
-__ http://www.maxmind.com/app/city
-__ http://www.maxmind.com/download/geoip/database/
+__ https://www.maxmind.com/app/c
+__ https://www.maxmind.com/app/country
+__ https://www.maxmind.com/app/city
+__ https://www.maxmind.com/download/geoip/database/
 
 Example
 =======
diff --git a/docs/ref/contrib/gis/geoip2.txt b/docs/ref/contrib/gis/geoip2.txt
index 4d014a70e1..3471e9a0f6 100644
--- a/docs/ref/contrib/gis/geoip2.txt
+++ b/docs/ref/contrib/gis/geoip2.txt
@@ -19,7 +19,7 @@ in a directory corresponding to the :setting:`GEOIP_PATH` setting.
 Additionally, it is recommended to install the `libmaxminddb C library`__, so
 that ``geoip2`` can leverage the C library's faster speed.
 
-__ http://geoip2.readthedocs.org/
+__ https://geoip2.readthedocs.org/
 __ https://pypi.python.org/pypi/geoip2
 __ http://dev.maxmind.com/geoip/geoip2/geolite2/
 __ https://github.com/maxmind/libmaxminddb
diff --git a/docs/ref/contrib/gis/geoquerysets.txt b/docs/ref/contrib/gis/geoquerysets.txt
index 7fe2fec2b9..b3a7178ebc 100644
--- a/docs/ref/contrib/gis/geoquerysets.txt
+++ b/docs/ref/contrib/gis/geoquerysets.txt
@@ -1299,7 +1299,7 @@ Keyword Argument       Description
                        details.
 =====================  =====================================================
 
-__ http://docs.oracle.com/html/B14255_01/sdo_intro.htm#sthref150
+__ https://docs.oracle.com/html/B14255_01/sdo_intro.htm#sthref150
 
 Example::
 
@@ -1392,6 +1392,6 @@ Example::
 
 .. rubric:: Footnotes
 .. [#fnde9im] *See* `OpenGIS Simple Feature Specification For SQL <http://www.opengis.org/docs/99-049.pdf>`_, at Ch. 2.1.13.2, p. 2-13 (The Dimensionally Extended Nine-Intersection Model).
-.. [#fnsdorelate] *See* `SDO_RELATE documentation <http://docs.oracle.com/cd/B19306_01/appdev.102/b14255/sdo_operat.htm#sthref845>`_, from Ch. 11 of the Oracle Spatial User's Guide and Manual.
+.. [#fnsdorelate] *See* `SDO_RELATE documentation <https://docs.oracle.com/cd/B19306_01/appdev.102/b14255/sdo_operat.htm#sthref845>`_, from Ch. 11 of the Oracle Spatial User's Guide and Manual.
 .. [#fncovers] For an explanation of this routine, read `Quirks of the "Contains" Spatial Predicate <http://lin-ear-th-inking.blogspot.com/2007/06/subtleties-of-ogc-covers-spatial.html>`_ by Martin Davis (a PostGIS developer).
 .. [#fncontainsproperly] Refer to the PostGIS ``ST_ContainsProperly`` `documentation <http://postgis.net/docs/manual-1.5/ST_ContainsProperly.html>`_ for more details.
diff --git a/docs/ref/contrib/gis/geos.txt b/docs/ref/contrib/gis/geos.txt
index c04c4b2864..d539b2cbb9 100644
--- a/docs/ref/contrib/gis/geos.txt
+++ b/docs/ref/contrib/gis/geos.txt
@@ -17,7 +17,7 @@ implements the OpenGIS `Simple Features for SQL`__ spatial predicate functions
 and spatial operators. GEOS, now an OSGeo project, was initially developed and
 maintained by `Refractions Research`__ of Victoria, Canada.
 
-__ http://trac.osgeo.org/geos/
+__ https://trac.osgeo.org/geos/
 __ http://sourceforge.net/projects/jts-topo-suite/
 __ http://www.opengeospatial.org/standards/sfs
 __ http://www.refractions.net/
@@ -735,7 +735,7 @@ In order to obtain a prepared geometry, just access the
 may be used with other ``GEOSGeometry`` objects.  An operation with a prepared
 geometry can be orders of magnitude faster -- the more complex the geometry
 that is prepared, the larger the speedup in the operation.  For more information,
-please consult the `GEOS wiki page on prepared geometries <http://trac.osgeo.org/geos/wiki/PreparedGeometry>`_.
+please consult the `GEOS wiki page on prepared geometries <https://trac.osgeo.org/geos/wiki/PreparedGeometry>`_.
 
 For example::
 
diff --git a/docs/ref/contrib/gis/install/geolibs.txt b/docs/ref/contrib/gis/install/geolibs.txt
index 9174c3e0bb..83fc438ba4 100644
--- a/docs/ref/contrib/gis/install/geolibs.txt
+++ b/docs/ref/contrib/gis/install/geolibs.txt
@@ -218,8 +218,8 @@ Configure, make and install::
 If you have any problems, please see the troubleshooting section below for
 suggestions and solutions.
 
-__ http://trac.osgeo.org/gdal/
-__ http://trac.osgeo.org/gdal/wiki/GdalOgrInPython
+__ https://trac.osgeo.org/gdal/
+__ https://trac.osgeo.org/gdal/wiki/GdalOgrInPython
 
 .. _gdaltrouble:
 
diff --git a/docs/ref/contrib/gis/install/index.txt b/docs/ref/contrib/gis/install/index.txt
index 821372dd31..f85ad2f080 100644
--- a/docs/ref/contrib/gis/install/index.txt
+++ b/docs/ref/contrib/gis/install/index.txt
@@ -67,7 +67,7 @@ SQLite              GEOS, GDAL, PROJ.4, SpatiaLite  3.6.+               Requires
 See also `this comparison matrix`__ on the OSGeo Wiki for
 PostgreSQL/PostGIS/GEOS/GDAL possible combinations.
 
-__ http://trac.osgeo.org/postgis/wiki/UsersWikiPostgreSQLPostGIS
+__ https://trac.osgeo.org/postgis/wiki/UsersWikiPostgreSQLPostGIS
 
 Installation
 ============
@@ -361,7 +361,7 @@ Summary::
 
         export DYLD_FALLBACK_LIBRARY_PATH=/opt/local/lib:/opt/local/lib/postgresql93
 
-__ http://www.macports.org/
+__ https://www.macports.org/
 
 .. _windows:
 
@@ -468,7 +468,7 @@ may be unchecked safely.  After clicking next, the packages will be
 automatically downloaded and installed, after which you may exit the
 installer.
 
-.. _OSGeo4W installer: http://trac.osgeo.org/osgeo4w/
+.. _OSGeo4W installer: https://trac.osgeo.org/osgeo4w/
 
 Modify Windows environment
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/docs/ref/contrib/gis/install/spatialite.txt b/docs/ref/contrib/gis/install/spatialite.txt
index 80ab2b1712..7950c178db 100644
--- a/docs/ref/contrib/gis/install/spatialite.txt
+++ b/docs/ref/contrib/gis/install/spatialite.txt
@@ -39,7 +39,7 @@ just skip this section.
 To install from sources, download the latest amalgamation source archive from
 the `SQLite download page`__, and extract::
 
-    $ wget http://sqlite.org/sqlite-amalgamation-3.6.23.1.tar.gz
+    $ wget https://sqlite.org/sqlite-amalgamation-3.6.23.1.tar.gz
     $ tar xzf sqlite-amalgamation-3.6.23.1.tar.gz
     $ cd sqlite-3.6.23.1
 
@@ -51,8 +51,8 @@ needs to be customized so that SQLite knows to build the R*Tree module::
     $ sudo make install
     $ cd ..
 
-__ http://www.sqlite.org/rtree.html
-__ http://www.sqlite.org/download.html
+__ https://www.sqlite.org/rtree.html
+__ https://www.sqlite.org/download.html
 
 .. _spatialitebuild:
 
diff --git a/docs/ref/contrib/gis/model-api.txt b/docs/ref/contrib/gis/model-api.txt
index ee96f3f0ab..fccbdce35f 100644
--- a/docs/ref/contrib/gis/model-api.txt
+++ b/docs/ref/contrib/gis/model-api.txt
@@ -156,7 +156,7 @@ __ 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
+__ https://web.archive.org/web/20080302095452/http://welcome.warnercnr.colostate.edu/class_info/nr502/lg3/datums_coordinates/spcs.html
 
 ``spatial_index``
 -----------------
diff --git a/docs/ref/contrib/gis/tutorial.txt b/docs/ref/contrib/gis/tutorial.txt
index 215e8cc785..2247d5248e 100644
--- a/docs/ref/contrib/gis/tutorial.txt
+++ b/docs/ref/contrib/gis/tutorial.txt
@@ -38,7 +38,7 @@ basic apps`_ project. [#]_
 
 .. _OGC: http://www.opengeospatial.org/
 .. _world borders: http://thematicmapping.org/downloads/world_borders.php
-.. _GeoDjango basic apps: http://code.google.com/p/geodjango-basic-apps/
+.. _GeoDjango basic apps: https://code.google.com/p/geodjango-basic-apps/
 
 Setting Up
 ==========
@@ -737,7 +737,7 @@ may be edited by clicking on a polygon and dragging the vertexes to the desired
 position.
 
 .. _OpenLayers: http://openlayers.org/
-.. _Open Street Map: http://www.openstreetmap.org/
+.. _Open Street Map: https://www.openstreetmap.org/
 .. _Vector Map Level 0: http://earth-info.nga.mil/publications/vmap0.html
 .. _OSGeo: http://www.osgeo.org
 
@@ -773,6 +773,6 @@ option class in your ``admin.py`` file::
 .. [#] GeoDjango basic apps was written by Dane Springmeyer, Josh Livni, and
        Christopher Schmidt.
 .. [#] This point is the `University of Houston Law Center
-       <http://www.law.uh.edu/>`_.
+       <https://www.law.uh.edu/>`_.
 .. [#] Open Geospatial Consortium, Inc., `OpenGIS Simple Feature Specification
        For SQL <http://www.opengeospatial.org/standards/sfs>`_.
diff --git a/docs/ref/contrib/sitemaps.txt b/docs/ref/contrib/sitemaps.txt
index 2703c1627a..a5582f834f 100644
--- a/docs/ref/contrib/sitemaps.txt
+++ b/docs/ref/contrib/sitemaps.txt
@@ -160,7 +160,7 @@ Sitemap class reference
 
         * Good: :file:`'/foo/bar/'`
         * Bad: :file:`'example.com/foo/bar/'`
-        * Bad: :file:`'http://example.com/foo/bar/'`
+        * Bad: :file:`'https://example.com/foo/bar/'`
 
         If :attr:`~Sitemap.location` isn't provided, the framework will call
         the ``get_absolute_url()`` method on each object as returned by
@@ -453,7 +453,7 @@ generate a Google News compatible sitemap:
     <?xml version="1.0" encoding="UTF-8"?>
     <urlset
       xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
-      xmlns:news="http://www.google.com/schemas/sitemap-news/0.9">
+      xmlns:news="https://www.google.com/schemas/sitemap-news/0.9">
     {% spaceless %}
     {% for url in urlset %}
       <url>
@@ -496,7 +496,7 @@ that: :func:`django.contrib.sitemaps.ping_google()`.
     The :func:`ping_google` command only works if you have registered your
     site with `Google Webmaster Tools`_.
 
-.. _`Google Webmaster Tools`: http://www.google.com/webmasters/tools/
+.. _`Google Webmaster Tools`: https://www.google.com/webmasters/tools/
 
 One useful way to call :func:`ping_google` is from a model's ``save()``
 method::
diff --git a/docs/ref/contrib/sites.txt b/docs/ref/contrib/sites.txt
index baf373d529..5d5b7c0160 100644
--- a/docs/ref/contrib/sites.txt
+++ b/docs/ref/contrib/sites.txt
@@ -252,8 +252,8 @@ To do this, you can use the sites framework. A simple example::
     '/mymodel/objects/3/'
     >>> Site.objects.get_current().domain
     'example.com'
-    >>> 'http://%s%s' % (Site.objects.get_current().domain, obj.get_absolute_url())
-    'http://example.com/mymodel/objects/3/'
+    >>> 'https://%s%s' % (Site.objects.get_current().domain, obj.get_absolute_url())
+    'https://example.com/mymodel/objects/3/'
 
 .. _enabling-the-sites-framework:
 
diff --git a/docs/ref/contrib/syndication.txt b/docs/ref/contrib/syndication.txt
index 0a91a16e40..278e293276 100644
--- a/docs/ref/contrib/syndication.txt
+++ b/docs/ref/contrib/syndication.txt
@@ -17,7 +17,7 @@ you want to generate feeds outside of a Web context, or in some other
 lower-level way.
 
 .. _RSS: http://www.whatisrss.com/
-.. _Atom: http://tools.ietf.org/html/rfc4287
+.. _Atom: https://tools.ietf.org/html/rfc4287
 
 The high-level framework
 ========================
@@ -320,7 +320,7 @@ URLs
 
 The ``link`` method/attribute can return either an absolute path (e.g.
 :file:`"/blog/"`) or a URL with the fully-qualified domain and protocol (e.g.
-``"http://www.example.com/blog/"``). If ``link`` doesn't return the domain,
+``"https://www.example.com/blog/"``). If ``link`` doesn't return the domain,
 the syndication framework will insert the domain of the current site, according
 to your :setting:`SITE_ID setting <SITE_ID>`.
 
@@ -541,7 +541,7 @@ This example illustrates all possible attributes and methods for a
             Returns the feed's author's URL as a normal Python string.
             """
 
-        author_link = 'http://www.example.com/' # Hard-coded author URL.
+        author_link = 'https://www.example.com/' # Hard-coded author URL.
 
         # CATEGORIES -- One of the following three is optional. The framework
         # looks for them in this order. In each case, the method/attribute
@@ -746,7 +746,7 @@ This example illustrates all possible attributes and methods for a
             Returns the author URL for every item in the feed.
             """
 
-        item_author_link = 'http://www.example.com/' # Hard-coded author URL.
+        item_author_link = 'https://www.example.com/' # Hard-coded author URL.
 
         # ITEM ENCLOSURES -- One of the following three is optional. The
         # framework looks for them in this order. If one of them is defined,
@@ -1004,13 +1004,13 @@ For example, to create an Atom 1.0 feed and print it to standard output::
     >>> from datetime import datetime
     >>> f = feedgenerator.Atom1Feed(
     ...     title="My Weblog",
-    ...     link="http://www.example.com/",
+    ...     link="https://www.example.com/",
     ...     description="In which I write about what I ate today.",
     ...     language="en",
     ...     author_name="Myself",
-    ...     feed_url="http://example.com/atom.xml")
+    ...     feed_url="https://example.com/atom.xml")
     >>> f.add_item(title="Hot dog today",
-    ...     link="http://www.example.com/entries/1/",
+    ...     link="https://www.example.com/entries/1/",
     ...     pubdate=datetime.now(),
     ...     description="<p>Today I had a Vienna Beef hot dog. It was pink, plump and perfect.</p>")
     >>> print(f.writeString('UTF-8'))
@@ -1040,7 +1040,7 @@ attributes. Thus, you can subclass the appropriate feed generator class
 (``Atom1Feed`` or ``Rss201rev2Feed``) and extend these callbacks. They are:
 
 .. _georss: http://georss.org/
-.. _itunes podcast format: http://www.apple.com/itunes/podcasts/specs.html
+.. _itunes podcast format: https://www.apple.com/itunes/podcasts/specs.html
 
 ``SyndicationFeed.root_attributes(self, )``
     Return a ``dict`` of attributes to add to the root feed element