merge with 3.2

This commit is contained in:
Sandro Tosi 2011-10-31 17:46:25 +01:00
commit 6a57afee04

View file

@ -45,9 +45,9 @@ for detailed information about platforms with precompiled installers.
"7 Minutes to "Hello World!"" "7 Minutes to "Hello World!""
by Richard Dooling, 2006 by Richard Dooling, 2006
`Installing on Windows <http://diveintopython.org/installing_python/windows.html>`_ `Installing on Windows <http://diveintopython.net/installing_python/windows.html>`_
in "`Dive into Python: Python from novice to pro in "`Dive into Python: Python from novice to pro
<http://diveintopython.org/index.html>`_" <http://diveintopython.net/index.html>`_"
by Mark Pilgrim, 2004, by Mark Pilgrim, 2004,
ISBN 1-59059-356-1 ISBN 1-59059-356-1