summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Dufresne <jon.dufresne@gmail.com>2018-10-23 06:03:00 -0700
committerCarlton Gibson <carlton.gibson@noumenal.es>2018-10-23 15:03:40 +0200
commit8a348c5fd0b3de2cdaf3c55e2fd243d2771bac0a (patch)
tree15a31f0cbd03e6a76fafcafdbc310504ef5d9fcd
parentfbd95ce9bb6dc7cd3bd24b9d95ea6350d2e02bf7 (diff)
downloaddjango-8a348c5fd0b3de2cdaf3c55e2fd243d2771bac0a.tar.gz
[2.1.x] Refs #29877 -- Made diveinto.org URLs HTTPS.
Backport of 136a900ef98a7b7261a124308c8c26370ff2d5e4 from master
-rw-r--r--AUTHORS2
-rw-r--r--docs/intro/contributing.txt4
-rw-r--r--docs/intro/index.txt2
-rw-r--r--docs/ref/django-admin.txt2
-rw-r--r--docs/ref/templates/builtins.txt2
-rw-r--r--docs/topics/settings.txt2
6 files changed, 7 insertions, 7 deletions
diff --git a/AUTHORS b/AUTHORS
index 54174f841e..1e2e0d3cb3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -897,6 +897,6 @@ A big THANK YOU goes to:
Ian Bicking for convincing Adrian to ditch code generation.
- Mark Pilgrim for "Dive Into Python" (http://www.diveinto.org/python3/).
+ Mark Pilgrim for "Dive Into Python" (https://www.diveinto.org/python3/).
Guido van Rossum for creating Python.
diff --git a/docs/intro/contributing.txt b/docs/intro/contributing.txt
index 587d5114f7..a4e3b6c68c 100644
--- a/docs/intro/contributing.txt
+++ b/docs/intro/contributing.txt
@@ -43,7 +43,7 @@ so that it can be of use to the widest audience.
to |django-developers| or drop by `#django-dev on irc.freenode.net`__ to
chat with other Django users who might be able to help.
-__ http://www.diveinto.org/python3/
+__ https://www.diveinto.org/python3/
__ irc://irc.freenode.net/django-dev
What does this tutorial cover?
@@ -333,7 +333,7 @@ This test checks that the ``make_toast()`` returns ``'toast'``.
* After reading those, if you want something a little meatier to sink
your teeth into, there's always the Python :mod:`unittest` documentation.
-__ http://www.diveinto.org/python3/unit-testing.html
+__ https://www.diveinto.org/python3/unit-testing.html
Running your new test
---------------------
diff --git a/docs/intro/index.txt b/docs/intro/index.txt
index d76a3960a5..23d7588af8 100644
--- a/docs/intro/index.txt
+++ b/docs/intro/index.txt
@@ -36,5 +36,5 @@ place: read this material to quickly get up and running.
.. _python: https://python.org/
.. _list of Python resources for non-programmers: https://wiki.python.org/moin/BeginnersGuide/NonProgrammers
- .. _Dive Into Python: http://www.diveinto.org/python3/
+ .. _Dive Into Python: https://www.diveinto.org/python3/
.. _books about Python: https://wiki.python.org/moin/PythonBooks
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 5b60f32296..1d6e070218 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -1604,7 +1604,7 @@ Example usage::
django-admin migrate --pythonpath='/home/djangoprojects/myproject'
-.. _import search path: http://www.diveinto.org/python3/your-first-python-program.html#importsearchpath
+.. _import search path: https://www.diveinto.org/python3/your-first-python-program.html#importsearchpath
.. django-admin-option:: --settings SETTINGS
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 5eefb16685..37981474f0 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -2092,7 +2092,7 @@ individual elements of the sequence.
Returns a slice of the list.
Uses the same syntax as Python's list slicing. See
-http://www.diveinto.org/python3/native-datatypes.html#slicinglists
+https://www.diveinto.org/python3/native-datatypes.html#slicinglists
for an introduction.
Example::
diff --git a/docs/topics/settings.txt b/docs/topics/settings.txt
index 9b836f6e0b..def574546f 100644
--- a/docs/topics/settings.txt
+++ b/docs/topics/settings.txt
@@ -46,7 +46,7 @@ The value of ``DJANGO_SETTINGS_MODULE`` should be in Python path syntax, e.g.
``mysite.settings``. Note that the settings module should be on the
Python `import search path`_.
-.. _import search path: http://www.diveinto.org/python3/your-first-python-program.html#importsearchpath
+.. _import search path: https://www.diveinto.org/python3/your-first-python-program.html#importsearchpath
The ``django-admin`` utility
----------------------------