Sat Mar 15 01:20:21 CET 2008

Author: georg.brandl
Date: Sat Mar 15 01:20:19 2008
New Revision: 61395

Modified:
   python/trunk/Doc/bugs.rst
   python/trunk/Doc/distutils/apiref.rst
   python/trunk/Doc/distutils/examples.rst
   python/trunk/Doc/distutils/setupscript.rst
   python/trunk/Doc/documenting/style.rst
   python/trunk/Doc/howto/advocacy.rst
   python/trunk/Doc/howto/curses.rst
   python/trunk/Doc/howto/regex.rst
   python/trunk/Doc/howto/unicode.rst
   python/trunk/Doc/howto/urllib2.rst
   python/trunk/Doc/install/index.rst
   python/trunk/Doc/library/aepack.rst
   python/trunk/Doc/library/cookielib.rst
   python/trunk/Doc/library/imaplib.rst
   python/trunk/Doc/library/mailbox.rst
   python/trunk/Doc/library/mimetools.rst
   python/trunk/Doc/library/mimetypes.rst
   python/trunk/Doc/library/othergui.rst
   python/trunk/Doc/library/robotparser.rst
   python/trunk/Doc/library/sha.rst
   python/trunk/Doc/library/tix.rst
   python/trunk/Doc/library/tkinter.rst
   python/trunk/Doc/library/zipfile.rst
   python/trunk/Doc/library/zipimport.rst
   python/trunk/Doc/license.rst
   python/trunk/Doc/reference/introduction.rst
   python/trunk/Doc/tutorial/whatnow.rst
Log:
Fix lots of broken links in the docs, found by Sphinx' external link checker.


Modified: python/trunk/Doc/bugs.rst
==============================================================================

--- python/trunk/Doc/bugs.rst	(original)
+++ python/trunk/Doc/bugs.rst	Sat Mar 15 01:20:19 2008
@@ -53,7 +53,7 @@
       Article which goes into some detail about how to create a useful bug report.
       This describes what kind of information is useful and why it is useful.
 
-   `Bug Writing Guidelines <http://www.mozilla.org/quality/bug-writing-guidelines.html>`_
+   `Bug Writing Guidelines <http://developer.mozilla.org/en/docs/Bug_writing_guidelines>`_
       Information about writing a good bug report.  Some of this is specific to the
       Mozilla project, but describes general good practices.
 

Modified: python/trunk/Doc/distutils/apiref.rst
==============================================================================
--- python/trunk/Doc/distutils/apiref.rst	(original)
+++ python/trunk/Doc/distutils/apiref.rst	Sat Mar 15 01:20:19 2008
@@ -73,7 +73,7 @@
    +--------------------+--------------------------------+-------------------------------------------------------------+
    | *classifiers*      | A list of categories for the   | The list of available                                       |
    |                    | package                        | categorizations is at                                       |
-   |                    |                                | http://cheeseshop.python.org/pypi?:action=list_classifiers. |
+   |                    |                                | http://pypi.python.org/pypi?:action=list_classifiers.       |
    +--------------------+--------------------------------+-------------------------------------------------------------+
    | *distclass*        | the :class:`Distribution`      | A subclass of                                               |
    |                    | class to use                   | :class:`distutils.core.Distribution`                        |

Modified: python/trunk/Doc/distutils/examples.rst
==============================================================================
--- python/trunk/Doc/distutils/examples.rst	(original)
+++ python/trunk/Doc/distutils/examples.rst	Sat Mar 15 01:20:19 2008
@@ -11,7 +11,7 @@
 
 .. seealso::
 
-   `Distutils Cookbook <http://www.python.org/cgi-bin/moinmoin/DistutilsCookbook>`_
+   `Distutils Cookbook <http://wiki.python.org/moin/DistutilsCookbook>`_
       Collection of recipes showing how to achieve more control over distutils.
 
 

Modified: python/trunk/Doc/distutils/setupscript.rst
==============================================================================
--- python/trunk/Doc/distutils/setupscript.rst	(original)
+++ python/trunk/Doc/distutils/setupscript.rst	Sat Mar 15 01:20:19 2008
@@ -580,7 +580,7 @@
 (4)
    These fields should not be used if your package is to be compatible with Python
    versions prior to 2.2.3 or 2.3.  The list is available from the `PyPI website
-   <http://www.python.org/pypi>`_.
+   <http://pypi.python.org/pypi>`_.
 
 'short string'
    A single line of text, not more than 200 characters.

Modified: python/trunk/Doc/documenting/style.rst
==============================================================================
--- python/trunk/Doc/documenting/style.rst	(original)
+++ python/trunk/Doc/documenting/style.rst	Sat Mar 15 01:20:19 2008
@@ -66,5 +66,5 @@
     1970s.
 
 
-.. _Apple Publications Style Guide: http://developer.apple.com/documentation/UserExperience/Conceptual/APStyleGuide/AppleStyleGuide2003.pdf
+.. _Apple Publications Style Guide: http://developer.apple.com/documentation/UserExperience/Conceptual/APStyleGuide/AppleStyleGuide2006.pdf
 

Modified: python/trunk/Doc/howto/advocacy.rst
==============================================================================
--- python/trunk/Doc/howto/advocacy.rst	(original)
+++ python/trunk/Doc/howto/advocacy.rst	Sat Mar 15 01:20:19 2008
@@ -346,7 +346,7 @@
    wasn't written commercially.  This site presents arguments that show how open
    source software can have considerable advantages over closed-source software.
 
-http://sunsite.unc.edu/LDP/HOWTO/mini/Advocacy.html
+http://www.faqs.org/docs/Linux-mini/Advocacy.html
    The Linux Advocacy mini-HOWTO was the inspiration for this document, and is also
    well worth reading for general suggestions on winning acceptance for a new
    technology, such as Linux or Python.  In general, you won't make much progress

Modified: python/trunk/Doc/howto/curses.rst
==============================================================================
--- python/trunk/Doc/howto/curses.rst	(original)
+++ python/trunk/Doc/howto/curses.rst	Sat Mar 15 01:20:19 2008
@@ -52,7 +52,7 @@
 No one has made a Windows port of the curses module.  On a Windows platform, try
 the Console module written by Fredrik Lundh.  The Console module provides
 cursor-addressable text output, plus full support for mouse and keyboard input,
-and is available from http://effbot.org/efflib/console.
+and is available from http://effbot.org/zone/console-index.htm.
 
 
 The Python curses module
@@ -432,5 +432,5 @@
 If you write an interesting little program, feel free to contribute it as
 another demo.  We can always use more of them!
 
-The ncurses FAQ: http://dickey.his.com/ncurses/ncurses.faq.html
+The ncurses FAQ: http://invisible-island.net/ncurses/ncurses.faq.html
 

Modified: python/trunk/Doc/howto/regex.rst
==============================================================================
--- python/trunk/Doc/howto/regex.rst	(original)
+++ python/trunk/Doc/howto/regex.rst	Sat Mar 15 01:20:19 2008
@@ -367,8 +367,8 @@
 Python distribution.  It allows you to enter REs and strings, and displays
 whether the RE matches or fails. :file:`redemo.py` can be quite useful when
 trying to debug a complicated RE.  Phil Schwartz's `Kodos
-<http://www.phil-schwartz.com/kodos.spy>`_ is also an interactive tool for
-developing and testing RE patterns.
+<http://kodos.sourceforge.net/>`_ is also an interactive tool for developing and
+testing RE patterns.
 
 This HOWTO uses the standard Python interpreter for its examples. First, run the
 Python interpreter, import the :mod:`re` module, and compile a RE::

Modified: python/trunk/Doc/howto/unicode.rst
==============================================================================
--- python/trunk/Doc/howto/unicode.rst	(original)
+++ python/trunk/Doc/howto/unicode.rst	Sat Mar 15 01:20:19 2008
@@ -210,10 +210,6 @@
 to reading the Unicode character tables, available at
 <http://www.cs.tut.fi/~jkorpela/unicode/guide.html>.
 
-Roman Czyborra wrote another explanation of Unicode's basic principles; it's at
-<http://czyborra.com/unicode/characters.html>.  Czyborra has written a number of
-other Unicode-related documentation, available from <http://www.cyzborra.com>.
-
 Two other good introductory articles were written by Joel Spolsky
 <http://www.joelonsoftware.com/articles/Unicode.html> and Jason Orendorff
 <http://www.jorendorff.com/articles/unicode/>.  If this introduction didn't make
@@ -490,7 +486,7 @@
 
 Marc-André Lemburg gave a presentation at EuroPython 2002 titled "Python and
 Unicode".  A PDF version of his slides is available at
-<http://www.egenix.com/files/python/Unicode-EPC2002-Talk.pdf>, and is an
+<http://downloads.egenix.com/python/Unicode-EPC2002-Talk.pdf>, and is an
 excellent overview of the design of Python's Unicode features.
 
 
@@ -677,7 +673,7 @@
 
 The PDF slides for Marc-André Lemburg's presentation "Writing Unicode-aware
 Applications in Python" are available at
-<http://www.egenix.com/files/python/LSM2005-Developing-Unicode-aware-applications-in-Python.pdf>
+<http://downloads.egenix.com/python/LSM2005-Developing-Unicode-aware-applications-in-Python.pdf>
 and discuss questions of character encodings as well as how to internationalize
 and localize an application.
 

Modified: python/trunk/Doc/howto/urllib2.rst
==============================================================================
--- python/trunk/Doc/howto/urllib2.rst	(original)
+++ python/trunk/Doc/howto/urllib2.rst	Sat Mar 15 01:20:19 2008
@@ -8,7 +8,7 @@
 
     There is an French translation of an earlier revision of this
     HOWTO, available at `urllib2 - Le Manuel manquant
-    <http://www.voidspace/python/articles/urllib2_francais.shtml>`_.
+    <http://www.voidspace.org.uk/python/articles/urllib2_francais.shtml>`_.
 
  
 

Modified: python/trunk/Doc/install/index.rst
==============================================================================
--- python/trunk/Doc/install/index.rst	(original)
+++ python/trunk/Doc/install/index.rst	Sat Mar 15 01:20:19 2008
@@ -872,10 +872,10 @@
 
 
 
-Borland C++
-^^^^^^^^^^^
+Borland/CodeGear C++
+^^^^^^^^^^^^^^^^^^^^
 
-This subsection describes the necessary steps to use Distutils with the  Borland
+This subsection describes the necessary steps to use Distutils with the Borland
 C++ compiler version 5.5.  First you have to know that Borland's object file
 format (OMF) is different from the format used by the Python version you can
 download from the Python or ActiveState Web site.  (Python is built with
@@ -915,7 +915,7 @@
 
 .. seealso::
 
-   `C++Builder Compiler <http://www.borland.com/bcppbuilder/freecompiler/>`_
+   `C++Builder Compiler <http://www.codegear.com/downloads/free/cppbuilder>`_
       Information about the free C++ compiler from Borland, including links to the
       download pages.
 
@@ -938,9 +938,7 @@
 These compilers require some special libraries. This task is more complex than
 for Borland's C++, because there is no program to convert the library.  First
 you have to create a list of symbols which the Python DLL exports. (You can find
-a good program for this task at
-http://starship.python.net/crew/kernr/mingw32/Notes.html, see at  PExports 0.42h
-there.)
+a good program for this task at http://www.emmestech.com/software/cygwin/pexports-0.43/download_pexports.html)
 
 .. I don't understand what the next line means. --amk
 .. (inclusive the references on data structures.)
@@ -984,9 +982,6 @@
    `Building Python modules on MS Windows platform with MinGW <http://www.zope.org/Members/als/tips/win32_mingw_modules>`_
       Information about building the required libraries for the MinGW environment.
 
-   http://pyopengl.sourceforge.net/ftp/win32-stuff/
-      Converted import libraries in Cygwin/MinGW and Borland format, and a script to
-      create the registry entries needed for Distutils to locate the built Python.
 
 .. rubric:: Footnotes
 

Modified: python/trunk/Doc/library/aepack.rst
==============================================================================
--- python/trunk/Doc/library/aepack.rst	(original)
+++ python/trunk/Doc/library/aepack.rst	Sat Mar 15 01:20:19 2008
@@ -84,7 +84,3 @@
 
    Module :mod:`aetypes`
       Python definitions of codes for Apple Event descriptor types.
-
-   `Inside Macintosh: Interapplication Communication <http://developer.apple.com/techpubs/mac/IAC/IAC-2.html>`_
-      Information about inter-process communications on the Macintosh.
-

Modified: python/trunk/Doc/library/cookielib.rst
==============================================================================
--- python/trunk/Doc/library/cookielib.rst	(original)
+++ python/trunk/Doc/library/cookielib.rst	Sat Mar 15 01:20:19 2008
@@ -121,7 +121,7 @@
       Extensions to this module, including a class for reading Microsoft Internet
       Explorer cookies on Windows.
 
-   http://www.netscape.com/newsref/std/cookie_spec.html
+   http://wp.netscape.com/newsref/std/cookie_spec.html
       The specification of the original Netscape cookie protocol.  Though this is
       still the dominant protocol, the 'Netscape cookie protocol' implemented by all
       the major browsers (and :mod:`cookielib`) only bears a passing resemblance to

Modified: python/trunk/Doc/library/imaplib.rst
==============================================================================
--- python/trunk/Doc/library/imaplib.rst	(original)
+++ python/trunk/Doc/library/imaplib.rst	Sat Mar 15 01:20:19 2008
@@ -117,7 +117,7 @@
 
    Documents describing the protocol, and sources and binaries  for servers
    implementing it, can all be found at the University of Washington's *IMAP
-   Information Center* (http://www.cac.washington.edu/imap/).
+   Information Center* (http://www.washington.edu/imap/).
 
 
 .. _imap4-objects:

Modified: python/trunk/Doc/library/mailbox.rst
==============================================================================
--- python/trunk/Doc/library/mailbox.rst	(original)
+++ python/trunk/Doc/library/mailbox.rst	Sat Mar 15 01:20:19 2008
@@ -404,7 +404,7 @@
       Notes on Maildir by its inventor. Includes an updated name-creation scheme and
       details on "info" semantics.
 
-   `maildir man page from Courier <http://www.courier-mta.org/?maildir.html>`_
+   `maildir man page from Courier <http://www.courier-mta.org/maildir.html>`_
       Another specification of the format. Describes a common extension for supporting
       folders.
 
@@ -461,7 +461,7 @@
    `mbox man page from tin <http://www.tin.org/bin/man.cgi?section=5&topic=mbox>`_
       Another specification of the format, with details on locking.
 
-   `Configuring Netscape Mail on Unix: Why The Content-Length Format is Bad <http://home.netscape.com/eng/mozilla/2.0/relnotes/demo/content-length.html>`_
+   `Configuring Netscape Mail on Unix: Why The Content-Length Format is Bad <http://www.jwz.org/doc/content-length.html>`_
       An argument for using the original mbox format rather than a variation.
 
    `"mbox" is a family of several mutually incompatible mailbox formats <http://homepages.tesco.net./~J.deBoynePollard/FGA/mail-mbox-formats.html>`_
@@ -665,7 +665,7 @@
    `Format of Version 5 Babyl Files <http://quimby.gnus.org/notes/BABYL>`_
       A specification of the Babyl format.
 
-   `Reading Mail with Rmail <http://www.gnu.org/software/emacs/manual/html_node/Rmail.html>`_
+   `Reading Mail with Rmail <http://www.gnu.org/software/emacs/manual/html_node/emacs/Rmail.html>`_
       The Rmail manual, with some information on Babyl semantics.
 
 
@@ -1541,10 +1541,6 @@
    :class:`UnixMailbox` except that individual messages are separated by only
    ``From`` lines.
 
-   For more information, see `Configuring Netscape Mail on Unix: Why the
-   Content-Length Format is Bad
-   <http://home.netscape.com/eng/mozilla/2.0/relnotes/demo/content-length.html>`_.
-
 
 .. class:: PortableUnixMailbox(fp[, factory])
 

Modified: python/trunk/Doc/library/mimetools.rst
==============================================================================
--- python/trunk/Doc/library/mimetools.rst	(original)
+++ python/trunk/Doc/library/mimetools.rst	Sat Mar 15 01:20:19 2008
@@ -73,7 +73,7 @@
    Module :mod:`multifile`
       Support for reading files which contain distinct parts, such as MIME data.
 
-   http://www.cs.uu.nl/wais/html/na-dir/mail/mime-faq/.html
+   http://faqs.cs.uu.nl/na-dir/mail/mime-faq/.html
       The MIME Frequently Asked Questions document.  For an overview of MIME, see the
       answer to question 1.1 in Part 1 of this document.
 

Modified: python/trunk/Doc/library/mimetypes.rst
==============================================================================
--- python/trunk/Doc/library/mimetypes.rst	(original)
+++ python/trunk/Doc/library/mimetypes.rst	Sat Mar 15 01:20:19 2008
@@ -41,7 +41,7 @@
 
    Optional *strict* is a flag specifying whether the list of known MIME types
    is limited to only the official types `registered with IANA
-   <http://www.isi.edu/in-notes/iana/assignments/media-types>`_ are recognized.
+   <http://www.iana.org/assignments/media-types/>`_ are recognized.
    When *strict* is true (the default), only the IANA types are supported; when
    *strict* is false, some additional non-standard but commonly used MIME types
    are also recognized.

Modified: python/trunk/Doc/library/othergui.rst
==============================================================================
--- python/trunk/Doc/library/othergui.rst	(original)
+++ python/trunk/Doc/library/othergui.rst	Sat Mar 15 01:20:19 2008
@@ -36,14 +36,12 @@
 
    `PyGTK <http://www.pygtk.org/>`_
       is a set of bindings for the `GTK <http://www.gtk.org/>`_ widget set. It
-      provides an object oriented interface that is slightly higher level than the C
-      one. It comes with many more widgets than Tkinter provides, and
-      has good Python-specific reference documentation. There are also `bindings
-      <http://www.daa.com.au/~james/gnome/>`_ to  `GNOME <http://www.gnome.org>`_.
-      One well known PyGTK application is
-      `PythonCAD <http://www.pythoncad.org/>`_. An
-      online `tutorial <http://www.pygtk.org/pygtk2tutorial/index.html>`_ is
-      available.
+      provides an object oriented interface that is slightly higher level than
+      the C one. It comes with many more widgets than Tkinter provides, and has
+      good Python-specific reference documentation. There are also bindings to
+      `GNOME <http://www.gnome.org>`_.  One well known PyGTK application is
+      `PythonCAD <http://www.pythoncad.org/>`_. An online `tutorial
+      <http://www.pygtk.org/pygtk2tutorial/index.html>`_ is available.
 
    `PyQt <http://www.riverbankcomputing.co.uk/pyqt/index.php>`_
       PyQt is a :program:`sip`\ -wrapped binding to the Qt toolkit.  Qt is an

Modified: python/trunk/Doc/library/robotparser.rst
==============================================================================
--- python/trunk/Doc/library/robotparser.rst	(original)
+++ python/trunk/Doc/library/robotparser.rst	Sat Mar 15 01:20:19 2008
@@ -15,9 +15,8 @@
 
 This module provides a single class, :class:`RobotFileParser`, which answers
 questions about whether or not a particular user agent can fetch a URL on the
-Web site that published the :file:`robots.txt` file.  For more details on  the
-structure of :file:`robots.txt` files, see
-http://www.robotstxt.org/wc/norobots.html.
+Web site that published the :file:`robots.txt` file.  For more details on the
+structure of :file:`robots.txt` files, see http://www.robotstxt.org/orig.html.
 
 
 .. class:: RobotFileParser()

Modified: python/trunk/Doc/library/sha.rst
==============================================================================
--- python/trunk/Doc/library/sha.rst	(original)
+++ python/trunk/Doc/library/sha.rst	Sat Mar 15 01:20:19 2008
@@ -82,6 +82,6 @@
       <http://csrc.nist.gov/publications/fips/fips180-2/fips180-2withchangenotice.pdf>`_,
       published in August 2002.
 
-   `Cryptographic Toolkit (Secure Hashing) <http://csrc.nist.gov/encryption/tkhash.html>`_
+   `Cryptographic Toolkit (Secure Hashing) <http://csrc.nist.gov/CryptoToolkit/tkhash.html>`_
       Links from NIST to various information on secure hashing.
 

Modified: python/trunk/Doc/library/tix.rst
==============================================================================
--- python/trunk/Doc/library/tix.rst	(original)
+++ python/trunk/Doc/library/tix.rst	Sat Mar 15 01:20:19 2008
@@ -35,7 +35,7 @@
    `Tix Programming Guide <http://tix.sourceforge.net/dist/current/docs/tix-book/tix.book.html>`_
       On-line version of the programmer's reference material.
 
-   `Tix Development Applications <http://tix.sourceforge.net/Tide/>`_
+   `Tix Development Applications <http://tix.sourceforge.net/Tixapps/src/Tide.html>`_
       Tix applications for development of Tix and Tkinter programs. Tide applications
       work under Tk or Tkinter, and include :program:`TixInspect`, an inspector to
       remotely modify and debug Tix/Tk/Tkinter applications.

Modified: python/trunk/Doc/library/tkinter.rst
==============================================================================
--- python/trunk/Doc/library/tkinter.rst	(original)
+++ python/trunk/Doc/library/tkinter.rst	Sat Mar 15 01:20:19 2008
@@ -21,7 +21,7 @@
    `An Introduction to Tkinter <http://www.pythonware.com/library/an-introduction-to-tkinter.htm>`_
       Fredrik Lundh's on-line reference material.
 
-   `Tkinter reference: a GUI for Python <http://www.nmt.edu/tcc/help/pubs/lang.html>`_
+   `Tkinter reference: a GUI for Python <http://infohost.nmt.edu/tcc/help/pubs/lang.html>`_
       On-line reference material.
 
    `Tkinter for JPython <http://jtkinter.sourceforge.net>`_

Modified: python/trunk/Doc/library/zipfile.rst
==============================================================================
--- python/trunk/Doc/library/zipfile.rst	(original)
+++ python/trunk/Doc/library/zipfile.rst	Sat Mar 15 01:20:19 2008
@@ -13,7 +13,7 @@
 provides tools to create, read, write, append, and list a ZIP file.  Any
 advanced use of this module will require an understanding of the format, as
 defined in `PKZIP Application Note
-<http://www.pkware.com/business_and_developers/developer/appnote/>`_.
+<http://www.pkware.com/documents/casestudies/APPNOTE.TXT>`_.
 
 This module does not currently handle multi-disk ZIP files, or ZIP files
 which have appended comments (although it correctly handles comments
@@ -83,7 +83,7 @@
 
 .. seealso::
 
-   `PKZIP Application Note <http://www.pkware.com/business_and_developers/developer/appnote/>`_
+   `PKZIP Application Note <http://www.pkware.com/documents/casestudies/APPNOTE.TXT>`_
       Documentation on the ZIP file format by Phil Katz, the creator of the format and
       algorithms used.
 
@@ -373,7 +373,7 @@
 .. attribute:: ZipInfo.extra
 
    Expansion field data.  The `PKZIP Application Note
-   <http://www.pkware.com/business_and_developers/developer/appnote/>`_ contains
+   <http://www.pkware.com/documents/casestudies/APPNOTE.TXT>`_ contains
    some comments on the internal structure of the data contained in this string.
 
 

Modified: python/trunk/Doc/library/zipimport.rst
==============================================================================
--- python/trunk/Doc/library/zipimport.rst	(original)
+++ python/trunk/Doc/library/zipimport.rst	Sat Mar 15 01:20:19 2008
@@ -35,7 +35,7 @@
 
 .. seealso::
 
-   `PKZIP Application Note <http://www.pkware.com/business_and_developers/developer/appnote/>`_
+   `PKZIP Application Note <http://www.pkware.com/documents/casestudies/APPNOTE.TXT>`_
       Documentation on the ZIP file format by Phil Katz, the creator of the format and
       algorithms used.
 

Modified: python/trunk/Doc/license.rst
==============================================================================
--- python/trunk/Doc/license.rst	(original)
+++ python/trunk/Doc/license.rst	Sat Mar 15 01:20:19 2008
@@ -343,7 +343,7 @@
 
 The :mod:`socket` module uses the functions, :func:`getaddrinfo`, and
 :func:`getnameinfo`, which are coded in separate source files from the WIDE
-Project, http://www.wide.ad.jp/about/index.html. ::
+Project, http://www.wide.ad.jp/. ::
 
    Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
    All rights reserved.

Modified: python/trunk/Doc/reference/introduction.rst
==============================================================================
--- python/trunk/Doc/reference/introduction.rst	(original)
+++ python/trunk/Doc/reference/introduction.rst	Sat Mar 15 01:20:19 2008
@@ -59,7 +59,7 @@
    This implementation actually uses the CPython implementation, but is a managed
    .NET application and makes .NET libraries available.  It was created by Brian
    Lloyd.  For more information, see the `Python for .NET home page
-   <http://www.zope.org/Members/Brian/PythonNet>`_.
+   <http://pythonnet.sourceforge.net>`_.
 
 IronPython
    An alternate Python for .NET.  Unlike Python.NET, this is a complete Python

Modified: python/trunk/Doc/tutorial/whatnow.rst
==============================================================================
--- python/trunk/Doc/tutorial/whatnow.rst	(original)
+++ python/trunk/Doc/tutorial/whatnow.rst	Sat Mar 15 01:20:19 2008
@@ -38,9 +38,9 @@
 
 * http://docs.python.org:  Fast access to Python's  documentation.
 
-* http://cheeseshop.python.org:  The Python Package Index, nicknamed the Cheese
-  Shop,  is an index of user-created Python modules that are available for
-  download.  Once you begin releasing code, you can register it  here so that
+* http://pypi.python.org: The Python Package Index, previously also nicknamed
+  the Cheese Shop, is an index of user-created Python modules that are available
+  for download.  Once you begin releasing code, you can register it here so that
   others can find it.
 
 * http://aspn.activestate.com/ASPN/Python/Cookbook/: The Python Cookbook is a
