summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-03-15 00:20:19 (GMT)
committerGeorg Brandl <georg@python.org>2008-03-15 00:20:19 (GMT)
commit026778174298e652bd91ebe5a11db1bd3a3e0902 (patch)
tree82f89fbf0d19fd793605d47cd5558d039a97d93d /Doc
parentbd77681f36238e5803857414ba46c722f7f28e42 (diff)
downloadcpython-026778174298e652bd91ebe5a11db1bd3a3e0902.zip
cpython-026778174298e652bd91ebe5a11db1bd3a3e0902.tar.gz
cpython-026778174298e652bd91ebe5a11db1bd3a3e0902.tar.bz2
Fix lots of broken links in the docs, found by Sphinx' external link checker.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/bugs.rst2
-rw-r--r--Doc/distutils/apiref.rst2
-rw-r--r--Doc/distutils/examples.rst2
-rw-r--r--Doc/distutils/setupscript.rst2
-rw-r--r--Doc/documenting/style.rst2
-rw-r--r--Doc/howto/advocacy.rst2
-rw-r--r--Doc/howto/curses.rst4
-rw-r--r--Doc/howto/regex.rst4
-rw-r--r--Doc/howto/unicode.rst8
-rw-r--r--Doc/howto/urllib2.rst2
-rw-r--r--Doc/install/index.rst15
-rw-r--r--Doc/library/aepack.rst4
-rw-r--r--Doc/library/cookielib.rst2
-rw-r--r--Doc/library/imaplib.rst2
-rw-r--r--Doc/library/mailbox.rst10
-rw-r--r--Doc/library/mimetools.rst2
-rw-r--r--Doc/library/mimetypes.rst2
-rw-r--r--Doc/library/othergui.rst14
-rw-r--r--Doc/library/robotparser.rst5
-rw-r--r--Doc/library/sha.rst2
-rw-r--r--Doc/library/tix.rst2
-rw-r--r--Doc/library/tkinter.rst2
-rw-r--r--Doc/library/zipfile.rst6
-rw-r--r--Doc/library/zipimport.rst2
-rw-r--r--Doc/license.rst2
-rw-r--r--Doc/reference/introduction.rst2
-rw-r--r--Doc/tutorial/whatnow.rst6
27 files changed, 45 insertions, 65 deletions
diff --git a/Doc/bugs.rst b/Doc/bugs.rst
index 8b8df81..9abe50c 100644
--- a/Doc/bugs.rst
+++ b/Doc/bugs.rst
@@ -53,7 +53,7 @@ taken on the bug.
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.
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
index e334881..f5b49b8 100644
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@ -73,7 +73,7 @@ setup script). Indirectly provides the :class:`distutils.dist.Distribution` and
+--------------------+--------------------------------+-------------------------------------------------------------+
| *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` |
diff --git a/Doc/distutils/examples.rst b/Doc/distutils/examples.rst
index 4e4adc5..d937b83 100644
--- a/Doc/distutils/examples.rst
+++ b/Doc/distutils/examples.rst
@@ -11,7 +11,7 @@ Distutils Cookbook.
.. 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.
diff --git a/Doc/distutils/setupscript.rst b/Doc/distutils/setupscript.rst
index 0ff3476..d2be083 100644
--- a/Doc/distutils/setupscript.rst
+++ b/Doc/distutils/setupscript.rst
@@ -580,7 +580,7 @@ Notes:
(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.
diff --git a/Doc/documenting/style.rst b/Doc/documenting/style.rst
index 5d0ccb7..5821bd8 100644
--- a/Doc/documenting/style.rst
+++ b/Doc/documenting/style.rst
@@ -66,5 +66,5 @@ Unix
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
diff --git a/Doc/howto/advocacy.rst b/Doc/howto/advocacy.rst
index 8b5b11c..d71e1ec 100644
--- a/Doc/howto/advocacy.rst
+++ b/Doc/howto/advocacy.rst
@@ -346,7 +346,7 @@ http://www.opensource.org
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
diff --git a/Doc/howto/curses.rst b/Doc/howto/curses.rst
index 9cbc827..1e1e2f7 100644
--- a/Doc/howto/curses.rst
+++ b/Doc/howto/curses.rst
@@ -52,7 +52,7 @@ everything, though.
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 @@ ncurses; feel free to add that.
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
diff --git a/Doc/howto/regex.rst b/Doc/howto/regex.rst
index 2cd83d4..2f085e5 100644
--- a/Doc/howto/regex.rst
+++ b/Doc/howto/regex.rst
@@ -367,8 +367,8 @@ module. If you have Tkinter available, you may also want to look at
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::
diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst
index fb84df7..64881444 100644
--- a/Doc/howto/unicode.rst
+++ b/Doc/howto/unicode.rst
@@ -210,10 +210,6 @@ To help understand the standard, Jukka Korpela has written an introductory guide
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 @@ The documentation for the :mod:`codecs` module.
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 @@ References
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.
diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst
index dc20b02..dfd7258 100644
--- a/Doc/howto/urllib2.rst
+++ b/Doc/howto/urllib2.rst
@@ -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>`_.
diff --git a/Doc/install/index.rst b/Doc/install/index.rst
index 584cb47..3f54b79 100644
--- a/Doc/install/index.rst
+++ b/Doc/install/index.rst
@@ -872,10 +872,10 @@ Using non-Microsoft compilers on Windows
-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 @@ section :ref:`inst-config-files`.)
.. 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 @@ following steps.
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 @@ Distutils (see section :ref:`inst-config-files`.)
`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
diff --git a/Doc/library/aepack.rst b/Doc/library/aepack.rst
index daaa9b2..d8aef6b 100644
--- a/Doc/library/aepack.rst
+++ b/Doc/library/aepack.rst
@@ -84,7 +84,3 @@ The :mod:`aepack` module defines the following functions:
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.
-
diff --git a/Doc/library/cookielib.rst b/Doc/library/cookielib.rst
index a84649c..4a91953 100644
--- a/Doc/library/cookielib.rst
+++ b/Doc/library/cookielib.rst
@@ -121,7 +121,7 @@ The following classes are provided:
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
diff --git a/Doc/library/imaplib.rst b/Doc/library/imaplib.rst
index 4279fa5..e18d7d5 100644
--- a/Doc/library/imaplib.rst
+++ b/Doc/library/imaplib.rst
@@ -117,7 +117,7 @@ example of usage.
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:
diff --git a/Doc/library/mailbox.rst b/Doc/library/mailbox.rst
index c918953..7cc2923 100644
--- a/Doc/library/mailbox.rst
+++ b/Doc/library/mailbox.rst
@@ -404,7 +404,7 @@ remarks:
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 @@ remarks:
`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 @@ remarks:
`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 @@ counterparts are as follows:
: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])
diff --git a/Doc/library/mimetools.rst b/Doc/library/mimetools.rst
index 8da385e..7813867 100644
--- a/Doc/library/mimetools.rst
+++ b/Doc/library/mimetools.rst
@@ -73,7 +73,7 @@ It defines the following items:
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.
diff --git a/Doc/library/mimetypes.rst b/Doc/library/mimetypes.rst
index c92f821..818f39f 100644
--- a/Doc/library/mimetypes.rst
+++ b/Doc/library/mimetypes.rst
@@ -41,7 +41,7 @@ the information :func:`init` sets up.
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.
diff --git a/Doc/library/othergui.rst b/Doc/library/othergui.rst
index b36568d..ab4efdb 100644
--- a/Doc/library/othergui.rst
+++ b/Doc/library/othergui.rst
@@ -36,14 +36,12 @@ also available for Python:
`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
diff --git a/Doc/library/robotparser.rst b/Doc/library/robotparser.rst
index 2451799..6cc7df8 100644
--- a/Doc/library/robotparser.rst
+++ b/Doc/library/robotparser.rst
@@ -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()
diff --git a/Doc/library/sha.rst b/Doc/library/sha.rst
index 3851d94..be38f75 100644
--- a/Doc/library/sha.rst
+++ b/Doc/library/sha.rst
@@ -82,6 +82,6 @@ An sha object has the same methods as md5 objects:
<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.
diff --git a/Doc/library/tix.rst b/Doc/library/tix.rst
index 04ea23a..ff2cfff 100644
--- a/Doc/library/tix.rst
+++ b/Doc/library/tix.rst
@@ -35,7 +35,7 @@ special needs of your application and users.
`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.
diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index 71b71e2..d393341 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -21,7 +21,7 @@ of Python; it is maintained at ActiveState.)
`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>`_
diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
index e3c852b..1f365d5 100644
--- a/Doc/library/zipfile.rst
+++ b/Doc/library/zipfile.rst
@@ -13,7 +13,7 @@ The ZIP file format is a common archive and compression standard. This module
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 @@ The module defines the following items:
.. 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 @@ Instances have the following attributes:
.. 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.
diff --git a/Doc/library/zipimport.rst b/Doc/library/zipimport.rst
index 53eae65..cec6b72 100644
--- a/Doc/library/zipimport.rst
+++ b/Doc/library/zipimport.rst
@@ -35,7 +35,7 @@ since this would imply that the ZIP has been altered during runtime.
.. 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.
diff --git a/Doc/license.rst b/Doc/license.rst
index 62d40bb..89f379d 100644
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -343,7 +343,7 @@ Sockets
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.
diff --git a/Doc/reference/introduction.rst b/Doc/reference/introduction.rst
index 5481043..8b2cceb 100644
--- a/Doc/reference/introduction.rst
+++ b/Doc/reference/introduction.rst
@@ -59,7 +59,7 @@ Python for .NET
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
diff --git a/Doc/tutorial/whatnow.rst b/Doc/tutorial/whatnow.rst
index 5f332ae..43b5e83 100644
--- a/Doc/tutorial/whatnow.rst
+++ b/Doc/tutorial/whatnow.rst
@@ -38,9 +38,9 @@ More Python resources:
* 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