Browse Source

Fixed #25778 -- Updated docs links to use https when available.

Jon Dufresne 9 years ago
parent
commit
7aabd62380
66 changed files with 156 additions and 156 deletions
  1. 1 1
      docs/conf.py
  2. 1 1
      docs/faq/admin.txt
  3. 2 2
      docs/faq/general.txt
  4. 2 2
      docs/faq/install.txt
  5. 2 2
      docs/howto/auth-remote-user.txt
  6. 1 1
      docs/howto/deployment/checklist.txt
  7. 2 2
      docs/howto/deployment/wsgi/apache-auth.txt
  8. 7 7
      docs/howto/deployment/wsgi/modwsgi.txt
  9. 4 4
      docs/howto/deployment/wsgi/uwsgi.txt
  10. 3 3
      docs/howto/jython.txt
  11. 1 1
      docs/howto/static-files/deployment.txt
  12. 1 1
      docs/index.txt
  13. 1 1
      docs/internals/contributing/writing-code/unit-tests.txt
  14. 8 8
      docs/internals/team.txt
  15. 1 1
      docs/intro/install.txt
  16. 2 2
      docs/intro/reusable-apps.txt
  17. 2 2
      docs/intro/tutorial01.txt
  18. 1 1
      docs/intro/whatsnext.txt
  19. 1 1
      docs/ref/class-based-views/base.txt
  20. 3 3
      docs/ref/contrib/admin/index.txt
  21. 1 1
      docs/ref/contrib/gis/admin.txt
  22. 2 2
      docs/ref/contrib/gis/db-api.txt
  23. 4 4
      docs/ref/contrib/gis/geoip.txt
  24. 1 1
      docs/ref/contrib/gis/geoip2.txt
  25. 2 2
      docs/ref/contrib/gis/geoquerysets.txt
  26. 2 2
      docs/ref/contrib/gis/geos.txt
  27. 2 2
      docs/ref/contrib/gis/install/geolibs.txt
  28. 3 3
      docs/ref/contrib/gis/install/index.txt
  29. 3 3
      docs/ref/contrib/gis/install/spatialite.txt
  30. 1 1
      docs/ref/contrib/gis/model-api.txt
  31. 3 3
      docs/ref/contrib/gis/tutorial.txt
  32. 3 3
      docs/ref/contrib/sitemaps.txt
  33. 2 2
      docs/ref/contrib/sites.txt
  34. 8 8
      docs/ref/contrib/syndication.txt
  35. 2 2
      docs/ref/csrf.txt
  36. 15 15
      docs/ref/databases.txt
  37. 1 1
      docs/ref/files/uploads.txt
  38. 1 1
      docs/ref/forms/fields.txt
  39. 1 1
      docs/ref/models/fields.txt
  40. 4 4
      docs/ref/models/querysets.txt
  41. 2 2
      docs/ref/request-response.txt
  42. 1 1
      docs/ref/settings.txt
  43. 7 7
      docs/ref/templates/builtins.txt
  44. 6 6
      docs/ref/unicode.txt
  45. 4 4
      docs/ref/utils.txt
  46. 1 1
      docs/releases/0.95.txt
  47. 1 1
      docs/releases/1.1.txt
  48. 1 1
      docs/releases/1.4.19.txt
  49. 1 1
      docs/releases/1.6.11.txt
  50. 2 2
      docs/releases/1.6.txt
  51. 1 1
      docs/releases/1.7.7.txt
  52. 1 1
      docs/releases/1.7.txt
  53. 2 2
      docs/topics/cache.txt
  54. 1 1
      docs/topics/db/transactions.txt
  55. 1 1
      docs/topics/http/_images/middleware.graffle
  56. 1 1
      docs/topics/http/sessions.txt
  57. 1 1
      docs/topics/http/shortcuts.txt
  58. 2 2
      docs/topics/http/urls.txt
  59. 1 1
      docs/topics/i18n/index.txt
  60. 1 1
      docs/topics/i18n/translation.txt
  61. 4 4
      docs/topics/install.txt
  62. 1 1
      docs/topics/python3.txt
  63. 1 1
      docs/topics/security.txt
  64. 1 1
      docs/topics/signing.txt
  65. 1 1
      docs/topics/testing/_images/django_unittest_classes_hierarchy.graffle
  66. 3 3
      docs/topics/testing/tools.txt

+ 1 - 1
docs/conf.py

@@ -128,7 +128,7 @@ pygments_style = 'trac'
 intersphinx_mapping = {
     'python': ('https://docs.python.org/3/', None),
     'sphinx': ('http://sphinx-doc.org/', None),
-    'six': ('http://pythonhosted.org/six/', None),
+    'six': ('https://pythonhosted.org/six/', None),
     'formtools': ('http://django-formtools.readthedocs.org/en/latest/', None),
     'psycopg2': ('http://initd.org/psycopg/docs/', None),
 }

+ 1 - 1
docs/faq/admin.txt

@@ -10,7 +10,7 @@ things:
 
 * Set the :setting:`SESSION_COOKIE_DOMAIN` setting in your admin config
   file to match your domain. For example, if you're going to
-  "http://www.example.com/admin/" in your browser, in "myproject.settings" you
+  "https://www.example.com/admin/" in your browser, in "myproject.settings" you
   should set :setting:`SESSION_COOKIE_DOMAIN` = 'www.example.com'.
 
 I can't log in. When I enter a valid username and password, it brings up the login page again, with a "Please enter a correct username and password" error.

+ 2 - 2
docs/faq/general.txt

@@ -24,7 +24,7 @@ Django. Django would not be possible without a whole host of open-source
 projects -- `Apache`_, `Python`_, and `PostgreSQL`_ to name a few -- and we're
 thrilled to be able to give something back to the open-source community.
 
-.. _Apache: http://httpd.apache.org/
+.. _Apache: https://httpd.apache.org/
 .. _Python: https://www.python.org/
 .. _PostgreSQL: http://www.postgresql.org/
 
@@ -75,7 +75,7 @@ Which sites use Django?
 
 `DjangoSites.org`_ features a constantly growing list of Django-powered sites.
 
-.. _DjangoSites.org: http://djangosites.org
+.. _DjangoSites.org: https://djangosites.org
 
 .. _faq-mtv:
 

+ 2 - 2
docs/faq/install.txt

@@ -33,8 +33,8 @@ PostgreSQL fans, and MySQL_, `SQLite 3`_, and Oracle_ are also supported.
 
 .. _Python: https://www.python.org/
 .. _PostgreSQL: http://www.postgresql.org/
-.. _MySQL: http://www.mysql.com/
-.. _`SQLite 3`: http://www.sqlite.org/
+.. _MySQL: https://www.mysql.com/
+.. _`SQLite 3`: https://www.sqlite.org/
 .. _Oracle: http://www.oracle.com/
 
 .. _faq-python-version-support:

+ 2 - 2
docs/howto/auth-remote-user.txt

@@ -9,10 +9,10 @@ intranet sites, with single sign-on solutions such as IIS and Integrated
 Windows Authentication or Apache and `mod_authnz_ldap`_, `CAS`_, `Cosign`_,
 `WebAuth`_, `mod_auth_sspi`_, etc.
 
-.. _mod_authnz_ldap: http://httpd.apache.org/docs/2.2/mod/mod_authnz_ldap.html
+.. _mod_authnz_ldap: https://httpd.apache.org/docs/2.2/mod/mod_authnz_ldap.html
 .. _CAS: https://www.apereo.org/projects/cas
 .. _Cosign: http://weblogin.org
-.. _WebAuth: http://www.stanford.edu/services/webauth/
+.. _WebAuth: https://www.stanford.edu/services/webauth/
 .. _mod_auth_sspi: http://sourceforge.net/projects/mod-auth-sspi
 
 When the Web server takes care of authentication it typically sets the

+ 1 - 1
docs/howto/deployment/checklist.txt

@@ -234,7 +234,7 @@ See :doc:`/howto/error-reporting` for details on error reporting by email.
     Consider using an error monitoring system such as Sentry_ before your
     inbox is flooded by reports. Sentry can also aggregate logs.
 
-    .. _Sentry: http://sentry.readthedocs.org/en/latest/
+    .. _Sentry: https://sentry.readthedocs.org/en/latest/
 
 Customize the default error views
 ---------------------------------

+ 2 - 2
docs/howto/deployment/wsgi/apache-auth.txt

@@ -23,7 +23,7 @@ version >= 2.2 and mod_wsgi >= 2.0. For example, you could:
     auth handler if your custom cannot conform to these requirements.
 
 .. _Subversion: http://subversion.tigris.org/
-.. _mod_dav: http://httpd.apache.org/docs/2.2/mod/mod_dav.html
+.. _mod_dav: https://httpd.apache.org/docs/2.2/mod/mod_dav.html
 
 Authentication with mod_wsgi
 ============================
@@ -98,7 +98,7 @@ The mod_wsgi `access control mechanisms documentation`_ provides additional
 details and information about alternative methods of authentication.
 
 .. _Defining Application Groups: https://code.google.com/p/modwsgi/wiki/ConfigurationGuidelines#Defining_Application_Groups
-.. _access control mechanisms documentation: http://code.google.com/p/modwsgi/wiki/AccessControlMechanisms
+.. _access control mechanisms documentation: https://code.google.com/p/modwsgi/wiki/AccessControlMechanisms
 
 Authorization with mod_wsgi and Django groups
 ---------------------------------------------

+ 7 - 7
docs/howto/deployment/wsgi/modwsgi.txt

@@ -5,7 +5,7 @@ How to use Django with Apache and mod_wsgi
 Deploying Django with Apache_ and `mod_wsgi`_ is a tried and tested way to get
 Django into production.
 
-.. _Apache: http://httpd.apache.org/
+.. _Apache: https://httpd.apache.org/
 .. _mod_wsgi: http://www.modwsgi.org/
 
 mod_wsgi is an Apache module which can host any Python WSGI_ application,
@@ -18,8 +18,8 @@ The `official mod_wsgi documentation`_ is fantastic; it's your source for all
 the details about how to use mod_wsgi. You'll probably want to start with the
 `installation and configuration documentation`_.
 
-.. _official mod_wsgi documentation: http://modwsgi.readthedocs.org/
-.. _installation and configuration documentation: http://modwsgi.readthedocs.org/en/develop/installation.html
+.. _official mod_wsgi documentation: https://modwsgi.readthedocs.org/
+.. _installation and configuration documentation: https://modwsgi.readthedocs.org/en/develop/installation.html
 
 Basic configuration
 ===================
@@ -127,7 +127,7 @@ use ``WSGIPythonPath``; instead you should use the ``python-path`` option to
     WSGIProcessGroup example.com
 
 If you want to serve your project in a subdirectory
-(``http://example.com/mysite`` in this example), you can add ``WSGIScriptAlias``
+(``https://example.com/mysite`` in this example), you can add ``WSGIScriptAlias``
 to the configuration above:
 
 .. code-block:: apache
@@ -137,7 +137,7 @@ to the configuration above:
 See the official mod_wsgi documentation for `details on setting up daemon
 mode`_.
 
-.. _details on setting up daemon mode: http://code.google.com/p/modwsgi/wiki/QuickConfigurationGuide#Delegation_To_Daemon_Process
+.. _details on setting up daemon mode: https://code.google.com/p/modwsgi/wiki/QuickConfigurationGuide#Delegation_To_Daemon_Process
 
 .. _serving-files:
 
@@ -191,12 +191,12 @@ If you are using a version of Apache older than 2.4, replace
 ``Order deny,allow`` above it.
 
 .. _Nginx: http://wiki.nginx.org/Main
-.. _Apache: http://httpd.apache.org/
+.. _Apache: https://httpd.apache.org/
 
 .. More details on configuring a mod_wsgi site to serve static files can be found
 .. in the mod_wsgi documentation on `hosting static files`_.
 
-.. _hosting static files: http://code.google.com/p/modwsgi/wiki/ConfigurationGuidelines#Hosting_Of_Static_Files
+.. _hosting static files: https://code.google.com/p/modwsgi/wiki/ConfigurationGuidelines#Hosting_Of_Static_Files
 
 .. _serving-the-admin-files:
 

+ 4 - 4
docs/howto/deployment/wsgi/uwsgi.txt

@@ -7,7 +7,7 @@ How to use Django with uWSGI
 uWSGI_ is a fast, self-healing and developer/sysadmin-friendly application
 container server coded in pure C.
 
-.. _uWSGI: http://projects.unbit.it/uwsgi/
+.. _uWSGI: https://projects.unbit.it/uwsgi/
 
 .. seealso::
 
@@ -30,7 +30,7 @@ command. For example:
     $ pip install uwsgi
 
     # Or install LTS (long term support).
-    $ pip install http://projects.unbit.it/downloads/uwsgi-lts.tar.gz
+    $ pip install https://projects.unbit.it/downloads/uwsgi-lts.tar.gz
 
 .. _installation procedures: http://uwsgi-docs.readthedocs.org/en/latest/Install.html
 
@@ -50,7 +50,7 @@ uWSGI operates on a client-server model. Your Web server (e.g., nginx, Apache)
 communicates with a django-uwsgi "worker" process to serve dynamic content.
 See uWSGI's `background documentation`_ for more detail.
 
-.. _background documentation: http://projects.unbit.it/uwsgi/wiki/Background
+.. _background documentation: https://projects.unbit.it/uwsgi/wiki/Background
 
 Configuring and starting the uWSGI server for Django
 ----------------------------------------------------
@@ -59,7 +59,7 @@ uWSGI supports multiple ways to configure the process. See uWSGI's
 `configuration documentation`_ and `examples`_.
 
 .. _configuration documentation: https://uwsgi.readthedocs.org/en/latest/Configuration.html
-.. _examples: http://projects.unbit.it/uwsgi/wiki/Example
+.. _examples: https://projects.unbit.it/uwsgi/wiki/Example
 
 Here's an example command to start a uWSGI server::
 

+ 3 - 3
docs/howto/jython.txt

@@ -26,9 +26,9 @@ If you want to use Django on a production site, use a Java servlet container,
 such as `Apache Tomcat`_. Full JavaEE applications servers such as `GlassFish`_
 or `JBoss`_ are also OK, if you need the extra features they include.
 
-.. _`Apache Tomcat`: http://tomcat.apache.org/
+.. _`Apache Tomcat`: https://tomcat.apache.org/
 .. _GlassFish: https://glassfish.java.net/
-.. _JBoss: http://www.jboss.org/
+.. _JBoss: https://www.jboss.org/
 
 Installing Django
 =================
@@ -71,4 +71,4 @@ running on standard Python. However, are a few differences to keep in mind:
 
 * Any part of Django that requires `Pillow`_ will not work.
 
-.. _Pillow: http://pillow.readthedocs.org/en/latest/
+.. _Pillow: https://pillow.readthedocs.org/en/latest/

+ 1 - 1
docs/howto/static-files/deployment.txt

@@ -74,7 +74,7 @@ type of web server -- faster but less full-featured. Some common choices are:
 * A stripped-down version of Apache_
 
 .. _Nginx: http://wiki.nginx.org/Main
-.. _Apache: http://httpd.apache.org/
+.. _Apache: https://httpd.apache.org/
 
 Configuring these servers is out of scope of this document; check each
 server's respective documentation for instructions.

+ 1 - 1
docs/index.txt

@@ -25,7 +25,7 @@ Having trouble? We'd like to help!
 
 * Report bugs with Django in our `ticket tracker`_.
 
-.. _archives: http://groups.google.com/group/django-users/
+.. _archives: https://groups.google.com/group/django-users/
 .. _post a question: https://groups.google.com/d/forum/django-users
 .. _#django IRC channel: irc://irc.freenode.net/django
 .. _IRC logs: http://django-irc-logs.com/

+ 1 - 1
docs/internals/contributing/writing-code/unit-tests.txt

@@ -182,7 +182,7 @@ associated tests will be skipped.
 .. _setuptools: https://pypi.python.org/pypi/setuptools/
 .. _memcached: http://memcached.org/
 .. _mock: https://pypi.python.org/pypi/mock
-.. _gettext: http://www.gnu.org/software/gettext/manual/gettext.html
+.. _gettext: https://www.gnu.org/software/gettext/manual/gettext.html
 .. _selenium: https://pypi.python.org/pypi/selenium
 .. _sqlparse: https://pypi.python.org/pypi/sqlparse
 .. _pip requirements files: https://pip.pypa.io/en/latest/user_guide.html#requirements-files

+ 8 - 8
docs/internals/team.txt

@@ -48,7 +48,7 @@ Journal-World`_ of Lawrence, Kansas, USA.
 
 .. _lawrence journal-world: http://ljworld.com/
 .. _adrian holovaty: http://holovaty.com/
-.. _everyblock: http://everyblock.com/
+.. _everyblock: https://everyblock.com/
 .. _soundslice: https://www.soundslice.com/
 .. _simon willison: http://simonwillison.net/
 .. _web-development blog: `simon willison`_
@@ -163,7 +163,7 @@ Karen Tracey
 
     Andrew lives in San Francisco, CA, USA.
 
-    .. _Andrew Godwin: http://www.aeracode.org/
+    .. _Andrew Godwin: https://www.aeracode.org/
 
 `Carl Meyer`_
     Carl has been a Django user since 2007 (long enough to remember
@@ -299,7 +299,7 @@ Florian Apolloner
     For the time being he lives in Graz, Austria (not Australia ;)).
 
     .. _Graz University of Technology: http://tugraz.at/
-    .. _Ubuntuusers webteam: http://wiki.ubuntuusers.de/ubuntuusers/Webteam
+    .. _Ubuntuusers webteam: https://wiki.ubuntuusers.de/ubuntuusers/Webteam
 
 Jeremy Dunck
     Jeremy was rescued from corporate IT drudgery by Free Software and, in part,
@@ -343,7 +343,7 @@ Jeremy Dunck
 
     .. _Simon Charette: https://github.com/charettes
     .. _Ultimate Frisbee: http://www.montrealultimate.ca
-    .. _Reptiletech: http://www.reptiletech.com
+    .. _Reptiletech: https://www.reptiletech.com
 
 Donald Stufft
     Donald found Python and Django in 2007 while trying to find a language,
@@ -366,7 +366,7 @@ Marc Tamlyn
     Marc is currently a full-time parent, part-time developer, and lives in
     Oxford, UK.
 
-    .. _CCBV: http://ccbv.co.uk/
+    .. _CCBV: https://ccbv.co.uk/
 
 Shai Berger
     Shai started working with Python back in 1998, and with Django just
@@ -493,7 +493,7 @@ Daniele Procida
 
     .. _Markus Holtermann: https://github.com/MarkusH
     .. _Technical University of Berlin: http://www.tu-berlin.de/
-    .. _ubuntuusers.de: http://ubuntuusers.de/
+    .. _ubuntuusers.de: https://ubuntuusers.de/
     .. _EuroPython 2014 website: https://ep2014.europython.eu/
 
 `Josh Smeaton`_
@@ -534,7 +534,7 @@ Daniele Procida
     .. _Tomek Paczkowski: https://hauru.eu
     .. _DjangoCon Europe 2013: http://love.djangocircus.com
     .. _Django Girls: https://djangogirls.org
-    .. _Squirrel: http://squirrel.me
+    .. _Squirrel: https://squirrel.me
 
 `Ola Sitarska`_
     Ola started working with Django in 2009, when she discovered the power of
@@ -658,7 +658,7 @@ Joseph Kocherhans
     Gary lives in Austin, Texas, USA.
 
     .. _Gary Wilson: http://thegarywilson.com/
-    .. _The University of Texas: http://www.utexas.edu/
+    .. _The University of Texas: https://www.utexas.edu/
 
 `Brian Rosner`_
     Brian enjoys learning more about programming languages and system

+ 1 - 1
docs/intro/install.txt

@@ -13,7 +13,7 @@ Being a Python Web framework, Django requires Python. See
 :ref:`faq-python-version-support` for details. Python includes a lightweight
 database called SQLite_ so you won't need to set up a database just yet.
 
-.. _sqlite: http://sqlite.org/
+.. _sqlite: https://sqlite.org/
 
 Get the latest version of Python at https://www.python.org/download/ or with
 your operating system's package manager.

+ 2 - 2
docs/intro/reusable-apps.txt

@@ -185,7 +185,7 @@ this. For a small app like polls, this process isn't too difficult.
 5. Next we'll create a ``setup.py`` file which provides details about how to
    build and install the app.  A full explanation of this file is beyond the
    scope of this tutorial, but the `setuptools docs
-   <http://pythonhosted.org/setuptools/setuptools.html>`_ have a good
+   <https://pythonhosted.org/setuptools/setuptools.html>`_ have a good
    explanation. Create a file ``django-polls/setup.py`` with the following
    contents:
 
@@ -209,7 +209,7 @@ this. For a small app like polls, this process isn't too difficult.
            license='BSD License',  # example license
            description='A simple Django app to conduct Web-based polls.',
            long_description=README,
-           url='http://www.example.com/',
+           url='https://www.example.com/',
            author='Your Name',
            author_email='yourname@example.com',
            classifiers=[

+ 2 - 2
docs/intro/tutorial01.txt

@@ -331,8 +331,8 @@ finds one that matches.
 
 Note that these regular expressions do not search GET and POST parameters, or
 the domain name. For example, in a request to
-``http://www.example.com/myapp/``, the URLconf will look for ``myapp/``. In a
-request to ``http://www.example.com/myapp/?page=3``, the URLconf will also
+``https://www.example.com/myapp/``, the URLconf will look for ``myapp/``. In a
+request to ``https://www.example.com/myapp/?page=3``, the URLconf will also
 look for ``myapp/``.
 
 If you need help with regular expressions, see `Wikipedia's entry`_ and the

+ 1 - 1
docs/intro/whatsnext.txt

@@ -192,7 +192,7 @@ You can get a local copy of the HTML documentation following a few easy steps:
     or newer, but we recommend going straight to Sphinx 1.0.2 or newer.
 
 __ http://sphinx-doc.org/
-__ http://www.gnu.org/software/make/
+__ https://www.gnu.org/software/make/
 
 .. _differences-between-doc-versions:
 

+ 1 - 1
docs/ref/class-based-views/base.txt

@@ -205,7 +205,7 @@ RedirectView
         urlpatterns = [
             url(r'^counter/(?P<pk>[0-9]+)/$', ArticleCounterRedirectView.as_view(), name='article-counter'),
             url(r'^details/(?P<pk>[0-9]+)/$', ArticleDetail.as_view(), name='article-detail'),
-            url(r'^go-to-django/$', RedirectView.as_view(url='http://djangoproject.com'), name='go-to-django'),
+            url(r'^go-to-django/$', RedirectView.as_view(url='https://djangoproject.com'), name='go-to-django'),
         ]
 
     **Attributes**

+ 3 - 3
docs/ref/contrib/admin/index.txt

@@ -1256,8 +1256,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
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -1929,7 +1929,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:
 

+ 1 - 1
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.

+ 2 - 2
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

+ 4 - 4
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
 =======

+ 1 - 1
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

+ 2 - 2
docs/ref/contrib/gis/geoquerysets.txt

@@ -1239,7 +1239,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::
 
@@ -1332,6 +1332,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.

+ 2 - 2
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/
@@ -779,7 +779,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::
 

+ 2 - 2
docs/ref/contrib/gis/install/geolibs.txt

@@ -216,8 +216,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:
 

+ 3 - 3
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
 ^^^^^^^^^^^^^^^^^^^^^^^^^^

+ 3 - 3
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:
 

+ 1 - 1
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``
 -----------------

+ 3 - 3
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
 ==========
@@ -735,7 +735,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
 
@@ -771,6 +771,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>`_.

+ 3 - 3
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
@@ -451,7 +451,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>
@@ -494,7 +494,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::

+ 2 - 2
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:
 

+ 8 - 8
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

+ 2 - 2
docs/ref/csrf.txt

@@ -19,7 +19,7 @@ The first defense against CSRF attacks is to ensure that GET requests (and other
 such as POST, PUT and DELETE, can then be protected by following the steps
 below.
 
-.. _Cross Site Request Forgeries: http://www.squarefree.com/securitytips/web-developers.html#CSRF
+.. _Cross Site Request Forgeries: https://www.squarefree.com/securitytips/web-developers.html#CSRF
 
 .. _using-csrf:
 
@@ -142,7 +142,7 @@ The above code could be simplified by using the `JavaScript Cookie library
 
 Finally, you'll have to actually set the header on your AJAX request, while
 protecting the CSRF token from being sent to other domains using
-`settings.crossDomain <http://api.jquery.com/jQuery.ajax>`_ in jQuery 1.5.1 and
+`settings.crossDomain <https://api.jquery.com/jQuery.ajax>`_ in jQuery 1.5.1 and
 newer:
 
 .. code-block:: javascript

+ 15 - 15
docs/ref/databases.txt

@@ -225,9 +225,9 @@ running ``migrate``::
         1005, "Can't create table '\\db_name\\.#sql-4a8_ab' (errno: 150)"
     )
 
-.. _storage engines: http://dev.mysql.com/doc/refman/5.6/en/storage-engines.html
-.. _MyISAM: http://dev.mysql.com/doc/refman/5.6/en/myisam-storage-engine.html
-.. _InnoDB: http://dev.mysql.com/doc/refman/5.6/en/innodb-storage-engine.html
+.. _storage engines: https://dev.mysql.com/doc/refman/5.6/en/storage-engines.html
+.. _MyISAM: https://dev.mysql.com/doc/refman/5.6/en/myisam-storage-engine.html
+.. _InnoDB: https://dev.mysql.com/doc/refman/5.6/en/innodb-storage-engine.html
 
 .. [#] Unless this was changed by the packager of your MySQL package. We've
    had reports that the Windows Community Server installer sets up InnoDB as
@@ -252,7 +252,7 @@ drivers that implement this API:
 
 .. _MySQLdb: https://pypi.python.org/pypi/MySQL-python/1.2.4
 .. _mysqlclient: https://pypi.python.org/pypi/mysqlclient
-.. _MySQL Connector/Python: http://dev.mysql.com/downloads/connector/python
+.. _MySQL Connector/Python: https://dev.mysql.com/downloads/connector/python
 
 All these drivers are thread-safe and provide connection pooling. ``MySQLdb``
 is the only one not supporting Python 3 currently.
@@ -261,7 +261,7 @@ In addition to a DB API driver, Django needs an adapter to access the database
 drivers from its ORM. Django provides an adapter for MySQLdb/mysqlclient while
 MySQL Connector/Python includes `its own`_.
 
-.. _its own: http://dev.mysql.com/doc/connector-python/en/connector-python-django-backend.html
+.. _its own: https://dev.mysql.com/doc/connector-python/en/connector-python-django-backend.html
 
 MySQLdb
 ~~~~~~~
@@ -295,7 +295,7 @@ MySQL Connector/Python is available from the `download page`_.
 The Django adapter is available in versions 1.1.X and later. It may not
 support the most recent releases of Django.
 
-.. _download page: http://dev.mysql.com/downloads/connector/python/
+.. _download page: https://dev.mysql.com/downloads/connector/python/
 
 .. _mysql-time-zone-definitions:
 
@@ -306,7 +306,7 @@ If you plan on using Django's :doc:`timezone support </topics/i18n/timezones>`,
 use `mysql_tzinfo_to_sql`_ to load time zone tables into the MySQL database.
 This needs to be done just once for your MySQL server, not per database.
 
-.. _mysql_tzinfo_to_sql: http://dev.mysql.com/doc/refman/5.6/en/mysql-tzinfo-to-sql.html
+.. _mysql_tzinfo_to_sql: https://dev.mysql.com/doc/refman/5.6/en/mysql-tzinfo-to-sql.html
 
 Creating your database
 ----------------------
@@ -317,7 +317,7 @@ You can `create your database`_ using the command-line tools and this SQL::
 
 This ensures all tables and columns will use UTF-8 by default.
 
-.. _create your database: http://dev.mysql.com/doc/refman/5.6/en/create-database.html
+.. _create your database: https://dev.mysql.com/doc/refman/5.6/en/create-database.html
 
 .. _mysql-collation:
 
@@ -331,7 +331,7 @@ the MySQL documentation. In all cases, you set the collation by directly
 manipulating the database tables; Django doesn't provide a way to set this on
 the model definition.
 
-.. _documented thoroughly: http://dev.mysql.com/doc/refman/5.6/en/charset.html
+.. _documented thoroughly: https://dev.mysql.com/doc/refman/5.6/en/charset.html
 
 By default, with a UTF-8 database, MySQL will use the
 ``utf8_general_ci`` collation. This results in all string equality
@@ -387,7 +387,7 @@ you should use ``utf8_general_ci`` because it is faster. If this is not acceptab
 (for example, if you require German dictionary order), use ``utf8_unicode_ci``
 because it is more accurate.
 
-.. _MySQL Unicode Character Sets: http://dev.mysql.com/doc/refman/5.7/en/charset-unicode-sets.html
+.. _MySQL Unicode Character Sets: https://dev.mysql.com/doc/refman/5.7/en/charset-unicode-sets.html
 
 .. warning::
 
@@ -436,7 +436,7 @@ Several other MySQLdb connection options may be useful, such as ``ssl``,
 ``init_command``, and ``sql_mode``. Consult the `MySQLdb documentation`_ for
 more details.
 
-.. _MySQL option file: http://dev.mysql.com/doc/refman/5.6/en/option-files.html
+.. _MySQL option file: https://dev.mysql.com/doc/refman/5.6/en/option-files.html
 .. _MySQLdb documentation: http://mysql-python.sourceforge.net/
 
 Creating your tables
@@ -480,7 +480,7 @@ Django uses lowercase table names when it auto-generates table names from
 models, so this is mainly a consideration if you are overriding the table name
 via the :class:`~django.db.models.Options.db_table` parameter.
 
-.. _known issues: http://bugs.mysql.com/bug.php?id=48875
+.. _known issues: https://bugs.mysql.com/bug.php?id=48875
 
 Savepoints
 ----------
@@ -583,7 +583,7 @@ are predominantly read-only or require a smaller installation footprint. As
 with all database servers, though, there are some differences that are
 specific to SQLite that you should be aware of.
 
-.. _SQLite: http://www.sqlite.org/
+.. _SQLite: https://www.sqlite.org/
 
 .. _sqlite-string-matching:
 
@@ -609,7 +609,7 @@ would be fairly difficult to do robustly. Thus, Django exposes the default
 SQLite behavior and you should be aware of this when doing case-insensitive or
 substring filtering.
 
-.. _documented at sqlite.org: http://www.sqlite.org/faq.html#q18
+.. _documented at sqlite.org: https://www.sqlite.org/faq.html#q18
 
 Old SQLite and ``CASE`` expressions
 -----------------------------------
@@ -624,7 +624,7 @@ the notable exception of the Python 2.7 installers for Windows.
 As of this writing, the latest release for Windows - Python 2.7.10 - includes
 SQLite 3.6.21. You can install ``pysqlite2`` or replace ``sqlite3.dll`` (by
 default installed in ``C:\Python27\DLLs``) with a newer version from
-http://www.sqlite.org/ to remedy this issue.
+https://www.sqlite.org/ to remedy this issue.
 
 .. _handling query parameters: https://code.djangoproject.com/ticket/24148
 

+ 1 - 1
docs/ref/files/uploads.txt

@@ -63,7 +63,7 @@ Here are some useful attributes of ``UploadedFile``:
     handler may not receive the uploaded file content, but instead a URL or
     other pointer to the file. (see `RFC 2388`_ section 5.3).
 
-    .. _RFC 2388: http://www.ietf.org/rfc/rfc2388.txt
+    .. _RFC 2388: https://www.ietf.org/rfc/rfc2388.txt
 
 .. attribute:: UploadedFile.charset
 

+ 1 - 1
docs/ref/forms/fields.txt

@@ -699,7 +699,7 @@ For each field, we describe the default widget used if you don't specify
     ``UploadedFile.content_type`` will be updated with the image's content type
     if Pillow can determine it, otherwise it will be set to ``None``.
 
-.. _Pillow: http://pillow.readthedocs.org/en/latest/
+.. _Pillow: https://pillow.readthedocs.org/en/latest/
 .. _Image: https://pillow.readthedocs.org/en/latest/reference/Image.html
 
 ``IntegerField``

+ 1 - 1
docs/ref/models/fields.txt

@@ -911,7 +911,7 @@ optional arguments:
 
 Requires the `Pillow`_ library.
 
-.. _Pillow: http://pillow.readthedocs.org/en/latest/
+.. _Pillow: https://pillow.readthedocs.org/en/latest/
 
 :class:`ImageField` instances are created in your database as ``varchar``
 columns with a default max length of 100 characters. As with other fields, you

+ 4 - 4
docs/ref/models/querysets.txt

@@ -708,8 +708,8 @@ object. If it's ``None``, Django uses the :ref:`current time zone
 
     .. _pytz: http://pytz.sourceforge.net/
     .. _Time Zones: http://www.postgresql.org/docs/current/static/datatype-datetime.html#DATATYPE-TIMEZONES
-    .. _Choosing a Time Zone File: http://docs.oracle.com/cd/E11882_01/server.112/e10729/ch4datetime.htm#NLSPG258
-    .. _mysql_tzinfo_to_sql: http://dev.mysql.com/doc/refman/5.6/en/mysql-tzinfo-to-sql.html
+    .. _Choosing a Time Zone File: https://docs.oracle.com/cd/E11882_01/server.112/e10729/ch4datetime.htm#NLSPG258
+    .. _mysql_tzinfo_to_sql: https://dev.mysql.com/doc/refman/5.6/en/mysql-tzinfo-to-sql.html
 
 none
 ~~~~
@@ -2769,7 +2769,7 @@ Note this is only available in MySQL and requires direct manipulation of the
 database to add the full-text index. By default Django uses BOOLEAN MODE for
 full text searches. See the `MySQL documentation`_ for additional details.
 
-.. _MySQL documentation: http://dev.mysql.com/doc/refman/5.6/en/fulltext-boolean.html
+.. _MySQL documentation: https://dev.mysql.com/doc/refman/5.6/en/fulltext-boolean.html
 
 .. fieldlookup:: regex
 
@@ -2989,7 +2989,7 @@ Variance
         documentation`_ for instructions on obtaining and installing this
         extension.
 
-.. _SQLite documentation: http://www.sqlite.org/contrib
+.. _SQLite documentation: https://www.sqlite.org/contrib
 
 Query-related classes
 =====================

+ 2 - 2
docs/ref/request-response.txt

@@ -289,7 +289,7 @@ Methods
     Otherwise the absolute URI is built using the server variables available in
     this request.
 
-    Example: ``"http://example.com/music/bands/the_beatles/?print=true"``
+    Example: ``"https://example.com/music/bands/the_beatles/?print=true"``
 
     .. note::
 
@@ -860,7 +860,7 @@ types of HTTP responses. Like ``HttpResponse``, these subclasses live in
 
     The first argument to the constructor is required -- the path to redirect
     to. This can be a fully qualified URL
-    (e.g. ``'http://www.yahoo.com/search/'``), an absolute path with no domain
+    (e.g. ``'https://www.yahoo.com/search/'``), an absolute path with no domain
     (e.g. ``'/search/'``), or even a relative path (e.g. ``'search/'``). In that
     last case, the client browser will reconstruct the full URL itself
     according to the current path. See :class:`HttpResponse` for other optional

+ 1 - 1
docs/ref/settings.txt

@@ -681,7 +681,7 @@ backend-specific.
 Supported by the PostgreSQL_ (``postgresql``) and MySQL_ (``mysql``) backends.
 
 .. _PostgreSQL: http://www.postgresql.org/docs/current/static/multibyte.html
-.. _MySQL: http://dev.mysql.com/doc/refman/5.6/en/charset-database.html
+.. _MySQL: https://dev.mysql.com/doc/refman/5.6/en/charset-database.html
 
 .. setting:: TEST_COLLATION
 

+ 7 - 7
docs/ref/templates/builtins.txt

@@ -1227,7 +1227,7 @@ date
 
 Formats a date according to the given format.
 
-Uses a similar format as PHP's ``date()`` function (http://php.net/date)
+Uses a similar format as PHP's ``date()`` function (https://php.net/date)
 with some differences.
 
 .. note::
@@ -1987,7 +1987,7 @@ output will be ``"Joel is a slug"``.
     more robust, you can use the ``bleach`` Python library, notably its
     `clean`_ method.
 
-.. _clean: http://bleach.readthedocs.org/en/latest/clean.html
+.. _clean: https://bleach.readthedocs.org/en/latest/clean.html
 
 .. templatefilter:: time
 
@@ -2211,8 +2211,8 @@ For example::
 
     {{ value|urlencode }}
 
-If ``value`` is ``"http://www.example.org/foo?a=b&c=d"``, the output will be
-``"http%3A//www.example.org/foo%3Fa%3Db%26c%3Dd"``.
+If ``value`` is ``"https://www.example.org/foo?a=b&c=d"``, the output will be
+``"https%3A//www.example.org/foo%3Fa%3Db%26c%3Dd"``.
 
 An optional argument containing the characters which should not be escaped can
 be provided.
@@ -2222,8 +2222,8 @@ provided when *all* characters should be escaped. For example::
 
     {{ value|urlencode:"" }}
 
-If ``value`` is ``"http://www.example.org/"``, the output will be
-``"http%3A%2F%2Fwww.example.org%2F"``.
+If ``value`` is ``"https://www.example.org/"``, the output will be
+``"https%3A%2F%2Fwww.example.org%2F"``.
 
 .. templatefilter:: urlize
 
@@ -2233,7 +2233,7 @@ urlize
 Converts URLs and email addresses in text into clickable links.
 
 This template tag works on links prefixed with ``http://``, ``https://``, or
-``www.``. For example, ``http://goo.gl/aia1t`` will get converted but
+``www.``. For example, ``https://goo.gl/aia1t`` will get converted but
 ``goo.gl/aia1t`` won't.
 
 It also supports domain-only links ending in one of the original top level

+ 6 - 6
docs/ref/unicode.txt

@@ -29,11 +29,11 @@ able to store certain characters in the database, and information will be lost.
 * SQLite users, there is nothing you need to do. SQLite always uses UTF-8
   for internal encoding.
 
-.. _MySQL manual: http://dev.mysql.com/doc/refman/5.6/en/charset-database.html
+.. _MySQL manual: https://dev.mysql.com/doc/refman/5.6/en/charset-database.html
 .. _PostgreSQL manual: http://www.postgresql.org/docs/current/static/multibyte.html
-.. _Oracle manual: http://docs.oracle.com/cd/E11882_01/server.112/e10729/toc.htm
-.. _section 2: http://docs.oracle.com/cd/E11882_01/server.112/e10729/ch2charset.htm#NLSPG002
-.. _section 11: http://docs.oracle.com/cd/E11882_01/server.112/e10729/ch11charsetmig.htm#NLSPG011
+.. _Oracle manual: https://docs.oracle.com/cd/E11882_01/server.112/e10729/toc.htm
+.. _section 2: https://docs.oracle.com/cd/E11882_01/server.112/e10729/ch2charset.htm#NLSPG002
+.. _section 11: https://docs.oracle.com/cd/E11882_01/server.112/e10729/ch11charsetmig.htm#NLSPG011
 
 All of Django's database backends automatically convert Unicode strings into
 the appropriate encoding for talking to the database. They also automatically
@@ -244,8 +244,8 @@ following is always true::
 So you can safely call it multiple times on the same URI/IRI without risking
 double-quoting problems.
 
-.. _URI: http://www.ietf.org/rfc/rfc2396.txt
-.. _IRI: http://www.ietf.org/rfc/rfc3987.txt
+.. _URI: https://www.ietf.org/rfc/rfc2396.txt
+.. _IRI: https://www.ietf.org/rfc/rfc3987.txt
 
 Models
 ======

+ 4 - 4
docs/ref/utils.txt

@@ -327,13 +327,13 @@ For simplifying the selection of a generator use ``feedgenerator.DefaultFeed``
 which is currently ``Rss201rev2Feed``
 
 For definitions of the different versions of RSS, see:
-http://web.archive.org/web/20110718035220/http://diveintomark.org/archives/2004/02/04/incompatible-rss
+https://web.archive.org/web/20110718035220/http://diveintomark.org/archives/2004/02/04/incompatible-rss
 
 .. function:: get_tag_uri(url, date)
 
     Creates a TagURI.
 
-    See http://web.archive.org/web/20110514113830/http://diveintomark.org/archives/2004/05/28/howto-atom-id
+    See https://web.archive.org/web/20110514113830/http://diveintomark.org/archives/2004/05/28/howto-atom-id
 
 SyndicationFeed
 ---------------
@@ -419,7 +419,7 @@ Rss201rev2Feed
 
 .. class:: Rss201rev2Feed(RssFeed)
 
-    Spec: http://cyber.law.harvard.edu/rss/rss.html
+    Spec: https://cyber.law.harvard.edu/rss/rss.html
 
 RssUserland091Feed
 ------------------
@@ -433,7 +433,7 @@ Atom1Feed
 
 .. class:: Atom1Feed(SyndicationFeed)
 
-    Spec: http://tools.ietf.org/html/rfc4287
+    Spec: https://tools.ietf.org/html/rfc4287
 
 ``django.utils.functional``
 ===========================

+ 1 - 1
docs/releases/0.95.txt

@@ -114,7 +114,7 @@ Django users and developers from around the world. Friendly people are usually
 available at any hour of the day -- to help, or just to chat.
 
 .. _Django website: https://www.djangoproject.com/
-.. _django-users: http://groups.google.com/group/django-users
+.. _django-users: https://groups.google.com/group/django-users
 
 Thanks for using Django!
 

+ 1 - 1
docs/releases/1.1.txt

@@ -444,7 +444,7 @@ the weary! If you'd like to help, discussion of Django development, including
 progress toward the 1.2 release, takes place daily on the django-developers
 mailing list:
 
-* http://groups.google.com/group/django-developers
+* https://groups.google.com/group/django-developers
 
 ... and in the ``#django-dev`` IRC channel on ``irc.freenode.net``. Feel free to
 join the discussions!

+ 1 - 1
docs/releases/1.4.19.txt

@@ -13,4 +13,4 @@ Bugfixes
   security release, the ``django.views.static.serve()`` function was altered
   to stream the files it serves. Unfortunately, the ``GZipMiddleware`` consumed
   the stream prematurely and prevented files from being served properly
-  (`#24158 <http://code.djangoproject.com/ticket/24158>`_).
+  (:ticket:`24158`).

+ 1 - 1
docs/releases/1.6.11.txt

@@ -13,7 +13,7 @@ Last year :func:`~django.utils.html.strip_tags`  was changed to work
 iteratively. The problem is that the size of the input it's processing can
 increase on each iteration which results in an infinite loop in
 ``strip_tags()``. This issue only affects versions of Python that haven't
-received  `a bugfix in HTMLParser <http://bugs.python.org/issue20288>`_; namely
+received  `a bugfix in HTMLParser <https://bugs.python.org/issue20288>`_; namely
 Python < 2.7.7 and 3.3.5. Some operating system vendors have also backported
 the fix for the Python bug into their packages of earlier versions.
 

+ 2 - 2
docs/releases/1.6.txt

@@ -485,7 +485,7 @@ pytz_. If you're using MySQL, you must install pytz_ and load the time zone
 tables with `mysql_tzinfo_to_sql`_.
 
 .. _pytz: http://pytz.sourceforge.net/
-.. _mysql_tzinfo_to_sql: http://dev.mysql.com/doc/refman/5.6/en/mysql-tzinfo-to-sql.html
+.. _mysql_tzinfo_to_sql: https://dev.mysql.com/doc/refman/5.6/en/mysql-tzinfo-to-sql.html
 
 Addition of ``QuerySet.datetimes()``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1044,7 +1044,7 @@ occasions, such as:
 This makes the cache effectively work on a per-session basis regardless of the
 ``CACHE_MIDDLEWARE_ANONYMOUS_ONLY`` setting.
 
-__ http://www.google.com/analytics/
+__ https://www.google.com/analytics/
 
 ``SEND_BROKEN_LINK_EMAILS`` setting
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+ 1 - 1
docs/releases/1.7.7.txt

@@ -13,7 +13,7 @@ Last year :func:`~django.utils.html.strip_tags`  was changed to work
 iteratively. The problem is that the size of the input it's processing can
 increase on each iteration which results in an infinite loop in
 ``strip_tags()``. This issue only affects versions of Python that haven't
-received  `a bugfix in HTMLParser <http://bugs.python.org/issue20288>`_; namely
+received  `a bugfix in HTMLParser <https://bugs.python.org/issue20288>`_; namely
 Python < 2.7.7 and 3.3.5. Some operating system vendors have also backported
 the fix for the Python bug into their packages of earlier versions.
 

+ 1 - 1
docs/releases/1.7.txt

@@ -1178,7 +1178,7 @@ query string but not the scheme or host. If a Django application was serving
 multiple subdomains or domains, cache keys could collide. In Django 1.7, cache
 keys vary by the absolute URL of the request including scheme, host, path, and
 query string. For example, the URL portion of a cache key is now generated from
-``http://www.example.com/path/to/?key=val`` rather than ``/path/to/?key=val``.
+``https://www.example.com/path/to/?key=val`` rather than ``/path/to/?key=val``.
 The cache keys generated by Django 1.7 will be different from the keys
 generated by older versions of Django. After upgrading to Django 1.7, the first
 request to any previously cached URL will be a cache miss.

+ 2 - 2
docs/topics/cache.txt

@@ -1016,7 +1016,7 @@ the request reaches your website.
 Here are a few examples of downstream caches:
 
 * Your ISP may cache certain pages, so if you requested a page from
-  http://example.com/, your ISP would send you the page without having to
+  https://example.com/, your ISP would send you the page without having to
   access example.com directly. The maintainers of example.com have no
   knowledge of this caching; the ISP sits between example.com and your Web
   browser, handling all of the caching transparently.
@@ -1059,7 +1059,7 @@ said to "vary on language."
 
 By default, Django's cache system creates its cache keys using the requested
 fully-qualified URL -- e.g.,
-``"http://www.example.com/stories/2005/?order_by=author"``. This means every
+``"https://www.example.com/stories/2005/?order_by=author"``. This means every
 request to that URL will use the same cached version, regardless of user-agent
 differences such as cookies or language preferences. However, if this page
 produces different content based on some difference in request headers -- such

+ 1 - 1
docs/topics/db/transactions.txt

@@ -587,7 +587,7 @@ function in autocommit mode: statements will be executed and committed as soon
 as they're called. If your MySQL setup *does* support transactions, Django
 will handle transactions as explained in this document.
 
-.. _information on MySQL transactions: http://dev.mysql.com/doc/refman/5.6/en/sql-syntax-transactions.html
+.. _information on MySQL transactions: https://dev.mysql.com/doc/refman/5.6/en/sql-syntax-transactions.html
 
 Handling exceptions within PostgreSQL transactions
 --------------------------------------------------

+ 1 - 1
docs/topics/http/_images/middleware.graffle

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "https://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>ActiveLayerIndex</key>

+ 1 - 1
docs/topics/http/sessions.txt

@@ -165,7 +165,7 @@ and the :setting:`SECRET_KEY` setting.
 
     Finally, the size of a cookie can have an impact on the `speed of your site`_.
 
-.. _`common limit of 4096 bytes`: http://tools.ietf.org/html/rfc2965#section-5.3
+.. _`common limit of 4096 bytes`: https://tools.ietf.org/html/rfc2965#section-5.3
 .. _`replay attacks`: https://en.wikipedia.org/wiki/Replay_attack
 .. _`speed of your site`: http://yuiblog.com/blog/2007/03/01/performance-research-part-3/
 

+ 1 - 1
docs/topics/http/shortcuts.txt

@@ -199,7 +199,7 @@ You can use the :func:`redirect` function in a number of ways.
 
         def my_view(request):
             ...
-            return redirect('http://example.com/')
+            return redirect('https://example.com/')
 
 By default, :func:`redirect` returns a temporary redirect. All of the above
 forms accept a ``permanent`` argument; if set to ``True`` a permanent redirect

+ 2 - 2
docs/topics/http/urls.txt

@@ -179,10 +179,10 @@ What the URLconf searches against
 The URLconf searches against the requested URL, as a normal Python string. This
 does not include GET or POST parameters, or the domain name.
 
-For example, in a request to ``http://www.example.com/myapp/``, the URLconf
+For example, in a request to ``https://www.example.com/myapp/``, the URLconf
 will look for ``myapp/``.
 
-In a request to ``http://www.example.com/myapp/?page=3``, the URLconf will look
+In a request to ``https://www.example.com/myapp/?page=3``, the URLconf will look
 for ``myapp/``.
 
 The URLconf doesn't look at the request method. In other words, all request

+ 1 - 1
docs/topics/i18n/index.txt

@@ -49,7 +49,7 @@ here's a simplified definition:
 More details can be found in the `W3C Web Internationalization FAQ`_, the `Wikipedia article`_ or the `GNU gettext documentation`_.
 
 .. _W3C Web Internationalization FAQ: http://www.w3.org/International/questions/qa-i18n
-.. _GNU gettext documentation: http://www.gnu.org/software/gettext/manual/gettext.html#Concepts
+.. _GNU gettext documentation: https://www.gnu.org/software/gettext/manual/gettext.html#Concepts
 .. _Wikipedia article: https://en.wikipedia.org/wiki/Internationalization_and_localization
 
 .. warning::

+ 1 - 1
docs/topics/i18n/translation.txt

@@ -182,7 +182,7 @@ translation string and the number of objects.
 
 This function is useful when you need your Django application to be localizable
 to languages where the number and complexity of `plural forms
-<http://www.gnu.org/software/gettext/manual/gettext.html#Plural-forms>`_ is
+<https://www.gnu.org/software/gettext/manual/gettext.html#Plural-forms>`_ is
 greater than the two forms used in English ('object' for the singular and
 'objects' for all the cases where ``count`` is different from one, irrespective
 of its value.)

+ 4 - 4
docs/topics/install.txt

@@ -58,7 +58,7 @@ deployment options. One is :doc:`uWSGI </howto/deployment/wsgi/uwsgi>`; it works
 very well with `nginx`_. Additionally, Django follows the WSGI spec
 (:pep:`3333`), which allows it to run on a variety of server platforms.
 
-.. _Apache: http://httpd.apache.org/
+.. _Apache: https://httpd.apache.org/
 .. _nginx: http://nginx.org/
 .. _mod_wsgi: http://www.modwsgi.org/
 
@@ -116,9 +116,9 @@ If you're using Django's :doc:`testing framework</topics/testing/index>` to test
 database queries, Django will need permission to create a test database.
 
 .. _PostgreSQL: http://www.postgresql.org/
-.. _MySQL: http://www.mysql.com/
+.. _MySQL: https://www.mysql.com/
 .. _psycopg2: http://initd.org/psycopg/
-.. _SQLite: http://www.sqlite.org/
+.. _SQLite: https://www.sqlite.org/
 .. _cx_Oracle: http://cx-oracle.sourceforge.net/
 .. _Oracle: http://www.oracle.com/
 
@@ -179,7 +179,7 @@ This is the recommended way to install Django.
 
 .. _pip: https://pip.pypa.io/
 .. _virtualenv: http://www.virtualenv.org/
-.. _virtualenvwrapper: http://virtualenvwrapper.readthedocs.org/en/latest/
+.. _virtualenvwrapper: https://virtualenvwrapper.readthedocs.org/en/latest/
 .. _standalone pip installer: https://pip.pypa.io/en/latest/installing.html#install-pip
 
 Installing a distribution-specific package

+ 1 - 1
docs/topics/python3.txt

@@ -6,7 +6,7 @@ Django 1.5 is the first version of Django to support Python 3. The same code
 runs both on Python 2 (≥ 2.6.5) and Python 3 (≥ 3.2), thanks to the six_
 compatibility layer.
 
-.. _six: http://pythonhosted.org/six/
+.. _six: https://pythonhosted.org/six/
 
 This document is primarily targeted at authors of pluggable applications
 who want to support both Python 2 and 3. It also describes guidelines that

+ 1 - 1
docs/topics/security.txt

@@ -272,4 +272,4 @@ security protection of the Web server, operating system and other components.
 * It is a good idea to limit the accessibility of your caching system and
   database using a firewall.
 
-.. _LimitRequestBody: http://httpd.apache.org/docs/2.4/mod/core.html#limitrequestbody
+.. _LimitRequestBody: https://httpd.apache.org/docs/2.4/mod/core.html#limitrequestbody

+ 1 - 1
docs/topics/signing.txt

@@ -76,7 +76,7 @@ generate signatures. You can use a different secret by passing it to the
 
     Returns a signer which uses ``key`` to generate signatures and ``sep`` to
     separate values. ``sep`` cannot be in the `URL safe base64 alphabet
-    <http://tools.ietf.org/html/rfc4648#section-5>`_.  This alphabet contains
+    <https://tools.ietf.org/html/rfc4648#section-5>`_.  This alphabet contains
     alphanumeric characters, hyphens, and underscores.
 
 Using the salt argument

+ 1 - 1
docs/topics/testing/_images/django_unittest_classes_hierarchy.graffle

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "https://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>ActiveLayerIndex</key>

+ 3 - 3
docs/topics/testing/tools.txt

@@ -73,7 +73,7 @@ Note a few important things about how the test client works:
 
   This is incorrect::
 
-      >>> c.get('http://www.example.com/login/')
+      >>> c.get('https://www.example.com/login/')
 
   The test client is not capable of retrieving Web pages that are not
   powered by your Django project. If you need to retrieve other Web pages,
@@ -921,7 +921,7 @@ out the `full reference`_ for more details.
 .. _Selenium: http://seleniumhq.org/
 .. _selenium package: https://pypi.python.org/pypi/selenium
 .. _full reference: http://selenium-python.readthedocs.org/en/latest/api.html
-.. _Firefox: http://www.mozilla.com/firefox/
+.. _Firefox: https://www.mozilla.com/firefox/
 
 .. note::
 
@@ -954,7 +954,7 @@ out the `full reference`_ for more details.
     use cases. Please refer to the `Selenium FAQ`_ and
     `Selenium documentation`_ for more information.
 
-    .. _Selenium FAQ: http://code.google.com/p/selenium/wiki/FrequentlyAskedQuestions#Q:_WebDriver_fails_to_find_elements_/_Does_not_block_on_page_loa
+    .. _Selenium FAQ: https://code.google.com/p/selenium/wiki/FrequentlyAskedQuestions#Q:_WebDriver_fails_to_find_elements_/_Does_not_block_on_page_loa
     .. _Selenium documentation: http://seleniumhq.org/docs/04_webdriver_advanced.html#explicit-waits
 
 Test cases features