Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61058-61061 via svnmerge from

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

........
  r61058 | neal.norwitz | 2008-02-25 02:45:37 +0100 (Mon, 25 Feb 2008) | 1 line

  Fix indentation
........
  r61059 | brett.cannon | 2008-02-25 06:33:07 +0100 (Mon, 25 Feb 2008) | 2 lines

  Add minor markup for a string.
........
  r61060 | brett.cannon | 2008-02-25 06:33:33 +0100 (Mon, 25 Feb 2008) | 2 lines

  Fix a minor typo in a docstring.
........

Doc/library/logging.rst

@@ -243,8 +243,8 @@ With the logger object configured, the following methods create log messages:
   little more verbose for logging messages than using the log level convenience
   methods listed above, but this is how to log at custom log levels.
 
-:func:`getLogger` returns a reference to a logger instance with a name of name
-if a name is provided, or root if not.  The names are period-separated
+:func:`getLogger` returns a reference to a logger instance with the specified
+if it it is provided, or ``root`` if not.  The names are period-separated
 hierarchical structures.  Multiple calls to :func:`getLogger` with the same name
 will return a reference to the same logger object.  Loggers that are further
 down in the hierarchical list are children of loggers higher up in the list.
@@ -296,7 +296,7 @@ Formatters
 ^^^^^^^^^^
 
 Formatter objects configure the final order, structure, and contents of the log
-message.  Unlike the base logging.Handler class, application code may
+message.  Unlike the base :class:`logging.Handler` class, application code may
 instantiate formatter classes, although you could likely subclass the formatter
 if your application needs special behavior.  The constructor takes two optional
 arguments: a message format string and a date format string.  If there is no

Lib/test/test_support.py

@@ -105,7 +105,7 @@ def requires(resource, msg=None):
 
 def bind_port(sock, host='', preferred_port=54321):
     """Try to bind the sock to a port.  If we are running multiple
-    tests and we don't try multiple ports, the test can fails.  This
+    tests and we don't try multiple ports, the test can fail.  This
     makes the test more robust."""
 
     # Find some random ports that hopefully no one is listening on.

Python/peephole.c

@@ -342,7 +342,7 @@ PyCode_Optimize(PyObject *code, PyObject* consts, PyObject *names,
 	if (codestr == NULL)
 		goto exitUnchanged;
 	codestr = (unsigned char *)memcpy(codestr, 
-                                        PyString_AS_STRING(code), codelen);
+					  PyString_AS_STRING(code), codelen);
 
 	/* Verify that RETURN_VALUE terminates the codestring.	This allows
 	   the various transformation patterns to look ahead several