diff options
| author | Georg Brandl <georg@python.org> | 2014-10-29 09:27:06 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-10-29 09:27:06 (GMT) |
| commit | 794e9bf1fe5bd0000f90c1502b16c96eb68a59af (patch) | |
| tree | 0fe2b5742d9d244ffac97dc7b4928ee29eefe370 /Doc/reference | |
| parent | 9e67d801bdef7c43e6704200770fb9cf2040dc11 (diff) | |
| parent | 525d355984e1afa342aa72fc7867a56eea937a61 (diff) | |
| download | cpython-794e9bf1fe5bd0000f90c1502b16c96eb68a59af.zip cpython-794e9bf1fe5bd0000f90c1502b16c96eb68a59af.tar.gz cpython-794e9bf1fe5bd0000f90c1502b16c96eb68a59af.tar.bz2 | |
merge with 3.4
Diffstat (limited to 'Doc/reference')
| -rw-r--r-- | Doc/reference/import.rst | 2 | ||||
| -rw-r--r-- | Doc/reference/introduction.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst index 146f29e..e9b7e53 100644 --- a/Doc/reference/import.rst +++ b/Doc/reference/import.rst @@ -901,7 +901,7 @@ References The import machinery has evolved considerably since Python's early days. The original `specification for packages -<https://www.python.org/doc/essays/packages.html>`_ is still available to read, +<http://legacy.python.org/doc/essays/packages.html>`_ is still available to read, although some details have changed since the writing of that document. The original specification for :data:`sys.meta_path` was :pep:`302`, with diff --git a/Doc/reference/introduction.rst b/Doc/reference/introduction.rst index 0ac5794..5633ae3 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.net/>`_. + more information, see `the IronPython website <http://ironpython.net/>`_. PyPy An implementation of Python written completely in Python. It supports several |