Merged revisions 69924,69998-69999 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69924 | benjamin.peterson | 2009-02-24 02:45:35 +0000 (Di, 24 Feb 2009) | 1 line

  update README on running tests
........
  r69998 | benjamin.peterson | 2009-02-26 19:04:40 +0000 (Do, 26 Feb 2009) | 1 line

  the startship is rather outdated now
........
  r69999 | benjamin.peterson | 2009-02-26 19:05:59 +0000 (Do, 26 Feb 2009) | 1 line

  comma
........

diff --git a/README b/README
index bc40ec82cf0adf52d39eef6adfd003426d61ed06..40e5b425215844b15c9da333623a72c7a9fa5991 100644 (file)
--- a/README
+++ b/README
@@ -97,9 +97,6 @@ Web sites
 New Python releases and related technologies are published at
 http://www.python.org/.  Come visit us!
 
-There's also a Python community web site at
-http://starship.python.net/.
-
 
 Newsgroups and Mailing Lists
 ----------------------------
@@ -166,7 +163,7 @@ variables.  When it's done, you are ready to run make.
 
 To build Python, you normally type "make" in the toplevel directory.
 If you have changed the configuration, the Makefile may have to be
-rebuilt.  In this case you may have to run make again to correctly
+rebuilt.  In this case, you may have to run make again to correctly
 build your desired target.  The interpreter executable is built in the
 top level directory.
 
@@ -880,11 +877,14 @@ that are not yet using glibc 6), test_strftime fails due to a
 non-standard implementation of strftime() in the C library. Please
 ignore this, or upgrade to glibc version 6.
 
+By default, tests are prevented from overusing resources like disk space and
+memory.  To enable these tests, run "make testall".
+
 IMPORTANT: If the tests fail and you decide to mail a bug report,
 *don't* include the output of "make test".  It is useless.  Run the
 failing test manually, as follows:
 
-        ./python ./Lib/test/test_whatever.py
+        ./python Lib/test/regrtest.py -v test_whatever
 
 (substituting the top of the source tree for '.' if you built in a
 different directory).  This runs the test in verbose mode.