Merged revisions 79799 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79799 | ezio.melotti | 2010-04-05 16:25:51 +0300 (Mon, 05 Apr 2010) | 9 lines

  Merged revisions 79797 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r79797 | ezio.melotti | 2010-04-05 15:51:45 +0300 (Mon, 05 Apr 2010) | 1 line

    Fix some broken URLs.
  ........
................

diff --git a/Doc/faq/extending.rst b/Doc/faq/extending.rst
index 622b787dacd48b22944f09b4c6ed07a3d8048cd8..d2f94b9e0bb2dd7fc95331321e5921b2f36a1ff9 100644 (file)
--- a/Doc/faq/extending.rst
+++ b/Doc/faq/extending.rst
@@ -51,7 +51,7 @@ with a tool such as `SWIG <http://www.swig.org>`_.  `SIP
 <http://www.riverbankcomputing.co.uk/software/sip/>`__, `CXX
 <http://cxx.sourceforge.net/>`_ `Boost
 <http://www.boost.org/libs/python/doc/index.html>`_, or `Weave
-<http://www.scipy.org/site_content/weave>`_ are also alternatives for wrapping
+<http://www.scipy.org/Weave>`_ are also alternatives for wrapping
 C++ libraries.
 
 
@@ -198,7 +198,7 @@ whole lot of difference between C and C++ -- so the strategy of building a new
 Python type around a C structure (pointer) type will also work for C++ objects.
 
 For C++ libraries, you can look at `SIP
-<http://www.riverbankcomputing.co.uk/sip/>`_, `CXX
+<http://www.riverbankcomputing.co.uk/software/sip/>`_, `CXX
 <http://cxx.sourceforge.net/>`_, `Boost
 <http://www.boost.org/libs/python/doc/index.html>`_, `Weave
 <http://www.scipy.org/site_content/weave>`_ or `SWIG <http://www.swig.org>`_

diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst
index 920dc2dd58ad1ec1c86b87e51990f1c6938eed90..76a4400ce8d221de72577f12596036b69fb631d0 100644 (file)
--- a/Doc/howto/functional.rst
+++ b/Doc/howto/functional.rst
@@ -336,7 +336,7 @@ substring.
 
 List comprehensions and generator expressions (short form: "listcomps" and
 "genexps") are a concise notation for such operations, borrowed from the
-functional programming language Haskell (http://www.haskell.org).  You can strip
+functional programming language Haskell (http://www.haskell.org/).  You can strip
 all the whitespace from a stream of strings with the following code::
 
     line_list = ['  line 1\n', 'line 2  \n', ...]

diff --git a/Doc/using/mac.rst b/Doc/using/mac.rst
index 5ab30b67180ef0cd1c615662fc728058d8762c82..13ac4b273e5b3e3b38f245a979d587443d3e1e9c 100644 (file)
--- a/Doc/using/mac.rst
+++ b/Doc/using/mac.rst
@@ -66,7 +66,7 @@ number of standard Unix command line editors, :program:`vim` and
 http://www.barebones.com/products/bbedit/index.shtml) are good choices, as is
 :program:`TextMate` (see http://macromates.com/). Other editors include
 :program:`Gvim` (http://macvim.org) and :program:`Aquamacs`
-(http://aquamacs.org).
+(http://aquamacs.org/).
 
 To run your script from the Terminal window you must make sure that
 :file:`/usr/local/bin` is in your shell search path.

diff --git a/Doc/whatsnew/2.1.rst b/Doc/whatsnew/2.1.rst
index 6b2ce3faa20be2248071a94be5146781c2889948..7f405213db9d5a7acf4c4b496bb897a74f424962 100644 (file)
--- a/Doc/whatsnew/2.1.rst
+++ b/Doc/whatsnew/2.1.rst
@@ -731,7 +731,7 @@ of the more notable changes are:
          ...
 
   For a fuller discussion of the line I/O changes, see the python-dev summary for
-  January 1-15, 2001 at http://www.python.org/dev/summary/2001-01-1.html.
+  January 1-15, 2001 at http://www.python.org/dev/summary/2001-01-1/.
 
 * A new method, :meth:`popitem`, was added to dictionaries to enable
   destructively iterating through the contents of a dictionary; this can be faster

diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index 8b71153d8872eb6b473f0156c9413f1143076a01..af604bb15271e1c3612a902c3c9b0965db1dee9a 100644 (file)
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -2230,7 +2230,7 @@ changes, or look through the Subversion logs for all the details.
   This produces better results when operating on Unix's dot-files.
   For example, ``os.path.splitext('.ipython')``
   now returns ``('.ipython', '')`` instead of ``('', '.ipython')``.
-  (:issue:`115886`)
+  (:issue:`1115886`)
 
   A new function, ``os.path.relpath(path, start='.')``, returns a relative path
   from the ``start`` path, if it's supplied, or from the current