[Python-checkins] cpython (merge 3.2 -> default): merge with 3.2

[sandro.tosi]

http://hg.python.org/cpython/rev/c14e00680a99
changeset:   73255:c14e00680a99
parent:      73252:6b5a58836dae
parent:      73254:9263ebeebdbd
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Mon Oct 31 17:46:25 2011 +0100
summary:
  merge with 3.2

files:
  Doc/using/windows.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -45,9 +45,9 @@
       "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
 

-- 
Repository URL: http://hg.python.org/cpython