Merged revisions 78416,78430 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78416 | dirkjan.ochtman | 2010-02-23 23:12:11 -0500 (Tue, 23 Feb 2010) | 1 line

  Issue #8004: add a serve target to the Doc Makefile.
........
  r78430 | dirkjan.ochtman | 2010-02-24 12:06:31 -0500 (Wed, 24 Feb 2010) | 1 line

  Add some notes about Tools/scripts/serve.py.
........
diff --git a/Misc/NEWS b/Misc/NEWS
index 7022280..541f13e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -832,6 +832,9 @@
 Documentation
 ------------
 
+- A small wsgi server was added as Tools/scripts/serve.py, and is used to
+  implement a local documentation server via 'make serve' in the doc directory.
+
 - Updating `Using Python` documentation to include description of CPython's
   -J and -X options.