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.
........

2 files changed, 2 insertions, 2 deletions

diff --git a/Doc/whatsnew/2.1.rst b/Doc/whatsnew/2.1.rst
index 6b2ce3f..7f40521 100644
--- 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 c94327b..cb5837a 100644
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -2195,7 +2195,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