diff options
| author | Maxime Turcotte <maxime.turcotte@savoirfairelinux.com> | 2014-06-10 15:16:31 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-06-10 15:41:25 -0400 |
| commit | fcd2e06ae5110fe6327128e8d170302c20077988 (patch) | |
| tree | d3e5e4539fde72141012307b6df80acc93b01bd0 | |
| parent | ab2a2f669563cea542a721fcbc907bb7c93d6e1f (diff) | |
[1.6.x] Fixed #22801 -- Added 'www.' to diveintopython.net links
Backport of f97c53c098 from master
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | docs/intro/contributing.txt | 6 | ||||
| -rw-r--r-- | docs/intro/index.txt | 4 | ||||
| -rw-r--r-- | docs/ref/django-admin.txt | 2 | ||||
| -rw-r--r-- | docs/topics/http/urls.txt | 2 | ||||
| -rw-r--r-- | docs/topics/settings.txt | 2 |
6 files changed, 9 insertions, 9 deletions
@@ -658,7 +658,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 98bf41c176..081f78c8cc 100644 --- a/docs/intro/contributing.txt +++ b/docs/intro/contributing.txt @@ -37,8 +37,8 @@ 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://diveintopython.net/toc/index.html -__ http://diveintopython3.net/ +__ http://www.diveintopython.net/toc/index.html +__ http://www.diveintopython3.net/ __ irc://irc.freenode.net/django-dev What does this tutorial cover? @@ -289,7 +289,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 a7872017b9..2bdd5d4ac5 100644 --- a/docs/intro/index.txt +++ b/docs/intro/index.txt @@ -36,7 +36,7 @@ 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 - .. _Python 2: http://diveintopython.net/ - .. _Python 3: http://diveintopython3.net/ + .. _Python 2: http://www.diveintopython.net/ + .. _Python 3: http://www.diveintopython3.net/ .. _dead-tree version: http://www.amazon.com/exec/obidos/ASIN/1590593561/ref=nosim/jacobian20 .. _books about Python: https://wiki.python.org/moin/PythonBooks diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index ad19e775c4..1ae6f4e176 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -1384,7 +1384,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 b19251dc66..bc547ea4ab 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 --------------------------- |