summaryrefslogtreecommitdiffstats
path: root/Doc/reference/introduction.rst
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-02-20 04:02:38 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-02-20 04:02:38 (GMT)
commitba01dd93d232d3cb088cd61820e814e8c4c95010 (patch)
tree13a0432365f3f16df057ce62f6ff4e2f16e28448 /Doc/reference/introduction.rst
parent93d83da8e2acc1adc6d9d476f41b4a00f860fca0 (diff)
downloadcpython-ba01dd93d232d3cb088cd61820e814e8c4c95010.zip
cpython-ba01dd93d232d3cb088cd61820e814e8c4c95010.tar.gz
cpython-ba01dd93d232d3cb088cd61820e814e8c4c95010.tar.bz2
Merged revisions 69769,69776 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r69769 | georg.brandl | 2009-02-19 02:30:06 -0600 (Thu, 19 Feb 2009) | 1 line #5310, #3558: fix operator precedence table. ........ r69776 | georg.brandl | 2009-02-19 10:34:51 -0600 (Thu, 19 Feb 2009) | 2 lines #5317: update IronPython URL. ........
Diffstat (limited to 'Doc/reference/introduction.rst')
-rw-r--r--Doc/reference/introduction.rst3
1 files changed, 1 insertions, 2 deletions
diff --git a/Doc/reference/introduction.rst b/Doc/reference/introduction.rst
index 6959a77..b22d5e0 100644
--- a/Doc/reference/introduction.rst
+++ b/Doc/reference/introduction.rst
@@ -66,8 +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://workspaces.gotdotnet.com/ironpython>`_.
+ more information, see `the IronPython website <http://www.ironpython.com/>`_.
PyPy
An implementation of Python written in Python; even the bytecode interpreter is