From ec24108008b05b582c651e339cb55def6a655b8b Mon Sep 17 00:00:00 2001 From: Michiel Beijen Date: Sat, 20 May 2017 15:32:35 +0200 Subject: [PATCH] [1.11.x] Pointed Dive into Python links to python3 site Backport of 48028c6f9a22742ff05da79822f5e3385d1b4c4c from master --- AUTHORS | 3 +-- docs/intro/contributing.txt | 2 +- docs/ref/django-admin.txt | 2 +- docs/topics/http/urls.txt | 2 +- docs/topics/settings.txt | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/AUTHORS b/AUTHORS index 658c84e809..ac8837505a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -831,7 +831,6 @@ A big THANK YOU goes to: Ian Bicking for convincing Adrian to ditch code generation. - Mark Pilgrim for "Dive Into Python" (http://www.diveintopython.net, - http://www.diveintopython3.net). + Mark Pilgrim for "Dive Into Python" (http://www.diveintopython3.net). Guido van Rossum for creating Python. diff --git a/docs/intro/contributing.txt b/docs/intro/contributing.txt index 703847eebb..2526faf998 100644 --- a/docs/intro/contributing.txt +++ b/docs/intro/contributing.txt @@ -396,7 +396,7 @@ that passing a ``prefix`` parameter when creating an instance still works too. * 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.diveintopython.net/unit_testing/index.html +__ http://www.diveintopython3.net/unit-testing.html Running your new test --------------------- diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 7209025263..800b80ee69 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -1591,7 +1591,7 @@ Example usage:: django-admin migrate --pythonpath='/home/djangoprojects/myproject' -.. _import search path: http://www.diveintopython.net/getting_to_know_python/everything_is_an_object.html +.. _import search path: http://www.diveintopython3.net/your-first-python-program.html#importsearchpath .. django-admin-option:: --settings SETTINGS diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt index 6e891e72f3..d5bae7f072 100644 --- a/docs/topics/http/urls.txt +++ b/docs/topics/http/urls.txt @@ -115,7 +115,7 @@ Example requests: * ``/articles/2003/03/03/`` would match the final pattern. Django would call the function ``views.article_detail(request, '2003', '03', '03')``. -.. _Dive Into Python's explanation: http://www.diveintopython.net/regular_expressions/street_addresses.html#re.matching.2.3 +.. _Dive Into Python's explanation: http://www.diveintopython3.net/regular-expressions.html#streetaddresses Named groups ============ diff --git a/docs/topics/settings.txt b/docs/topics/settings.txt index 25b3f94fe3..668f90afe2 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.diveintopython.net/getting_to_know_python/everything_is_an_object.html +.. _import search path: http://www.diveintopython3.net/your-first-python-program.html#importsearchpath The ``django-admin`` utility ----------------------------