Fix lots of broken links in the docs, found by Sphinx' external link checker.
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 @@
 
 * 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