summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2011-12-24 22:13:39 (GMT)
committerSandro Tosi <sandro.tosi@gmail.com>2011-12-24 22:13:39 (GMT)
commit91d9152919a9dadf57e01801a7a86e112546807b (patch)
tree9b85214d38493d78778acc4477124578daf27d93 /Doc
parent29cfdc7a61f2796788b244efbd4130ee7ebc45ea (diff)
parent3721fbc5dea79a05976018bcbc38f943ef4725e1 (diff)
downloadcpython-91d9152919a9dadf57e01801a7a86e112546807b.zip
cpython-91d9152919a9dadf57e01801a7a86e112546807b.tar.gz
cpython-91d9152919a9dadf57e01801a7a86e112546807b.tar.bz2
merge with 3.2
Diffstat (limited to 'Doc')
-rw-r--r--Doc/reference/introduction.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/reference/introduction.rst b/Doc/reference/introduction.rst
index 23ab88e..0ac5794 100644
--- a/Doc/reference/introduction.rst
+++ b/Doc/reference/introduction.rst
@@ -66,7 +66,7 @@ IronPython
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