Convert external links to internal links. Fixes #2010.

diff --git a/Doc/howto/advocacy.rst b/Doc/howto/advocacy.rst
index 7d7706e60083bb63a7a63e675964831b88231f58..669ce72a150af33719b87734738b2b88ec9d3f60 100644 (file)
--- a/Doc/howto/advocacy.rst
+++ b/Doc/howto/advocacy.rst
@@ -265,7 +265,7 @@ the  organizations that use Python.
 **What are the restrictions on Python's use?**
 
 They're practically nonexistent.  Consult the :file:`Misc/COPYRIGHT` file in the
-source distribution, or http://www.python.org/doc/Copyright.html for the full
+source distribution, or the section :ref:`history-and-license` for the full
 language, but it boils down to three conditions.
 
 * You have to leave the copyright notice on the software; if you don't include

diff --git a/Doc/howto/curses.rst b/Doc/howto/curses.rst
index 2953d36742bff87a9f2d39958f9b0be79b568cec..9cbc827d8efa78f32b0f0692b7325232be876c08 100644 (file)
--- a/Doc/howto/curses.rst
+++ b/Doc/howto/curses.rst
@@ -1,3 +1,5 @@
+.. _curses-howto:
+
 **********************************
   Curses Programming with Python
 **********************************

diff --git a/Doc/howto/regex.rst b/Doc/howto/regex.rst
index cfcae31174f9fcc903fcb3b5914a8bf8ca380e2a..cf787e8e91654efe521f11aee10c5b655ad37acc 100644 (file)
--- a/Doc/howto/regex.rst
+++ b/Doc/howto/regex.rst
@@ -1,3 +1,5 @@
+.. _regex-howto:
+
 ****************************
   Regular Expression HOWTO  
 ****************************

diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst
index 16bd5a8a2fb2e922721e588ca01279fc7f43954c..fb84df70b03abfa3f0011dc74a80c14625e1d6cb 100644 (file)
--- a/Doc/howto/unicode.rst
+++ b/Doc/howto/unicode.rst
@@ -277,7 +277,7 @@ Unicode result).  The following examples show the differences::
 
 Encodings are specified as strings containing the encoding's name.  Python 2.4
 comes with roughly 100 different encodings; see the Python Library Reference at
-<http://docs.python.org/lib/standard-encodings.html> for a list.  Some encodings
+:ref:`standard-encodings` for a list.  Some encodings
 have multiple names; for example, 'latin-1', 'iso_8859_1' and '8859' are all
 synonyms for the same encoding.
 

diff --git a/Doc/library/curses.rst b/Doc/library/curses.rst
index 836a77507d3837d8df7f5ee6bf09aa39a2b6d257..7e5090a0e523e7521b6fa981133408a7c14f60fa 100644 (file)
--- a/Doc/library/curses.rst
+++ b/Doc/library/curses.rst
@@ -48,9 +48,9 @@ Linux and the BSD variants of Unix.
       Convenience function to ensure proper terminal setup and resetting on
       application entry and exit.
 
-   `Curses Programming with Python <http://www.python.org/doc/howto/curses/curses.html>`_
+   :ref:`curses-howto`
       Tutorial material on using curses with Python, by Andrew Kuchling and Eric
-      Raymond, is available on the Python Web site.
+      Raymond.
 
    The :file:`Demo/curses/` directory in the Python source distribution contains
    some example programs using the curses bindings provided by this module.

diff --git a/Doc/library/re.rst b/Doc/library/re.rst
index dd228356ec514bdf2a472781f4622b36e5822ef2..5fd3dd5d8c318a6977159a2911e1ce2fdb50aee3 100644 (file)
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -65,8 +65,7 @@ and implementation of regular expressions, consult the Friedl book referenced
 above, or almost any textbook about compiler construction.
 
 A brief explanation of the format of regular expressions follows.  For further
-information and a gentler presentation, consult the Regular Expression HOWTO,
-accessible from http://www.python.org/doc/howto/.
+information and a gentler presentation, consult the :ref:`regex-howto`.
 
 Regular expressions can contain both special and ordinary characters. Most
 ordinary characters, like ``'A'``, ``'a'``, or ``'0'``, are the simplest regular