From de0e285be80e0ca756088a97335d8faa698fbe6b Mon Sep 17 00:00:00 2001 From: Maxime Turcotte Date: Tue, 10 Jun 2014 15:16:31 -0400 Subject: [PATCH] [1.7.x] Fixed #22801 -- Added 'www.' to diveintopython.net links Backport of f97c53c098 from master --- AUTHORS | 2 +- docs/intro/contributing.txt | 4 ++-- docs/intro/index.txt | 2 +- docs/ref/django-admin.txt | 2 +- docs/topics/http/urls.txt | 2 +- docs/topics/settings.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/AUTHORS b/AUTHORS index 5ef45ec7f2..51183600fe 100644 --- a/AUTHORS +++ b/AUTHORS @@ -697,7 +697,7 @@ A big THANK YOU goes to: Ian Bicking for convincing Adrian to ditch code generation. - Mark Pilgrim for "Dive Into Python" (http://diveintopython.net, + Mark Pilgrim for "Dive Into Python" (http://www.diveintopython.net, http://www.diveintopython3.net). Guido van Rossum for creating Python. diff --git a/docs/intro/contributing.txt b/docs/intro/contributing.txt index 675a6c6155..2e828de40d 100644 --- a/docs/intro/contributing.txt +++ b/docs/intro/contributing.txt @@ -37,7 +37,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://diveintopython3.net/ +__ http://www.diveintopython3.net/ __ irc://irc.freenode.net/django-dev What does this tutorial cover? @@ -288,7 +288,7 @@ correctly in a couple different situations. your teeth into, there's always the `Python unittest documentation`__. __ https://code.djangoproject.com/ticket/17549 -__ http://diveintopython.net/unit_testing/index.html +__ http://www.diveintopython.net/unit_testing/index.html __ http://docs.python.org/library/unittest.html Running your new test diff --git a/docs/intro/index.txt b/docs/intro/index.txt index 18664ef053..2edad7f9ff 100644 --- a/docs/intro/index.txt +++ b/docs/intro/index.txt @@ -34,5 +34,5 @@ place: read this material to quickly get up and running. .. _python: http://python.org/ .. _list of Python resources for non-programmers: https://wiki.python.org/moin/BeginnersGuide/NonProgrammers - .. _Dive Into Python: http://diveintopython3.net/ + .. _Dive Into Python: http://www.diveintopython3.net/ .. _books about Python: https://wiki.python.org/moin/PythonBooks diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index f68157c2a9..a6a0de4002 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -1513,7 +1513,7 @@ variable. Note that this option is unnecessary in ``manage.py``, because it takes care of setting the Python path for you. -.. _import search path: http://diveintopython.net/getting_to_know_python/everything_is_an_object.html +.. _import search path: http://www.diveintopython.net/getting_to_know_python/everything_is_an_object.html .. django-admin-option:: --settings diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt index 52ef88b113..f8bb9832da 100644 --- a/docs/topics/http/urls.txt +++ b/docs/topics/http/urls.txt @@ -112,7 +112,7 @@ Example requests: * ``/articles/2003/03/03/`` would match the final pattern. Django would call the function ``news.views.article_detail(request, '2003', '03', '03')``. -.. _Dive Into Python's explanation: http://diveintopython.net/regular_expressions/street_addresses.html#re.matching.2.3 +.. _Dive Into Python's explanation: http://www.diveintopython.net/regular_expressions/street_addresses.html#re.matching.2.3 Named groups ============ diff --git a/docs/topics/settings.txt b/docs/topics/settings.txt index 1cfcd262cd..3da5226be9 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://diveintopython.net/getting_to_know_python/everything_is_an_object.html +.. _import search path: http://www.diveintopython.net/getting_to_know_python/everything_is_an_object.html The django-admin.py utility ---------------------------