summaryrefslogtreecommitdiff
path: root/docs/intro
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-04-01 14:03:55 +0200
committerClaude Paroz <claude@2xlibre.net>2013-04-01 14:04:41 +0200
commit2bcbca3451cf7738d8e88c20023f9e799a044e9d (patch)
treee6591e5bf89abd0c75361289da12d94783572626 /docs/intro
parent2d0db67813d457dc890a2287d9e98593565d650f (diff)
downloaddjango-2bcbca3451cf7738d8e88c20023f9e799a044e9d.tar.gz
Updated some 'Dive Into Python' links
Diffstat (limited to 'docs/intro')
-rw-r--r--docs/intro/contributing.txt5
-rw-r--r--docs/intro/index.txt6
2 files changed, 7 insertions, 4 deletions
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