Commit fcd2e06a authored by Maxime Turcotte's avatar Maxime Turcotte Committed by Tim Graham
Browse files

[1.6.x] Fixed #22801 -- Added 'www.' to diveintopython.net links 

Backport of f97c53c0 from master
parent ab2a2f66

AUTHORS

+1 −1
Original line number Diff line number Diff line
@@ -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.

docs/intro/contributing.txt

+3 −3
Original line number Diff line number Diff line
@@ -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

docs/intro/index.txt

+2 −2
Original line number Diff line number Diff line
@@ -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

docs/ref/django-admin.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

docs/topics/http/urls.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

============