Skip to content

Commit

Permalink
Updated some 'Dive Into Python' links
Browse files Browse the repository at this point in the history
  • Loading branch information
claudep committed Apr 1, 2013
1 parent 2d0db67 commit 2bcbca3
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 7 deletions.
3 changes: 2 additions & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion django/template/defaultfilters.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 3 additions & 2 deletions docs/intro/contributing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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

Expand Down
6 changes: 4 additions & 2 deletions docs/intro/index.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion docs/ref/templates/builtins.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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::
Expand Down

0 comments on commit 2bcbca3

Please sign in to comment.