Updated some 'Dive Into Python' links

5 files changed, 11 insertions, 7 deletions

diff --git a/AUTHORS b/AUTHORS
index 91f9452c63..084aefd647 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -619,6 +619,7 @@ A big THANK YOU goes to:
 
     Ian Bicking for convincing Adrian to ditch code generation.
 
-    Mark Pilgrim for diveintopython.org, which unfortunately no longer exists.
+    Mark Pilgrim for "Dive Into Python" (http://diveintopython.net,
+    http://www.diveintopython3.net).
 
     Guido van Rossum for creating Python.
diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py
index 85202b62a4..88526e5a20 100644
--- a/django/template/defaultfilters.py
+++ b/django/template/defaultfilters.py
@@ -551,7 +551,7 @@ def slice_filter(value, arg):
     Returns a slice of the list.
 
     Uses the same syntax as Python's list slicing; see
-    http://diveintopython.org/native_data_types/lists.html#odbchelper.list.slice
+    http://www.diveintopython3.net/native-datatypes.html#slicinglists
     for an introduction.
     """
     try:
diff --git a/docs/intro/contributing.txt b/docs/intro/contributing.txt
index 0078435601..8747375b0a 100644
--- a/docs/intro/contributing.txt
+++ b/docs/intro/contributing.txt
@@ -20,8 +20,8 @@ For this tutorial, we expect that you have at least a basic understanding of
 how Django works. This means you should be comfortable going through the
 existing tutorials on :doc:`writing your first Django app</intro/tutorial01>`.
 In addition, you should have a good understanding of Python itself. But if you
-don't, `Dive Into Python`__ is a fantastic (and free) online book for beginning
-Python programmers.
+don't, "Dive Into Python" (for `Python 2`__, for `Python 3`__) is a fantastic
+(and free) online book for beginning Python programmers.
 
 Those of you who are unfamiliar with version control systems and Trac will find
 that this tutorial and its links include just enough information to get started.
@@ -38,6 +38,7 @@ so that it can be of use to the widest audience.
     chat with other Django users who might be able to help.
 
 __ http://diveintopython.net/toc/index.html
+__ http://diveintopython3.net/
 __ http://groups.google.com/group/django-developers
 __ irc://irc.freenode.net/django-dev
 
diff --git a/docs/intro/index.txt b/docs/intro/index.txt
index 6c62eb547c..9e88402f6d 100644
--- a/docs/intro/index.txt
+++ b/docs/intro/index.txt
@@ -29,12 +29,14 @@ place: read this material to quickly get up and running.
     `list of Python resources for non-programmers`_
 
     If you already know a few other languages and want to get up to speed with
-    Python quickly, we recommend `Dive Into Python`_ (also available in a
+    Python quickly, we recommend "Dive Into Python" (for `Python 2`_, for
+    `Python 3`_, also available in a
     `dead-tree version`_). If that's not quite your style, there are quite
     a few other `books about Python`_.
 
     .. _python: http://python.org/
     .. _list of Python resources for non-programmers: http://wiki.python.org/moin/BeginnersGuide/NonProgrammers
-    .. _dive into python: http://diveintopython.net/
+    .. _Python 2: http://diveintopython.net/
+    .. _Python 3: http://diveintopython3.net/
     .. _dead-tree version: http://www.amazon.com/exec/obidos/ASIN/1590593561/ref=nosim/jacobian20
     .. _books about Python: http://wiki.python.org/moin/PythonBooks
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 0e81df9190..955d2ab67b 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -1936,7 +1936,7 @@ slice
 Returns a slice of the list.
 
 Uses the same syntax as Python's list slicing. See
-http://diveintopython.net/native_data_types/lists.html#odbchelper.list.slice
+http://www.diveintopython3.net/native-datatypes.html#slicinglists
 for an introduction.
 
 Example::