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

[sandro.tosi]

http://hg.python.org/cpython/rev/c65790aff86d
changeset:   74163:c65790aff86d
parent:      74160:1596eb147736
parent:      74162:2f1f2b0c9d63
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Sat Dec 24 23:13:39 2011 +0100
summary:
  merge with 3.2

files:
  Doc/reference/introduction.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/reference/introduction.rst b/Doc/reference/introduction.rst
--- a/Doc/reference/introduction.rst
+++ b/Doc/reference/introduction.rst
@@ -66,7 +66,7 @@
    An alternate Python for .NET.  Unlike Python.NET, this is a complete Python
    implementation that generates IL, and compiles Python code directly to .NET
    assemblies.  It was created by Jim Hugunin, the original creator of Jython.  For
-   more information, see `the IronPython website <http://www.ironpython.com/>`_.
+   more information, see `the IronPython website <http://www.ironpython.net/>`_.
 
 PyPy
    An implementation of Python written completely in Python. It supports several

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