Browse files

Updated some 'Dive Into Python' links

  • Loading branch information...
1 parent 2d0db67 commit 2bcbca3451cf7738d8e88c20023f9e799a044e9d @claudep claudep committed Apr 1, 2013
Showing with 11 additions and 7 deletions.
  1. +2 −1 AUTHORS
  2. +1 −1 django/template/
  3. +3 −2 docs/intro/contributing.txt
  4. +4 −2 docs/intro/index.txt
  5. +1 −1 docs/ref/templates/builtins.txt
@@ -619,6 +619,7 @@ A big THANK YOU goes to:
Ian Bicking for convincing Adrian to ditch code generation.
- Mark Pilgrim for, which unfortunately no longer exists.
+ Mark Pilgrim for "Dive Into Python" (,
Guido van Rossum for creating Python.
@@ -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
for an introduction.
@@ -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.
__ irc://
@@ -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:
.. _list of Python resources for non-programmers:
- .. _dive into python:
+ .. _Python 2:
+ .. _Python 3:
.. _dead-tree version:
.. _books about Python:
@@ -1936,7 +1936,7 @@ slice
Returns a slice of the list.
Uses the same syntax as Python's list slicing. See
for an introduction.

0 comments on commit 2bcbca3

Please sign in to comment.