Merged revisions 68750,68811,68945,69157 via svnmerge from

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

........
  r68750 | benjamin.peterson | 2009-01-18 22:47:04 +0000 (So, 18 Jan 2009) | 1 line

  fix encoding cookie case
........
  r68811 | benjamin.peterson | 2009-01-20 18:58:27 +0000 (Di, 20 Jan 2009) | 1 line

  fix url
........
  r68945 | tarek.ziade | 2009-01-25 22:11:04 +0000 (So, 25 Jan 2009) | 1 line

  added missing module docstring
........
  r69157 | benjamin.peterson | 2009-01-31 23:43:25 +0000 (Sa, 31 Jan 2009) | 1 line

  add explanatory comment
........

diff --git a/Lib/distutils/command/install_lib.py b/Lib/distutils/command/install_lib.py
index 7e0c7088883d33a40865dd41d79ea949ed0d9695..fb15530ead40be7aac8f3cdb984e7651789501fa 100644 (file)
--- a/Lib/distutils/command/install_lib.py
+++ b/Lib/distutils/command/install_lib.py
@@ -1,4 +1,8 @@
 # This module should be kept compatible with Python 2.1.
+"""distutils.command.install_lib
+
+Implements the Distutils 'install_lib' command
+(install all Python modules)."""
 
 __revision__ = "$Id$"
 

diff --git a/Lib/heapq.py b/Lib/heapq.py
index b36aabda6e438a3d1649223c40b81e2a60743dcb..48f804a773a2781f13573c09c04a4c21cbc832d8 100644 (file)
--- a/Lib/heapq.py
+++ b/Lib/heapq.py
@@ -1,4 +1,4 @@
-# -*- coding: Latin-1 -*-
+# -*- coding: latin-1 -*-
 
 """Heap queue algorithm (a.k.a. priority queue).
 

diff --git a/Objects/stringlib/fastsearch.h b/Objects/stringlib/fastsearch.h
index 8f79c360d34ecbb2acd7e950e9b39db8d985d19e..23bccfb01d0ede0a5f15592ed2d14687db787eb7 100644 (file)
--- a/Objects/stringlib/fastsearch.h
+++ b/Objects/stringlib/fastsearch.h
@@ -5,7 +5,7 @@
 
 /* fast search/count implementation, based on a mix between boyer-
    moore and horspool, with a few more bells and whistles on the top.
-   for some more background, see: http://effbot.org/stringlib */
+   for some more background, see: http://effbot.org/stringlib.htm */
 
 /* note: fastsearch may access s[n], which isn't a problem when using
    Python's ordinary string types, but may cause problems if you're