summaryrefslogtreecommitdiffstats
path: root/Doc/using
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2011-10-31 16:46:25 (GMT)
committerSandro Tosi <sandro.tosi@gmail.com>2011-10-31 16:46:25 (GMT)
commit6a57afee04ad569a274880b526d39954d06ef53e (patch)
tree70b5748d3a17ddd9c6d8a9f41c9d5e0a7c628ff7 /Doc/using
parentd856bc0582cc56d362a0235085dc0f4e9aeeee86 (diff)
parent53bcd660122b6604373e5304bd014c41c8ca3e08 (diff)
downloadcpython-6a57afee04ad569a274880b526d39954d06ef53e.zip
cpython-6a57afee04ad569a274880b526d39954d06ef53e.tar.gz
cpython-6a57afee04ad569a274880b526d39954d06ef53e.tar.bz2
merge with 3.2
Diffstat (limited to 'Doc/using')
-rw-r--r--Doc/using/windows.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst
index 948753a..742a290 100644
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -45,9 +45,9 @@ for detailed information about platforms with precompiled installers.
"7 Minutes to "Hello World!""
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
- <http://diveintopython.org/index.html>`_"
+ <http://diveintopython.net/index.html>`_"
by Mark Pilgrim, 2004,
ISBN 1-59059-356-1