Sun Aug 5 00:45:58 CEST 2007

Author: georg.brandl
Date: Sun Aug  5 00:45:13 2007
New Revision: 56744

Modified:
   doctools/trunk/Doc-26/c-api/abstract.rst
   doctools/trunk/Doc-26/c-api/concrete.rst
   doctools/trunk/Doc-26/c-api/init.rst
   doctools/trunk/Doc-26/c-api/intro.rst
   doctools/trunk/Doc-26/c-api/newtypes.rst
   doctools/trunk/Doc-26/c-api/utilities.rst
   doctools/trunk/Doc-26/distutils/apiref.rst
   doctools/trunk/Doc-26/extending/building.rst
   doctools/trunk/Doc-26/extending/extending.rst
   doctools/trunk/Doc-26/extending/newtypes.rst
   doctools/trunk/Doc-26/howto/advocacy.rst
   doctools/trunk/Doc-26/howto/curses.rst
   doctools/trunk/Doc-26/howto/doanddont.rst
   doctools/trunk/Doc-26/howto/functional.rst
   doctools/trunk/Doc-26/howto/regex.rst
   doctools/trunk/Doc-26/howto/sockets.rst
   doctools/trunk/Doc-26/howto/urllib2.rst
   doctools/trunk/Doc-26/install/index.rst
   doctools/trunk/Doc-26/library/_winreg.rst
   doctools/trunk/Doc-26/library/asyncore.rst
   doctools/trunk/Doc-26/library/binascii.rst
   doctools/trunk/Doc-26/library/bz2.rst
   doctools/trunk/Doc-26/library/cgi.rst
   doctools/trunk/Doc-26/library/chunk.rst
   doctools/trunk/Doc-26/library/cmath.rst
   doctools/trunk/Doc-26/library/code.rst
   doctools/trunk/Doc-26/library/codecs.rst
   doctools/trunk/Doc-26/library/codeop.rst
   doctools/trunk/Doc-26/library/cookie.rst
   doctools/trunk/Doc-26/library/cookielib.rst
   doctools/trunk/Doc-26/library/csv.rst
   doctools/trunk/Doc-26/library/ctypes.rst
   doctools/trunk/Doc-26/library/curses.rst
   doctools/trunk/Doc-26/library/datetime.rst
   doctools/trunk/Doc-26/library/decimal.rst
   doctools/trunk/Doc-26/library/difflib.rst
   doctools/trunk/Doc-26/library/dis.rst
   doctools/trunk/Doc-26/library/dl.rst
   doctools/trunk/Doc-26/library/doctest.rst
   doctools/trunk/Doc-26/library/email.charset.rst
   doctools/trunk/Doc-26/library/email.generator.rst
   doctools/trunk/Doc-26/library/email.message.rst
   doctools/trunk/Doc-26/library/email.parser.rst
   doctools/trunk/Doc-26/library/errno.rst
   doctools/trunk/Doc-26/library/fcntl.rst
   doctools/trunk/Doc-26/library/formatter.rst
   doctools/trunk/Doc-26/library/fpectl.rst
   doctools/trunk/Doc-26/library/functions.rst
   doctools/trunk/Doc-26/library/gdbm.rst
   doctools/trunk/Doc-26/library/getopt.rst
   doctools/trunk/Doc-26/library/gettext.rst
   doctools/trunk/Doc-26/library/httplib.rst
   doctools/trunk/Doc-26/library/imageop.rst
   doctools/trunk/Doc-26/library/imaplib.rst
   doctools/trunk/Doc-26/library/imp.rst
   doctools/trunk/Doc-26/library/inspect.rst
   doctools/trunk/Doc-26/library/itertools.rst
   doctools/trunk/Doc-26/library/logging.rst
   doctools/trunk/Doc-26/library/mailbox.rst
   doctools/trunk/Doc-26/library/math.rst
   doctools/trunk/Doc-26/library/mimetypes.rst
   doctools/trunk/Doc-26/library/mimify.rst
   doctools/trunk/Doc-26/library/mmap.rst
   doctools/trunk/Doc-26/library/msilib.rst
   doctools/trunk/Doc-26/library/multifile.rst
   doctools/trunk/Doc-26/library/netrc.rst
   doctools/trunk/Doc-26/library/new.rst
   doctools/trunk/Doc-26/library/nntplib.rst
   doctools/trunk/Doc-26/library/optparse.rst
   doctools/trunk/Doc-26/library/os.rst
   doctools/trunk/Doc-26/library/ossaudiodev.rst
   doctools/trunk/Doc-26/library/othergui.rst
   doctools/trunk/Doc-26/library/parser.rst
   doctools/trunk/Doc-26/library/pickle.rst
   doctools/trunk/Doc-26/library/profile.rst
   doctools/trunk/Doc-26/library/pyexpat.rst
   doctools/trunk/Doc-26/library/random.rst
   doctools/trunk/Doc-26/library/re.rst
   doctools/trunk/Doc-26/library/repr.rst
   doctools/trunk/Doc-26/library/rfc822.rst
   doctools/trunk/Doc-26/library/select.rst
   doctools/trunk/Doc-26/library/sgmllib.rst
   doctools/trunk/Doc-26/library/shelve.rst
   doctools/trunk/Doc-26/library/shlex.rst
   doctools/trunk/Doc-26/library/simplehttpserver.rst
   doctools/trunk/Doc-26/library/simplexmlrpcserver.rst
   doctools/trunk/Doc-26/library/site.rst
   doctools/trunk/Doc-26/library/socket.rst
   doctools/trunk/Doc-26/library/socketserver.rst
   doctools/trunk/Doc-26/library/sqlite3.rst
   doctools/trunk/Doc-26/library/stdtypes.rst
   doctools/trunk/Doc-26/library/string.rst
   doctools/trunk/Doc-26/library/stringprep.rst
   doctools/trunk/Doc-26/library/struct.rst
   doctools/trunk/Doc-26/library/sys.rst
   doctools/trunk/Doc-26/library/tempfile.rst
   doctools/trunk/Doc-26/library/termios.rst
   doctools/trunk/Doc-26/library/textwrap.rst
   doctools/trunk/Doc-26/library/threading.rst
   doctools/trunk/Doc-26/library/timeit.rst
   doctools/trunk/Doc-26/library/tix.rst
   doctools/trunk/Doc-26/library/tkinter.rst
   doctools/trunk/Doc-26/library/turtle.rst
   doctools/trunk/Doc-26/library/urllib.rst
   doctools/trunk/Doc-26/library/urllib2.rst
   doctools/trunk/Doc-26/library/user.rst
   doctools/trunk/Doc-26/library/winsound.rst
   doctools/trunk/Doc-26/library/wsgiref.rst
   doctools/trunk/Doc-26/library/xml.dom.rst
   doctools/trunk/Doc-26/library/xml.etree.elementtree.rst
   doctools/trunk/Doc-26/library/xml.sax.handler.rst
   doctools/trunk/Doc-26/library/xml.sax.reader.rst
   doctools/trunk/Doc-26/library/xml.sax.utils.rst
   doctools/trunk/Doc-26/license.rst
   doctools/trunk/Doc-26/maclib/using.rst
   doctools/trunk/Doc-26/reference/datamodel.rst
   doctools/trunk/Doc-26/reference/executionmodel.rst
   doctools/trunk/Doc-26/reference/expressions.rst
   doctools/trunk/Doc-26/reference/lexical_analysis.rst
   doctools/trunk/Doc-26/reference/simple_stmts.rst
   doctools/trunk/Doc-26/tutorial/appetite.rst
   doctools/trunk/Doc-26/tutorial/datastructures.rst
   doctools/trunk/Doc-26/tutorial/errors.rst
   doctools/trunk/Doc-26/tutorial/glossary.rst
   doctools/trunk/Doc-26/tutorial/introduction.rst
   doctools/trunk/Doc-26/tutorial/modules.rst
   doctools/trunk/Doc-26/tutorial/whatnow.rst
   doctools/trunk/Doc-26/whatsnew/2.0.rst
   doctools/trunk/Doc-26/whatsnew/2.1.rst
   doctools/trunk/Doc-26/whatsnew/2.3.rst
   doctools/trunk/Doc-26/whatsnew/2.5.rst
   doctools/trunk/Doc-3k/c-api/abstract.rst
   doctools/trunk/Doc-3k/c-api/concrete.rst
   doctools/trunk/Doc-3k/c-api/init.rst
   doctools/trunk/Doc-3k/c-api/intro.rst
   doctools/trunk/Doc-3k/c-api/newtypes.rst
   doctools/trunk/Doc-3k/c-api/utilities.rst
   doctools/trunk/Doc-3k/distutils/apiref.rst
   doctools/trunk/Doc-3k/extending/building.rst
   doctools/trunk/Doc-3k/extending/extending.rst
   doctools/trunk/Doc-3k/extending/newtypes.rst
   doctools/trunk/Doc-3k/howto/advocacy.rst
   doctools/trunk/Doc-3k/howto/curses.rst
   doctools/trunk/Doc-3k/howto/doanddont.rst
   doctools/trunk/Doc-3k/howto/functional.rst
   doctools/trunk/Doc-3k/howto/regex.rst
   doctools/trunk/Doc-3k/howto/sockets.rst
   doctools/trunk/Doc-3k/howto/urllib2.rst
   doctools/trunk/Doc-3k/install/index.rst
   doctools/trunk/Doc-3k/library/_winreg.rst
   doctools/trunk/Doc-3k/library/asyncore.rst
   doctools/trunk/Doc-3k/library/binascii.rst
   doctools/trunk/Doc-3k/library/bz2.rst
   doctools/trunk/Doc-3k/library/cgi.rst
   doctools/trunk/Doc-3k/library/chunk.rst
   doctools/trunk/Doc-3k/library/cmath.rst
   doctools/trunk/Doc-3k/library/code.rst
   doctools/trunk/Doc-3k/library/codecs.rst
   doctools/trunk/Doc-3k/library/codeop.rst
   doctools/trunk/Doc-3k/library/cookie.rst
   doctools/trunk/Doc-3k/library/cookielib.rst
   doctools/trunk/Doc-3k/library/csv.rst
   doctools/trunk/Doc-3k/library/ctypes.rst
   doctools/trunk/Doc-3k/library/curses.rst
   doctools/trunk/Doc-3k/library/datetime.rst
   doctools/trunk/Doc-3k/library/decimal.rst
   doctools/trunk/Doc-3k/library/difflib.rst
   doctools/trunk/Doc-3k/library/dis.rst
   doctools/trunk/Doc-3k/library/dl.rst
   doctools/trunk/Doc-3k/library/doctest.rst
   doctools/trunk/Doc-3k/library/email.charset.rst
   doctools/trunk/Doc-3k/library/email.generator.rst
   doctools/trunk/Doc-3k/library/email.message.rst
   doctools/trunk/Doc-3k/library/email.parser.rst
   doctools/trunk/Doc-3k/library/errno.rst
   doctools/trunk/Doc-3k/library/fcntl.rst
   doctools/trunk/Doc-3k/library/formatter.rst
   doctools/trunk/Doc-3k/library/fpectl.rst
   doctools/trunk/Doc-3k/library/functions.rst
   doctools/trunk/Doc-3k/library/gdbm.rst
   doctools/trunk/Doc-3k/library/getopt.rst
   doctools/trunk/Doc-3k/library/gettext.rst
   doctools/trunk/Doc-3k/library/httplib.rst
   doctools/trunk/Doc-3k/library/imaplib.rst
   doctools/trunk/Doc-3k/library/imp.rst
   doctools/trunk/Doc-3k/library/inspect.rst
   doctools/trunk/Doc-3k/library/itertools.rst
   doctools/trunk/Doc-3k/library/logging.rst
   doctools/trunk/Doc-3k/library/mailbox.rst
   doctools/trunk/Doc-3k/library/math.rst
   doctools/trunk/Doc-3k/library/mimetypes.rst
   doctools/trunk/Doc-3k/library/mmap.rst
   doctools/trunk/Doc-3k/library/msilib.rst
   doctools/trunk/Doc-3k/library/multifile.rst
   doctools/trunk/Doc-3k/library/netrc.rst
   doctools/trunk/Doc-3k/library/new.rst
   doctools/trunk/Doc-3k/library/nntplib.rst
   doctools/trunk/Doc-3k/library/optparse.rst
   doctools/trunk/Doc-3k/library/os.rst
   doctools/trunk/Doc-3k/library/ossaudiodev.rst
   doctools/trunk/Doc-3k/library/othergui.rst
   doctools/trunk/Doc-3k/library/parser.rst
   doctools/trunk/Doc-3k/library/pickle.rst
   doctools/trunk/Doc-3k/library/profile.rst
   doctools/trunk/Doc-3k/library/pyexpat.rst
   doctools/trunk/Doc-3k/library/random.rst
   doctools/trunk/Doc-3k/library/re.rst
   doctools/trunk/Doc-3k/library/repr.rst
   doctools/trunk/Doc-3k/library/rfc822.rst
   doctools/trunk/Doc-3k/library/select.rst
   doctools/trunk/Doc-3k/library/sgmllib.rst
   doctools/trunk/Doc-3k/library/shelve.rst
   doctools/trunk/Doc-3k/library/shlex.rst
   doctools/trunk/Doc-3k/library/simplehttpserver.rst
   doctools/trunk/Doc-3k/library/simplexmlrpcserver.rst
   doctools/trunk/Doc-3k/library/site.rst
   doctools/trunk/Doc-3k/library/socket.rst
   doctools/trunk/Doc-3k/library/socketserver.rst
   doctools/trunk/Doc-3k/library/sqlite3.rst
   doctools/trunk/Doc-3k/library/stdtypes.rst
   doctools/trunk/Doc-3k/library/string.rst
   doctools/trunk/Doc-3k/library/stringprep.rst
   doctools/trunk/Doc-3k/library/struct.rst
   doctools/trunk/Doc-3k/library/sys.rst
   doctools/trunk/Doc-3k/library/tempfile.rst
   doctools/trunk/Doc-3k/library/termios.rst
   doctools/trunk/Doc-3k/library/textwrap.rst
   doctools/trunk/Doc-3k/library/threading.rst
   doctools/trunk/Doc-3k/library/timeit.rst
   doctools/trunk/Doc-3k/library/tix.rst
   doctools/trunk/Doc-3k/library/tkinter.rst
   doctools/trunk/Doc-3k/library/turtle.rst
   doctools/trunk/Doc-3k/library/urllib.rst
   doctools/trunk/Doc-3k/library/urllib2.rst
   doctools/trunk/Doc-3k/library/user.rst
   doctools/trunk/Doc-3k/library/winsound.rst
   doctools/trunk/Doc-3k/library/wsgiref.rst
   doctools/trunk/Doc-3k/library/xml.dom.rst
   doctools/trunk/Doc-3k/library/xml.etree.elementtree.rst
   doctools/trunk/Doc-3k/library/xml.sax.handler.rst
   doctools/trunk/Doc-3k/library/xml.sax.reader.rst
   doctools/trunk/Doc-3k/library/xml.sax.utils.rst
   doctools/trunk/Doc-3k/license.rst
   doctools/trunk/Doc-3k/maclib/using.rst
   doctools/trunk/Doc-3k/reference/datamodel.rst
   doctools/trunk/Doc-3k/reference/executionmodel.rst
   doctools/trunk/Doc-3k/reference/expressions.rst
   doctools/trunk/Doc-3k/reference/lexical_analysis.rst
   doctools/trunk/Doc-3k/reference/simple_stmts.rst
   doctools/trunk/Doc-3k/tutorial/appetite.rst
   doctools/trunk/Doc-3k/tutorial/datastructures.rst
   doctools/trunk/Doc-3k/tutorial/errors.rst
   doctools/trunk/Doc-3k/tutorial/glossary.rst
   doctools/trunk/Doc-3k/tutorial/introduction.rst
   doctools/trunk/Doc-3k/tutorial/modules.rst
   doctools/trunk/Doc-3k/tutorial/whatnow.rst
   doctools/trunk/Doc-3k/whatsnew/2.0.rst
   doctools/trunk/Doc-3k/whatsnew/2.1.rst
   doctools/trunk/Doc-3k/whatsnew/2.3.rst
   doctools/trunk/Doc-3k/whatsnew/2.5.rst
   doctools/trunk/sphinx/directives.py
Log:
Fix a whole load of markup glitches introduced mostly by the converter.

Many thanks to Tim Hatch for finding them, and thanks to Emacs for making it easy to fix them :)


Modified: doctools/trunk/Doc-26/c-api/abstract.rst
==============================================================================

--- doctools/trunk/Doc-26/c-api/abstract.rst	(original)
+++ doctools/trunk/Doc-26/c-api/abstract.rst	Sun Aug  5 00:45:13 2007
@@ -182,9 +182,9 @@
 either is not a class object, a more general mechanism is used to determine the
 class relationship of the two objects.  When testing if *B* is a subclass of
 *A*, if *A* is *B*, :cfunc:`PyObject_IsSubclass` returns true.  If *A* and *B*
-are different objects, *B*'s :attr:`__bases__` attribute is searched in a depth-
-first fashion for *A* --- the presence of the :attr:`__bases__` attribute is
-considered sufficient for this determination.
+are different objects, *B*'s :attr:`__bases__` attribute is searched in a
+depth-first fashion for *A* --- the presence of the :attr:`__bases__` attribute
+is considered sufficient for this determination.
 
 
 .. cfunction:: int PyObject_IsSubclass(PyObject *derived, PyObject *cls)

Modified: doctools/trunk/Doc-26/c-api/concrete.rst
==============================================================================
--- doctools/trunk/Doc-26/c-api/concrete.rst	(original)
+++ doctools/trunk/Doc-26/c-api/concrete.rst	Sun Aug  5 00:45:13 2007
@@ -1662,11 +1662,9 @@
 
    Rich compare two unicode strings and return one of the following:
 
-* ``NULL`` in case an exception was raised
-
-* :const:`Py_True` or :const:`Py_False` for successful comparisons
-
-* :const:`Py_NotImplemented` in case the type combination is unknown
+   * ``NULL`` in case an exception was raised
+   * :const:`Py_True` or :const:`Py_False` for successful comparisons
+   * :const:`Py_NotImplemented` in case the type combination is unknown
 
    Note that :const:`Py_EQ` and :const:`Py_NE` comparisons can cause a
    :exc:`UnicodeWarning` in case the conversion of the arguments to Unicode fails
@@ -2411,7 +2409,7 @@
 
    .. index:: single: EOFError (built-in exception)
 
-   Equivalent to ``p.readline([*n*])``, this function reads one line from the
+   Equivalent to ``p.readline([n])``, this function reads one line from the
    object *p*.  *p* may be a file object or any object with a :meth:`readline`
    method.  If *n* is ``0``, exactly one line is read, regardless of the length of
    the line.  If *n* is greater than ``0``, no more than *n* bytes will be read
@@ -2773,8 +2771,9 @@
 
 .. cvar:: PyTypeObject PySeqIter_Type
 
-   Type object for iterator objects returned by :cfunc:`PySeqIter_New` and the one-
-   argument form of the :func:`iter` built-in function for built-in sequence types.
+   Type object for iterator objects returned by :cfunc:`PySeqIter_New` and the
+   one-argument form of the :func:`iter` built-in function for built-in sequence
+   types.
 
    .. versionadded:: 2.2
 
@@ -2965,14 +2964,14 @@
 
 .. cfunction:: PyObject* PyWeakref_NewRef(PyObject *ob, PyObject *callback)
 
-   Return a weak reference object for the object *ob*.  This will always return a
-   new reference, but is not guaranteed to create a new object; an existing
+   Return a weak reference object for the object *ob*.  This will always return
+   a new reference, but is not guaranteed to create a new object; an existing
    reference object may be returned.  The second parameter, *callback*, can be a
    callable object that receives notification when *ob* is garbage collected; it
    should accept a single parameter, which will be the weak reference object
-   itself. *callback* may also be ``None`` or *NULL*.  If *ob* is not a weakly-
-   referencable object, or if *callback* is not callable, ``None``, or *NULL*, this
-   will return *NULL* and raise :exc:`TypeError`.
+   itself. *callback* may also be ``None`` or *NULL*.  If *ob* is not a
+   weakly-referencable object, or if *callback* is not callable, ``None``, or
+   *NULL*, this will return *NULL* and raise :exc:`TypeError`.
 
    .. versionadded:: 2.2
 
@@ -2981,12 +2980,12 @@
 
    Return a weak reference proxy object for the object *ob*.  This will always
    return a new reference, but is not guaranteed to create a new object; an
-   existing proxy object may be returned.  The second parameter, *callback*, can be
-   a callable object that receives notification when *ob* is garbage collected; it
-   should accept a single parameter, which will be the weak reference object
-   itself. *callback* may also be ``None`` or *NULL*.  If *ob* is not a weakly-
-   referencable object, or if *callback* is not callable, ``None``, or *NULL*, this
-   will return *NULL* and raise :exc:`TypeError`.
+   existing proxy object may be returned.  The second parameter, *callback*, can
+   be a callable object that receives notification when *ob* is garbage
+   collected; it should accept a single parameter, which will be the weak
+   reference object itself. *callback* may also be ``None`` or *NULL*.  If *ob*
+   is not a weakly-referencable object, or if *callback* is not callable,
+   ``None``, or *NULL*, this will return *NULL* and raise :exc:`TypeError`.
 
    .. versionadded:: 2.2
 

Modified: doctools/trunk/Doc-26/c-api/init.rst
==============================================================================
--- doctools/trunk/Doc-26/c-api/init.rst	(original)
+++ doctools/trunk/Doc-26/c-api/init.rst	Sun Aug  5 00:45:13 2007
@@ -102,15 +102,16 @@
    ``sys.stdout`` and ``sys.stderr`` (however these refer to the same underlying
    :ctype:`FILE` structures in the C library).
 
-   The return value points to the first thread state created in the new sub-
-   interpreter.  This thread state is made in the current thread state.  Note that
-   no actual thread is created; see the discussion of thread states below.  If
-   creation of the new interpreter is unsuccessful, *NULL* is returned; no
-   exception is set since the exception state is stored in the current thread state
-   and there may not be a current thread state.  (Like all other Python/C API
-   functions, the global interpreter lock must be held before calling this function
-   and is still held when it returns; however, unlike most other Python/C API
-   functions, there needn't be a current thread state on entry.)
+   The return value points to the first thread state created in the new
+   sub-interpreter.  This thread state is made in the current thread state.
+   Note that no actual thread is created; see the discussion of thread states
+   below.  If creation of the new interpreter is unsuccessful, *NULL* is
+   returned; no exception is set since the exception state is stored in the
+   current thread state and there may not be a current thread state.  (Like all
+   other Python/C API functions, the global interpreter lock must be held before
+   calling this function and is still held when it returns; however, unlike most
+   other Python/C API functions, there needn't be a current thread state on
+   entry.)
 
    .. index::
       single: Py_Finalize()
@@ -169,15 +170,15 @@
       single: main()
       single: Py_GetPath()
 
-   This function should be called before :cfunc:`Py_Initialize` is called for the
-   first time, if it is called at all.  It tells the interpreter the value of the
-   ``argv[0]`` argument to the :cfunc:`main` function of the program.  This is used
-   by :cfunc:`Py_GetPath` and some other functions below to find the Python run-
-   time libraries relative to the interpreter executable.  The default value is
-   ``'python'``.  The argument should point to a zero-terminated character string
-   in static storage whose contents will not change for the duration of the
-   program's execution.  No code in the Python interpreter will change the contents
-   of this storage.
+   This function should be called before :cfunc:`Py_Initialize` is called for
+   the first time, if it is called at all.  It tells the interpreter the value
+   of the ``argv[0]`` argument to the :cfunc:`main` function of the program.
+   This is used by :cfunc:`Py_GetPath` and some other functions below to find
+   the Python run-time libraries relative to the interpreter executable.  The
+   default value is ``'python'``.  The argument should point to a
+   zero-terminated character string in static storage whose contents will not
+   change for the duration of the program's execution.  No code in the Python
+   interpreter will change the contents of this storage.
 
 
 .. cfunction:: char* Py_GetProgramName()
@@ -376,12 +377,12 @@
    single: interpreter lock
    single: lock, interpreter
 
-The Python interpreter is not fully thread safe.  In order to support multi-
-threaded Python programs, there's a global lock that must be held by the current
-thread before it can safely access Python objects. Without the lock, even the
-simplest operations could cause problems in a multi-threaded program: for
-example, when two threads simultaneously increment the reference count of the
-same object, the reference count could end up being incremented only once
+The Python interpreter is not fully thread safe.  In order to support
+multi-threaded Python programs, there's a global lock that must be held by the
+current thread before it can safely access Python objects. Without the lock,
+even the simplest operations could cause problems in a multi-threaded program:
+for example, when two threads simultaneously increment the reference count of
+the same object, the reference count could end up being incremented only once
 instead of twice.
 
 .. index:: single: setcheckinterval() (in module sys)

Modified: doctools/trunk/Doc-26/c-api/intro.rst
==============================================================================
--- doctools/trunk/Doc-26/c-api/intro.rst	(original)
+++ doctools/trunk/Doc-26/c-api/intro.rst	Sun Aug  5 00:45:13 2007
@@ -70,7 +70,7 @@
 
 To include the headers, place both directories (if different) on your compiler's
 search path for includes.  Do *not* place the parent directories on the search
-path and then use ``#include <python|version|/Python.h>``; this will break on
+path and then use ``#include <pythonX.Y/Python.h>``; this will break on
 multi-platform builds since the platform independent headers under
 :envvar:`prefix` include the platform specific headers from
 :envvar:`exec_prefix`.
@@ -402,16 +402,16 @@
 
 .. index:: single: exc_info() (in module sys)
 
-Note that starting with Python 1.5, the preferred, thread-safe way to  access
-the exception state from Python code is to call the function
-:func:`sys.exc_info`, which returns the per-thread exception state  for Python
-code.  Also, the semantics of both ways to access the  exception state have
-changed so that a function which catches an  exception will save and restore its
-thread's exception state so as to  preserve the exception state of its caller.
-This prevents common bugs  in exception handling code caused by an innocent-
-looking function  overwriting the exception being handled; it also reduces the
-often  unwanted lifetime extension for objects that are referenced by the  stack
-frames in the traceback.
+Note that starting with Python 1.5, the preferred, thread-safe way to access the
+exception state from Python code is to call the function :func:`sys.exc_info`,
+which returns the per-thread exception state for Python code.  Also, the
+semantics of both ways to access the exception state have changed so that a
+function which catches an exception will save and restore its thread's exception
+state so as to preserve the exception state of its caller.  This prevents common
+bugs in exception handling code caused by an innocent-looking function
+overwriting the exception being handled; it also reduces the often unwanted
+lifetime extension for objects that are referenced by the stack frames in the
+traceback.
 
 As a general principle, a function that calls another function to  perform some
 task should check whether the called function raised an  exception, and if so,
@@ -536,13 +536,13 @@
 based upon its best guess for the location of the standard Python interpreter
 executable, assuming that the Python library is found in a fixed location
 relative to the Python interpreter executable.  In particular, it looks for a
-directory named :file:`lib/python|version|` relative to the parent directory
+directory named :file:`lib/python{X.Y}` relative to the parent directory
 where the executable named :file:`python` is found on the shell command search
 path (the environment variable :envvar:`PATH`).
 
 For instance, if the Python executable is found in
 :file:`/usr/local/bin/python`, it will assume that the libraries are in
-:file:`/usr/local/lib/python|version|`.  (In fact, this particular path is also
+:file:`/usr/local/lib/python{X.Y}`.  (In fact, this particular path is also
 the "fallback" location, used when no executable file named :file:`python` is
 found along :envvar:`PATH`.)  The user can override this behavior by setting the
 environment variable :envvar:`PYTHONHOME`, or insert additional directories in
@@ -594,9 +594,9 @@
 Compiling the interpreter with the :cmacro:`Py_DEBUG` macro defined produces
 what is generally meant by "a debug build" of Python. :cmacro:`Py_DEBUG` is
 enabled in the Unix build by adding :option:`--with-pydebug` to the
-:file:`configure` command.  It is also implied by the presence of the not-
-Python-specific :cmacro:`_DEBUG` macro.  When :cmacro:`Py_DEBUG` is enabled in
-the Unix build, compiler optimization is disabled.
+:file:`configure` command.  It is also implied by the presence of the
+not-Python-specific :cmacro:`_DEBUG` macro.  When :cmacro:`Py_DEBUG` is enabled
+in the Unix build, compiler optimization is disabled.
 
 In addition to the reference count debugging described below, the following
 extra checks are performed:

Modified: doctools/trunk/Doc-26/c-api/newtypes.rst
==============================================================================
--- doctools/trunk/Doc-26/c-api/newtypes.rst	(original)
+++ doctools/trunk/Doc-26/c-api/newtypes.rst	Sun Aug  5 00:45:13 2007
@@ -480,10 +480,10 @@
    The basic size does not include the GC header size (this is new in Python 2.2;
    in 2.1 and 2.0, the GC header size was included in :attr:`tp_basicsize`).
 
-   These fields are inherited separately by subtypes.  If the base type has a non-
-   zero :attr:`tp_itemsize`, it is generally not safe to set :attr:`tp_itemsize` to
-   a different non-zero value in a subtype (though this depends on the
-   implementation of the base type).
+   These fields are inherited separately by subtypes.  If the base type has a
+   non-zero :attr:`tp_itemsize`, it is generally not safe to set
+   :attr:`tp_itemsize` to a different non-zero value in a subtype (though this
+   depends on the implementation of the base type).
 
    A note about alignment: if the variable items require a particular alignment,
    this should be taken care of by the value of :attr:`tp_basicsize`.  Example:

Modified: doctools/trunk/Doc-26/c-api/utilities.rst
==============================================================================
--- doctools/trunk/Doc-26/c-api/utilities.rst	(original)
+++ doctools/trunk/Doc-26/c-api/utilities.rst	Sun Aug  5 00:45:13 2007
@@ -484,13 +484,13 @@
    Unicode into a character buffer. It only works for encoded data without embedded
    NUL bytes.
 
-   This format requires two arguments.  The first is only used as input, and must
-   be a :ctype:`const char\*` which points to the name of an encoding as a NUL-
-   terminated string, or *NULL*, in which case the default encoding is used.  An
-   exception is raised if the named encoding is not known to Python.  The second
-   argument must be a :ctype:`char\*\*`; the value of the pointer it references
-   will be set to a buffer with the contents of the argument text.  The text will
-   be encoded in the encoding specified by the first argument.
+   This format requires two arguments.  The first is only used as input, and
+   must be a :ctype:`const char\*` which points to the name of an encoding as a
+   NUL-terminated string, or *NULL*, in which case the default encoding is used.
+   An exception is raised if the named encoding is not known to Python.  The
+   second argument must be a :ctype:`char\*\*`; the value of the pointer it
+   references will be set to a buffer with the contents of the argument text.
+   The text will be encoded in the encoding specified by the first argument.
 
    :cfunc:`PyArg_ParseTuple` will allocate a buffer of the needed size, copy the
    encoded data into this buffer and adjust *\*buffer* to reference the newly
@@ -508,14 +508,14 @@
    input data which contains NUL characters.
 
    It requires three arguments.  The first is only used as input, and must be a
-   :ctype:`const char\*` which points to the name of an encoding as a NUL-
-   terminated string, or *NULL*, in which case the default encoding is used.  An
-   exception is raised if the named encoding is not known to Python.  The second
-   argument must be a :ctype:`char\*\*`; the value of the pointer it references
-   will be set to a buffer with the contents of the argument text.  The text will
-   be encoded in the encoding specified by the first argument.  The third argument
-   must be a pointer to an integer; the referenced integer will be set to the
-   number of bytes in the output buffer.
+   :ctype:`const char\*` which points to the name of an encoding as a
+   NUL-terminated string, or *NULL*, in which case the default encoding is used.
+   An exception is raised if the named encoding is not known to Python.  The
+   second argument must be a :ctype:`char\*\*`; the value of the pointer it
+   references will be set to a buffer with the contents of the argument text.
+   The text will be encoded in the encoding specified by the first argument.
+   The third argument must be a pointer to an integer; the referenced integer
+   will be set to the number of bytes in the output buffer.
 
    There are two modes of operation:
 
@@ -966,14 +966,14 @@
 The return value (*rv*) for these functions should be interpreted as follows:
 
 * When ``0 <= rv < size``, the output conversion was successful and *rv*
-  characters were written to *str* (excluding the trailing ``'\\0'`` byte at
+  characters were written to *str* (excluding the trailing ``'\0'`` byte at
   *str*[*rv*]).
 
 * When ``rv >= size``, the output conversion was truncated and a buffer with
-  ``rv + 1`` bytes would have been needed to succeed. *str*[*size*-1] is ``'\\0'``
+  ``rv + 1`` bytes would have been needed to succeed. *str*[*size*-1] is ``'\0'``
   in this case.
 
-* When ``rv < 0``, "something bad happened." *str*[*size*-1] is ``'\\0'`` in
+* When ``rv < 0``, "something bad happened." *str*[*size*-1] is ``'\0'`` in
   this case too, but the rest of *str* is undefined. The exact cause of the error
   depends on the underlying platform.
 

Modified: doctools/trunk/Doc-26/distutils/apiref.rst
==============================================================================
--- doctools/trunk/Doc-26/distutils/apiref.rst	(original)
+++ doctools/trunk/Doc-26/distutils/apiref.rst	Sun Aug  5 00:45:13 2007
@@ -100,7 +100,7 @@
    +--------------------+--------------------------------+-------------------------------------------------------------+
 
 
-.. function:: run_setup(script_name[, script_args=``None``, stop_after=``'run'``])
+.. function:: run_setup(script_name[, script_args=None, stop_after='run'])
 
    Run a setup script in a somewhat controlled environment, and return  the
    :class:`distutils.dist.Distribution` instance that drives things.   This is
@@ -341,7 +341,7 @@
    to :command:`build`, :command:`build_ext`, :command:`build_clib`).
 
 
-.. class:: CCompiler([verbose=``0``, dry_run=``0``, force=``0``])
+.. class:: CCompiler([verbose=0, dry_run=0, force=0])
 
    The abstract base class :class:`CCompiler` defines the interface that  must be
    implemented by real compiler classes.  The class also has  some utility methods
@@ -431,7 +431,7 @@
       runtime linker may search by default.
 
 
-   .. method:: CCompiler.define_macro(name[, value=``None``])
+   .. method:: CCompiler.define_macro(name[, value=None])
 
       Define a preprocessor macro for all compilations driven by this compiler object.
       The optional parameter *value* should be a string; if it is not supplied, then
@@ -442,11 +442,11 @@
    .. method:: CCompiler.undefine_macro(name)
 
       Undefine a preprocessor macro for all compilations driven by this compiler
-      object.  If the same macro is defined by :meth:`define_macro` and undefined by
-      :meth:`undefine_macro`  the last call takes precedence (including multiple
-      redefinitions or undefinitions).  If the macro is redefined/undefined on a per-
-      compilation basis (ie. in the call to :meth:`compile`), then that takes
-      precedence.
+      object.  If the same macro is defined by :meth:`define_macro` and
+      undefined by :meth:`undefine_macro` the last call takes precedence
+      (including multiple redefinitions or undefinitions).  If the macro is
+      redefined/undefined on a per-compilation basis (ie. in the call to
+      :meth:`compile`), then that takes precedence.
 
 
    .. method:: CCompiler.add_link_object(object)
@@ -473,7 +473,7 @@
       list) to do the job.
 
 
-   .. method:: CCompiler.find_library_file(dirs, lib[, debug=``0``])
+   .. method:: CCompiler.find_library_file(dirs, lib[, debug=0])
 
       Search the specified list of directories for a static or shared library file
       *lib* and return the full path to that file.  If *debug* is true, look for a
@@ -481,7 +481,7 @@
       ``None`` if *lib* wasn't found in any of the specified directories.
 
 
-   .. method:: CCompiler.has_function(funcname [, includes=``None``, include_dirs=``None``, libraries=``None``, library_dirs=``None``])
+   .. method:: CCompiler.has_function(funcname [, includes=None, include_dirs=None, libraries=None, library_dirs=None])
 
       Return a boolean indicating whether *funcname* is supported on the current
       platform.  The optional arguments can be used to augment the compilation
@@ -536,7 +536,7 @@
    The following methods invoke stages in the build process.
 
 
-   .. method:: CCompiler.compile(sources[, output_dir=``None``, macros=``None``, include_dirs=``None``, debug=``0``, extra_preargs=``None``, extra_postargs=``None``, depends=``None``])
+   .. method:: CCompiler.compile(sources[, output_dir=None, macros=None, include_dirs=None, debug=0, extra_preargs=None, extra_postargs=None, depends=None])
 
       Compile one or more source files. Generates object files (e.g.  transforms a
       :file:`.c` file to a :file:`.o` file.)
@@ -580,7 +580,7 @@
       Raises :exc:`CompileError` on failure.
 
 
-   .. method:: CCompiler.create_static_lib(objects, output_libname[, output_dir=``None``, debug=``0``, target_lang=``None``])
+   .. method:: CCompiler.create_static_lib(objects, output_libname[, output_dir=None, debug=0, target_lang=None])
 
       Link a bunch of stuff together to create a static library file. The "bunch of
       stuff" consists of the list of object files supplied as *objects*, the extra
@@ -602,7 +602,7 @@
       Raises :exc:`LibError` on failure.
 
 
-   .. method:: CCompiler.link(target_desc, objects, output_filename[, output_dir=``None``, libraries=``None``, library_dirs=``None``, runtime_library_dirs=``None``, export_symbols=``None``, debug=``0``, extra_preargs=``None``, extra_postargs=``None``, build_temp=``None``, target_lang=``None``])
+   .. method:: CCompiler.link(target_desc, objects, output_filename[, output_dir=None, libraries=None, library_dirs=None, runtime_library_dirs=None, export_symbols=None, debug=0, extra_preargs=None, extra_postargs=None, build_temp=None, target_lang=None])
 
       Link a bunch of stuff together to create an executable or shared library file.
 
@@ -644,28 +644,28 @@
       Raises :exc:`LinkError` on failure.
 
 
-   .. method:: CCompiler.link_executable(objects, output_progname[, output_dir=``None``, libraries=``None``, library_dirs=``None``, runtime_library_dirs=``None``, debug=``0``, extra_preargs=``None``, extra_postargs=``None``, target_lang=``None``])
+   .. method:: CCompiler.link_executable(objects, output_progname[, output_dir=None, libraries=None, library_dirs=None, runtime_library_dirs=None, debug=0, extra_preargs=None, extra_postargs=None, target_lang=None])
 
       Link an executable.  *output_progname* is the name of the file executable, while
       *objects* are a list of object filenames to link in. Other arguments  are as for
       the :meth:`link` method.
 
 
-   .. method:: CCompiler.link_shared_lib(objects, output_libname[, output_dir=``None``, libraries=``None``, library_dirs=``None``, runtime_library_dirs=``None``, export_symbols=``None``, debug=``0``, extra_preargs=``None``, extra_postargs=``None``, build_temp=``None``, target_lang=``None``])
+   .. method:: CCompiler.link_shared_lib(objects, output_libname[, output_dir=None, libraries=None, library_dirs=None, runtime_library_dirs=None, export_symbols=None, debug=0, extra_preargs=None, extra_postargs=None, build_temp=None, target_lang=None])
 
       Link a shared library. *output_libname* is the name of the output  library,
       while *objects* is a list of object filenames to link in.  Other arguments are
       as for the :meth:`link` method.
 
 
-   .. method:: CCompiler.link_shared_object(objects, output_filename[, output_dir=``None``, libraries=``None``, library_dirs=``None``, runtime_library_dirs=``None``, export_symbols=``None``, debug=``0``, extra_preargs=``None``, extra_postargs=``None``, build_temp=``None``, target_lang=``None``])
+   .. method:: CCompiler.link_shared_object(objects, output_filename[, output_dir=None, libraries=None, library_dirs=None, runtime_library_dirs=None, export_symbols=None, debug=0, extra_preargs=None, extra_postargs=None, build_temp=None, target_lang=None])
 
       Link a shared object. *output_filename* is the name of the shared object that
       will be created, while *objects* is a list of object filenames  to link in.
       Other arguments are as for the :meth:`link` method.
 
 
-   .. method:: CCompiler.preprocess(source[, output_file=``None``, macros=``None``, include_dirs=``None``, extra_preargs=``None``, extra_postargs=``None``])
+   .. method:: CCompiler.preprocess(source[, output_file=None, macros=None, include_dirs=None, extra_preargs=None, extra_postargs=None])
 
       Preprocess a single C/C++ source file, named in *source*. Output will be written
       to file named *output_file*, or *stdout* if *output_file* not supplied.
@@ -680,14 +680,14 @@
    use by the various concrete subclasses.
 
 
-   .. method:: CCompiler.executable_filename(basename[, strip_dir=``0``, output_dir=``''``])
+   .. method:: CCompiler.executable_filename(basename[, strip_dir=0, output_dir=''])
 
       Returns the filename of the executable for the given *basename*.  Typically for
       non-Windows platforms this is the same as the basename,  while Windows will get
       a :file:`.exe` added.
 
 
-   .. method:: CCompiler.library_filename(libname[, lib_type=``'static'``, strip_dir=``0``, output_dir=``''``])
+   .. method:: CCompiler.library_filename(libname[, lib_type='static', strip_dir=0, output_dir=''])
 
       Returns the filename for the given library name on the current platform. On Unix
       a library with *lib_type* of ``'static'`` will typically  be of the form
@@ -695,18 +695,18 @@
       :file:`liblibname.so`.
 
 
-   .. method:: CCompiler.object_filenames(source_filenames[, strip_dir=``0``, output_dir=``''``])
+   .. method:: CCompiler.object_filenames(source_filenames[, strip_dir=0, output_dir=''])
 
       Returns the name of the object files for the given source files.
       *source_filenames* should be a list of filenames.
 
 
-   .. method:: CCompiler.shared_object_filename(basename[, strip_dir=``0``, output_dir=``''``])
+   .. method:: CCompiler.shared_object_filename(basename[, strip_dir=0, output_dir=''])
 
       Returns the name of a shared object file for the given file name *basename*.
 
 
-   .. method:: CCompiler.execute(func, args[, msg=``None``, level=``1``])
+   .. method:: CCompiler.execute(func, args[, msg=None, level=1])
 
       Invokes :func:`distutils.util.execute` This method invokes a  Python function
       *func* with the given arguments *args*, after  logging and taking into account
@@ -719,7 +719,7 @@
       the given command. XXX see also.
 
 
-   .. method:: CCompiler.mkpath(name[, mode=``511``])
+   .. method:: CCompiler.mkpath(name[, mode=511])
 
       Invokes :func:`distutils.dir_util.mkpath`. This creates a directory  and any
       missing ancestor directories. XXX see also.
@@ -731,7 +731,7 @@
       also.
 
 
-   .. method:: CCompiler.announce(msg[, level=``1``])
+   .. method:: CCompiler.announce(msg[, level=1])
 
       Write a message using :func:`distutils.log.debug`. XXX see also.
 
@@ -867,7 +867,7 @@
 tarballs or zipfiles.
 
 
-.. function:: make_archive(base_name, format[, root_dir=``None``, base_dir=``None``, verbose=``0``, dry_run=``0``])
+.. function:: make_archive(base_name, format[, root_dir=None, base_dir=None, verbose=0, dry_run=0])
 
    Create an archive file (eg. ``zip`` or ``tar``).  *base_name*  is the name of
    the file to create, minus any format-specific extension;  *format* is the
@@ -883,7 +883,7 @@
       This should be changed to support bz2 files
 
 
-.. function:: make_tarball(base_name, base_dir[, compress=``'gzip'``, verbose=``0``, dry_run=``0``])
+.. function:: make_tarball(base_name, base_dir[, compress='gzip', verbose=0, dry_run=0])
 
    'Create an (optional compressed) archive as a tar file from all files in and
    under *base_dir*. *compress* must be ``'gzip'`` (the default),  ``'compress'``,
@@ -898,7 +898,7 @@
       This should be replaced with calls to the :mod:`tarfile` module.
 
 
-.. function:: make_zipfile(base_name, base_dir[, verbose=``0``, dry_run=``0``])
+.. function:: make_zipfile(base_name, base_dir[, verbose=0, dry_run=0])
 
    Create a zip file from all files in and under *base_dir*.  The output zip file
    will be named *base_dir* + :file:`.zip`.  Uses either the  :mod:`zipfile` Python
@@ -936,7 +936,7 @@
    .. % % equivalent to a listcomp...
 
 
-.. function:: newer_group(sources, target[, missing=``'error'``])
+.. function:: newer_group(sources, target[, missing='error'])
 
    Return true if *target* is out-of-date with respect to any file listed in
    *sources*  In other words, if *target* exists and is newer than every file in
@@ -961,7 +961,7 @@
 directories.
 
 
-.. function:: mkpath(name[, mode=``0777``, verbose=``0``, dry_run=``0``])
+.. function:: mkpath(name[, mode=0777, verbose=0, dry_run=0])
 
    Create a directory and any missing ancestor directories.  If the directory
    already exists (or if *name* is the empty string, which means the current
@@ -972,7 +972,7 @@
    directories actually created.
 
 
-.. function:: create_tree(base_dir, files[, mode=``0777``, verbose=``0``, dry_run=``0``])
+.. function:: create_tree(base_dir, files[, mode=0777, verbose=0, dry_run=0])
 
    Create all the empty directories under *base_dir* needed to put *files* there.
    *base_dir* is just the a name of a directory which doesn't necessarily exist
@@ -982,7 +982,7 @@
    :func:`mkpath`.
 
 
-.. function:: copy_tree(src, dst[preserve_mode=``1``, preserve_times=``1``, preserve_symlinks=``0``, update=``0``, verbose=``0``, dry_run=``0``])
+.. function:: copy_tree(src, dst[, preserve_mode=1, preserve_times=1, preserve_symlinks=0, update=0, verbose=0, dry_run=0])
 
    Copy an entire directory tree *src* to a new location *dst*.  Both *src* and
    *dst* must be directory names.  If *src* is not a directory, raise
@@ -1002,7 +1002,7 @@
    as for :func:`copy_file`.
 
 
-.. function:: remove_tree(directory[verbose=``0``, dry_run=``0``])
+.. function:: remove_tree(directory[, verbose=0, dry_run=0])
 
    Recursively remove *directory* and all files and directories underneath it. Any
    errors are ignored (apart from being reported to ``sys.stdout`` if *verbose* is
@@ -1021,16 +1021,16 @@
 This module contains some utility functions for operating on individual files.
 
 
-.. function:: copy_file(src, dst[preserve_mode=``1``, preserve_times=``1``, update=``0``, link=``None``, verbose=``0``, dry_run=``0``])
+.. function:: copy_file(src, dst[, preserve_mode=1, preserve_times=1, update=0, link=None, verbose=0, dry_run=0])
 
    Copy file *src* to *dst*. If *dst* is a directory, then *src* is copied there
    with the same name; otherwise, it must be a filename. (If the file exists, it
    will be ruthlessly clobbered.) If *preserve_mode* is true (the default), the
-   file's mode (type and permission bits, or whatever is analogous on the current
-   platform) is copied. If *preserve_times* is true (the default), the last-
-   modified and last-access times are copied as well. If *update* is true, *src*
-   will only be copied if *dst* does not exist, or if *dst* does exist but is older
-   than *src*.
+   file's mode (type and permission bits, or whatever is analogous on the
+   current platform) is copied. If *preserve_times* is true (the default), the
+   last-modified and last-access times are copied as well. If *update* is true,
+   *src* will only be copied if *dst* does not exist, or if *dst* does exist but
+   is older than *src*.
 
    *link* allows you to make hard links (using :func:`os.link`) or symbolic links
    (using :func:`os.symlink`) instead of copying: set it to ``'hard'`` or
@@ -1051,7 +1051,7 @@
    .. % (not update) and (src newer than dst)).
 
 
-.. function:: move_file(src, dst[verbose, dry_run])
+.. function:: move_file(src, dst[, verbose, dry_run])
 
    Move file *src* to *dst*. If *dst* is a directory, the file will be moved into
    it with the same name; otherwise, *src* is just renamed to *dst*.  Returns the
@@ -1092,15 +1092,11 @@
 
    Examples of returned values:
 
-* ``linux-i586``
-
-* ``linux-alpha``
-
-* ``solaris-2.6-sun4u``
-
-* ``irix-5.3``
-
-* ``irix64-6.2``
+   * ``linux-i586``
+   * ``linux-alpha``
+   * ``solaris-2.6-sun4u``
+   * ``irix-5.3``
+   * ``irix64-6.2``
 
    For non-POSIX platforms, currently just returns ``sys.platform``.
 
@@ -1130,9 +1126,8 @@
    users can use in config files, command-line options, etc.  Currently this
    includes:
 
-* :envvar:`HOME` - user's home directory (Unix only)
-
-* :envvar:`PLAT` - description of the current platform, including hardware and
+   * :envvar:`HOME` - user's home directory (Unix only)
+   * :envvar:`PLAT` - description of the current platform, including hardware and
      OS (see :func:`get_platform`)
 
 
@@ -1150,7 +1145,7 @@
    underscore. No { } or ( ) style quoting is available.
 
 
-.. function:: grok_environment_error(exc[, prefix=``'error: '``])
+.. function:: grok_environment_error(exc[, prefix='error: '])
 
    Generate a useful error message from an :exc:`EnvironmentError`  (:exc:`IOError`
    or :exc:`OSError`) exception object.   Handles Python 1.5.1 and later styles,
@@ -1173,7 +1168,7 @@
    .. % Should probably be moved into the standard library.
 
 
-.. function:: execute(func, args[, msg=``None``, verbose=``0``, dry_run=``0``])
+.. function:: execute(func, args[, msg=None, verbose=0, dry_run=0])
 
    Perform some action that affects the outside world (for instance, writing to the
    filesystem).  Such actions are special because they are disabled by the
@@ -1191,18 +1186,16 @@
    :exc:`ValueError` if *val*  is anything else.
 
 
-.. function:: byte_compile(py_files[, optimize=``0``, force=``0``, prefix=``None``, base_dir=``None``, verbose=``1``, dry_run=``0``, direct=``None``])
+.. function:: byte_compile(py_files[, optimize=0, force=0, prefix=None, base_dir=None, verbose=1, dry_run=0, direct=None])
 
    Byte-compile a collection of Python source files to either :file:`.pyc` or
    :file:`.pyo` files in the same directory.  *py_files* is a list of files to
    compile; any files that don't end in :file:`.py` are silently skipped.
    *optimize* must be one of the following:
 
-* ``0`` - don't optimize (generate :file:`.pyc`)
-
-* ``1`` - normal optimization (like ``python -O``)
-
-* ``2`` - extra optimization (like ``python -OO``)
+   * ``0`` - don't optimize (generate :file:`.pyc`)
+   * ``1`` - normal optimization (like ``python -O``)
+   * ``2`` - extra optimization (like ``python -OO``)
 
    If *force* is true, all files are recompiled regardless of timestamps.
 
@@ -1333,7 +1326,7 @@
       later).
 
 
-.. class:: FancyGetopt([option_table=``None``])
+.. class:: FancyGetopt([option_table=None])
 
    The option_table is a list of 3-tuples: ``(long_option, short_option,
    help_string)``
@@ -1346,7 +1339,7 @@
 The :class:`FancyGetopt` class provides the following methods:
 
 
-.. method:: FancyGetopt.getopt([args=``None``, object=``None``])
+.. method:: FancyGetopt.getopt([args=None, object=None])
 
    Parse command-line options in args. Store as attributes on *object*.
 
@@ -1367,7 +1360,7 @@
    yet.
 
 
-.. method:: FancyGetopt.generate_help([header=``None``])
+.. method:: FancyGetopt.generate_help([header=None])
 
    Generate help text (a list of strings, one per suggested line of output) from
    the option table for this :class:`FancyGetopt` object.
@@ -1540,7 +1533,7 @@
 lines, and joining lines with backslashes.
 
 
-.. class:: TextFile([filename=``None``, file=``None``, **options])
+.. class:: TextFile([filename=None, file=None, **options])
 
    This class provides a file-like object that takes care of all  the things you
    commonly want to do when processing a text file  that has some line-by-line
@@ -1628,7 +1621,7 @@
       filename and the current line number).
 
 
-   .. method:: TextFile.warn(msg[,line=``None``])
+   .. method:: TextFile.warn(msg[,line=None])
 
       Print (to stderr) a warning message tied to the current logical line in the
       current file.  If the current logical line in the file spans multiple physical
@@ -1952,12 +1945,12 @@
 
 .. method:: Command.finalize_options()
 
-   Set final values for all the options that this command supports. This is always
-   called as late as possible, ie.  after any option assignments from the command-
-   line or from other commands have been done.  Thus, this is the place to to code
-   option dependencies: if *foo* depends on *bar*, then it is safe to set *foo*
-   from  *bar* as long as *foo* still has the same value it was assigned in
-   :meth:`initialize_options`.
+   Set final values for all the options that this command supports. This is
+   always called as late as possible, ie.  after any option assignments from the
+   command-line or from other commands have been done.  Thus, this is the place
+   to to code option dependencies: if *foo* depends on *bar*, then it is safe to
+   set *foo* from *bar* as long as *foo* still has the same value it was
+   assigned in :meth:`initialize_options`.
 
 
 .. method:: Command.run()

Modified: doctools/trunk/Doc-26/extending/building.rst
==============================================================================
--- doctools/trunk/Doc-26/extending/building.rst	(original)
+++ doctools/trunk/Doc-26/extending/building.rst	Sun Aug  5 00:45:13 2007
@@ -47,14 +47,13 @@
 :file:`demo.so` or :file:`demo.pyd`.
 
 In the :file:`setup.py`, all execution is performed by calling the ``setup``
-function. This takes a variable number of keyword  arguments, of which the
-example above uses only a subset. Specifically, the example specifies meta-
-information to build packages, and it specifies the contents of the package.
-Normally, a package will contain of addition modules, like Python source
-modules, documentation, subpackages, etc. Please refer to the distutils
-documentation in :ref:`distutils-index`
-to learn more about the features of distutils; this section explains building
-extension modules only.
+function. This takes a variable number of keyword arguments, of which the
+example above uses only a subset. Specifically, the example specifies
+meta-information to build packages, and it specifies the contents of the
+package.  Normally, a package will contain of addition modules, like Python
+source modules, documentation, subpackages, etc. Please refer to the distutils
+documentation in :ref:`distutils-index` to learn more about the features of
+distutils; this section explains building extension modules only.
 
 It is common to pre-compute arguments to :func:`setup`, to better structure the
 driver script. In the example above, the\ ``ext_modules`` argument to

Modified: doctools/trunk/Doc-26/extending/extending.rst
==============================================================================
--- doctools/trunk/Doc-26/extending/extending.rst	(original)
+++ doctools/trunk/Doc-26/extending/extending.rst	Sun Aug  5 00:45:13 2007
@@ -165,9 +165,9 @@
 
 Every failing :cfunc:`malloc` call must be turned into an exception --- the
 direct caller of :cfunc:`malloc` (or :cfunc:`realloc`) must call
-:cfunc:`PyErr_NoMemory` and return a failure indicator itself.  All the object-
-creating functions (for example, :cfunc:`PyInt_FromLong`) already do this, so
-this note is only relevant to those who call :cfunc:`malloc` directly.
+:cfunc:`PyErr_NoMemory` and return a failure indicator itself.  All the
+object-creating functions (for example, :cfunc:`PyInt_FromLong`) already do
+this, so this note is only relevant to those who call :cfunc:`malloc` directly.
 
 Also note that, with the important exception of :cfunc:`PyArg_ParseTuple` and
 friends, functions that return an integer status usually return a positive value
@@ -332,9 +332,9 @@
 
 When embedding Python, the :cfunc:`initspam` function is not called
 automatically unless there's an entry in the :cdata:`_PyImport_Inittab` table.
-The easiest way to handle this is to  statically initialize your statically-
-linked modules by directly calling :cfunc:`initspam` after the call to
-:cfunc:`Py_Initialize`::
+The easiest way to handle this is to statically initialize your
+statically-linked modules by directly calling :cfunc:`initspam` after the call
+to :cfunc:`Py_Initialize`::
 
    int
    main(int argc, char *argv[])
@@ -488,10 +488,10 @@
    Py_DECREF(arglist);
 
 :cfunc:`PyEval_CallObject` returns a Python object pointer: this is the return
-value of the Python function.  :cfunc:`PyEval_CallObject` is "reference-count-
-neutral" with respect to its arguments.  In the example a new tuple was created
-to serve as the argument list, which is :cfunc:`Py_DECREF`\ -ed immediately
-after the call.
+value of the Python function.  :cfunc:`PyEval_CallObject` is
+"reference-count-neutral" with respect to its arguments.  In the example a new
+tuple was created to serve as the argument list, which is :cfunc:`Py_DECREF`\
+-ed immediately after the call.
 
 The return value of :cfunc:`PyEval_CallObject` is "new": either it is a brand
 new object, or it is an existing object whose reference count has been

Modified: doctools/trunk/Doc-26/extending/newtypes.rst
==============================================================================
--- doctools/trunk/Doc-26/extending/newtypes.rst	(original)
+++ doctools/trunk/Doc-26/extending/newtypes.rst	Sun Aug  5 00:45:13 2007
@@ -700,10 +700,10 @@
    >>> l = [n]
    >>> n.first = l
 
-This is pretty silly, but it gives us an excuse to add support for the cyclic-
-garbage collector to the :class:`Noddy` example.  To support cyclic garbage
-collection, types need to fill two slots and set a class flag that enables these
-slots:
+This is pretty silly, but it gives us an excuse to add support for the
+cyclic-garbage collector to the :class:`Noddy` example.  To support cyclic
+garbage collection, types need to fill two slots and set a class flag that
+enables these slots:
 
 .. literalinclude:: ../includes/noddy4.c
 

Modified: doctools/trunk/Doc-26/howto/advocacy.rst
==============================================================================
--- doctools/trunk/Doc-26/howto/advocacy.rst	(original)
+++ doctools/trunk/Doc-26/howto/advocacy.rst	Sun Aug  5 00:45:13 2007
@@ -232,9 +232,9 @@
 being considered another one of Python's advantages. Most questions posted to
 the comp.lang.python newsgroup are quickly answered by someone.
 
-Should you need to dig into the source code, you'll find it's clear and well-
-organized, so it's not very difficult to write extensions and track down bugs
-yourself.  If you'd prefer to pay for support, there are companies and
+Should you need to dig into the source code, you'll find it's clear and
+well-organized, so it's not very difficult to write extensions and track down
+bugs yourself.  If you'd prefer to pay for support, there are companies and
 individuals who offer commercial support for Python.
 
 **Who uses Python for serious work?**

Modified: doctools/trunk/Doc-26/howto/curses.rst
==============================================================================
--- doctools/trunk/Doc-26/howto/curses.rst	(original)
+++ doctools/trunk/Doc-26/howto/curses.rst	Sun Aug  5 00:45:13 2007
@@ -15,36 +15,37 @@
 What is curses?
 ===============
 
-The curses library supplies a terminal-independent screen-painting and keyboard-
-handling facility for text-based terminals; such terminals include VT100s, the
-Linux console, and the simulated terminal provided by X11 programs such as xterm
-and rxvt.  Display terminals support various control codes to perform common
-operations such as moving the cursor, scrolling the screen, and erasing areas.
-Different terminals use widely differing codes, and often have their own minor
-quirks.
-
-In a world of X displays, one might ask "why bother"?  It's true that character-
-cell display terminals are an obsolete technology, but there are niches in which
-being able to do fancy things with them are still valuable.  One is on small-
-footprint or embedded Unixes that  don't carry an X server.  Another is for
-tools like OS installers and kernel configurators that may have to run before X
-is available.
+The curses library supplies a terminal-independent screen-painting and
+keyboard-handling facility for text-based terminals; such terminals include
+VT100s, the Linux console, and the simulated terminal provided by X11 programs
+such as xterm and rxvt.  Display terminals support various control codes to
+perform common operations such as moving the cursor, scrolling the screen, and
+erasing areas.  Different terminals use widely differing codes, and often have
+their own minor quirks.
+
+In a world of X displays, one might ask "why bother"?  It's true that
+character-cell display terminals are an obsolete technology, but there are
+niches in which being able to do fancy things with them are still valuable.  One
+is on small-footprint or embedded Unixes that don't carry an X server.  Another
+is for tools like OS installers and kernel configurators that may have to run
+before X is available.
 
 The curses library hides all the details of different terminals, and provides
-the programmer with an abstraction of a display, containing multiple non-
-overlapping windows.  The contents of a window can be changed in various ways--
-adding text, erasing it, changing its appearance--and the curses library will
-automagically figure out what control codes need to be sent to the terminal to
-produce the right output.
+the programmer with an abstraction of a display, containing multiple
+non-overlapping windows.  The contents of a window can be changed in various
+ways-- adding text, erasing it, changing its appearance--and the curses library
+will automagically figure out what control codes need to be sent to the terminal
+to produce the right output.
 
 The curses library was originally written for BSD Unix; the later System V
 versions of Unix from AT&T added many enhancements and new functions. BSD curses
-is no longer maintained, having been replaced by ncurses, which is an open-
-source implementation of the AT&T interface.  If you're using an open-source
-Unix such as Linux or FreeBSD, your system almost certainly uses ncurses.  Since
-most current commercial Unix versions are based on System V code, all the
-functions described here will probably be available.  The older versions of
-curses carried by some proprietary Unixes may not support everything, though.
+is no longer maintained, having been replaced by ncurses, which is an
+open-source implementation of the AT&T interface.  If you're using an
+open-source Unix such as Linux or FreeBSD, your system almost certainly uses
+ncurses.  Since most current commercial Unix versions are based on System V
+code, all the functions described here will probably be available.  The older
+versions of curses carried by some proprietary Unixes may not support
+everything, though.
 
 No one has made a Windows port of the curses module.  On a Windows platform, try
 the Console module written by Fredrik Lundh.  The Console module provides

Modified: doctools/trunk/Doc-26/howto/doanddont.rst
==============================================================================
--- doctools/trunk/Doc-26/howto/doanddont.rst	(original)
+++ doctools/trunk/Doc-26/howto/doanddont.rst	Sun Aug  5 00:45:13 2007
@@ -272,8 +272,8 @@
    print reduce(operator.add, nums)/len(nums)
 
 This cute little script prints the average of all numbers given on the command
-line. The :func:`reduce` adds up all the numbers, and the rest is just some pre-
-and postprocessing.
+line. The :func:`reduce` adds up all the numbers, and the rest is just some
+pre- and postprocessing.
 
 On the same note, note that :func:`float`, :func:`int` and :func:`long` all
 accept arguments of type string, and so are suited to parsing --- assuming you

Modified: doctools/trunk/Doc-26/howto/functional.rst
==============================================================================
--- doctools/trunk/Doc-26/howto/functional.rst	(original)
+++ doctools/trunk/Doc-26/howto/functional.rst	Sun Aug  5 00:45:13 2007
@@ -1035,7 +1035,7 @@
 
 
 Grouping elements
-'''''''''''''''''
+-----------------
 
 The last function I'll discuss, ``itertools.groupby(iter, key_func=None)``, is
 the most complicated.  ``key_func(elem)`` is a function that can compute a key

Modified: doctools/trunk/Doc-26/howto/regex.rst
==============================================================================
--- doctools/trunk/Doc-26/howto/regex.rst	(original)
+++ doctools/trunk/Doc-26/howto/regex.rst	Sun Aug  5 00:45:13 2007
@@ -367,9 +367,9 @@
 :file:`Tools/scripts/redemo.py`, a demonstration program included with the
 Python distribution.  It allows you to enter REs and strings, and displays
 whether the RE matches or fails. :file:`redemo.py` can be quite useful when
-trying to debug a complicated RE.  Phil Schwartz's `Kodos <http://www.phil-
-schwartz.com/kodos.spy>`_ is also an interactive tool for developing and testing
-RE patterns.
+trying to debug a complicated RE.  Phil Schwartz's `Kodos
+<http://www.phil-schwartz.com/kodos.spy>`_ is also an interactive tool for
+developing and testing RE patterns.
 
 This HOWTO uses the standard Python interpreter for its examples. First, run the
 Python interpreter, import the :mod:`re` module, and compile a RE::
@@ -708,10 +708,10 @@
    Matches only at the end of the string.
 
 ``\b``
-   Word boundary.   This is a zero-width assertion that matches only at the
+   Word boundary.  This is a zero-width assertion that matches only at the
    beginning or end of a word.  A word is defined as a sequence of alphanumeric
-   characters, so the end of a word is indicated by whitespace or a non-
-   alphanumeric character.
+   characters, so the end of a word is indicated by whitespace or a
+   non-alphanumeric character.
 
    The following example matches ``class`` only when it's a complete word; it won't
    match when it's contained inside another word. ::
@@ -1057,7 +1057,7 @@
 :func:`re.split` function, too.
 
 
-.. method:: .split(string [, maxsplit\ ``= 0``])
+.. method:: .split(string [, maxsplit=0])
    :noindex:
 
    Split *string* by the matches of the regular expression.  If capturing
@@ -1108,7 +1108,7 @@
 which can be either a string or a function, and the string to be processed.
 
 
-.. method:: .sub(replacement, string[, count\ ``= 0``])
+.. method:: .sub(replacement, string[, count=0])
    :noindex:
 
    Returns the string obtained by replacing the leftmost non-overlapping
@@ -1307,11 +1307,11 @@
    >>> print re.match('<.*?>', s).group()
    <html>
 
-(Note that parsing HTML or XML with regular expressions is painful. Quick-and-
-dirty patterns will handle common cases, but HTML and XML have special cases
-that will break the obvious regular expression; by the time you've written a
-regular expression that handles all of the possible cases, the patterns will be
-*very* complicated.  Use an HTML or XML parser module for such tasks.)
+(Note that parsing HTML or XML with regular expressions is painful.
+Quick-and-dirty patterns will handle common cases, but HTML and XML have special
+cases that will break the obvious regular expression; by the time you've written
+a regular expression that handles all of the possible cases, the patterns will
+be *very* complicated.  Use an HTML or XML parser module for such tasks.)
 
 
 Not Using re.VERBOSE
@@ -1366,9 +1366,9 @@
 Friedl's Mastering Regular Expressions, published by O'Reilly.  Unfortunately,
 it exclusively concentrates on Perl and Java's flavours of regular expressions,
 and doesn't contain any Python material at all, so it won't be useful as a
-reference for programming in Python.  (The first edition covered Python's now-
-removed :mod:`regex` module, which won't help you much.)  Consider checking it
-out from your library.
+reference for programming in Python.  (The first edition covered Python's
+now-removed :mod:`regex` module, which won't help you much.)  Consider checking
+it out from your library.
 
 
 .. rubric:: Footnotes

Modified: doctools/trunk/Doc-26/howto/sockets.rst
==============================================================================
--- doctools/trunk/Doc-26/howto/sockets.rst	(original)
+++ doctools/trunk/Doc-26/howto/sockets.rst	Sun Aug  5 00:45:13 2007
@@ -29,8 +29,8 @@
 better behavior and performance from a STREAM socket than anything else. I will
 try to clear up the mystery of what a socket is, as well as some hints on how to
 work with blocking and non-blocking sockets. But I'll start by talking about
-blocking sockets. You'll need to know how they work before dealing with non-
-blocking sockets.
+blocking sockets. You'll need to know how they work before dealing with
+non-blocking sockets.
 
 Part of the trouble with understanding these things is that "socket" can mean a
 number of subtly different things, depending on context. So first, let's make a
@@ -361,12 +361,12 @@
 empty) of the corresponding list you passed in. And if you put a socket in more
 than one input list, it will only be (at most) in one output list.
 
-If a socket is in the output readable list, you can be as-close-to-certain-as-
-we-ever-get-in-this-business that a ``recv`` on that socket will return
-*something*. Same idea for the writable list. You'll be able to send
-*something*. Maybe not all you want to, but *something* is better than nothing.
-(Actually, any reasonably healthy socket will return as writable - it just means
-outbound network buffer space is available.)
+If a socket is in the output readable list, you can be
+as-close-to-certain-as-we-ever-get-in-this-business that a ``recv`` on that
+socket will return *something*. Same idea for the writable list. You'll be able
+to send *something*. Maybe not all you want to, but *something* is better than
+nothing.  (Actually, any reasonably healthy socket will return as writable - it
+just means outbound network buffer space is available.)
 
 If you have a "server" socket, put it in the potential_readers list. If it comes
 out in the readable list, your ``accept`` will (almost certainly) work. If you

Modified: doctools/trunk/Doc-26/howto/urllib2.rst
==============================================================================
--- doctools/trunk/Doc-26/howto/urllib2.rst	(original)
+++ doctools/trunk/Doc-26/howto/urllib2.rst	Sun Aug  5 00:45:13 2007
@@ -432,7 +432,7 @@
 ====================
 
 To illustrate creating and installing a handler we will use the
-``HTTPBasicAuthHandler``. For a more detailed discussion of this subject -
+``HTTPBasicAuthHandler``. For a more detailed discussion of this subject --
 including an explanation of how Basic Authentication works - see the `Basic
 Authentication Tutorial
 <http://www.voidspace.org.uk/python/articles/authentication.shtml>`_.

Modified: doctools/trunk/Doc-26/install/index.rst
==============================================================================
--- doctools/trunk/Doc-26/install/index.rst	(original)
+++ doctools/trunk/Doc-26/install/index.rst	Sun Aug  5 00:45:13 2007
@@ -263,7 +263,7 @@
 can find out what your Python installation uses for :file:`{prefix}` and
 :file:`{exec-prefix}` by running Python in interactive mode and typing a few
 simple commands. Under Unix, just type ``python`` at the shell prompt.  Under
-Windows, choose :menuselection:`Start --> Programs --> Python |version|-->
+Windows, choose :menuselection:`Start --> Programs --> Python X.Y -->
 Python (command line)`.   Once the interpreter is started, you type Python code
 at the prompt.  For example, on my Linux system, I type the three Python
 statements shown below, and get the output as shown, to find out my
@@ -506,8 +506,8 @@
 
 If you want to define an entire installation scheme, you just have to supply all
 of the installation directory options.  The recommended way to do this is to
-supply relative paths; for example, if you want to maintain all Python module-
-related files under :file:`python` in your home directory, and you want a
+supply relative paths; for example, if you want to maintain all Python
+module-related files under :file:`python` in your home directory, and you want a
 separate directory for each platform that you use your home directory from, you
 might define the following installation scheme::
 
@@ -645,8 +645,8 @@
 There are two environment variables that can modify ``sys.path``.
 :envvar:`PYTHONHOME` sets an alternate value for the prefix of the Python
 installation.  For example, if :envvar:`PYTHONHOME` is set to ``/www/python``,
-the search path will be set to ``['', '/www/python/lib/python|version|/',
-'/www/python/lib/python|version|/plat-linux2', ...]``.
+the search path will be set to ``['', '/www/python/lib/pythonX.Y/',
+'/www/python/lib/pythonX.Y/plat-linux2', ...]``.
 
 The :envvar:`PYTHONPATH` variable can be set to a list of paths that will be
 added to the beginning of ``sys.path``.  For example, if :envvar:`PYTHONPATH` is
@@ -812,8 +812,8 @@
 Compiling a Python extension written in C or C++ will sometimes require
 specifying custom flags for the compiler and linker in order to use a particular
 library or produce a special kind of object code. This is especially true if the
-extension hasn't been tested on your  platform, or if you're trying to cross-
-compile Python.
+extension hasn't been tested on your platform, or if you're trying to
+cross-compile Python.
 
 In the most general case, the extension author might have foreseen that
 compiling the extensions would be complicated, and provided a :file:`Setup` file

Modified: doctools/trunk/Doc-26/library/_winreg.rst
==============================================================================
--- doctools/trunk/Doc-26/library/_winreg.rst	(original)
+++ doctools/trunk/Doc-26/library/_winreg.rst	Sun Aug  5 00:45:13 2007
@@ -178,7 +178,7 @@
    :const:`HKEY_LOCAL_MACHINE` tree. This may or may not be true.
 
 
-.. function:: OpenKey(key, sub_key[, res\ ``= 0``][, sam\ ``= KEY_READ``])
+.. function:: OpenKey(key, sub_key[, res=0][, sam=KEY_READ])
 
    Opens the specified key, returning a :dfn:`handle object`
 

Modified: doctools/trunk/Doc-26/library/asyncore.rst
==============================================================================
--- doctools/trunk/Doc-26/library/asyncore.rst	(original)
+++ doctools/trunk/Doc-26/library/asyncore.rst	Sun Aug  5 00:45:13 2007
@@ -23,15 +23,15 @@
 are probably what  you really need. Network servers are rarely processor bound,
 however.
 
-If your operating system supports the :cfunc:`select` system call  in its I/O
-library (and nearly all do), then you can use it to juggle  multiple
-communication channels at once; doing other work while your  I/O is taking place
-in the "background."  Although this strategy can  seem strange and complex,
-especially at first, it is in many ways  easier to understand and control than
-multi-threaded programming.   The :mod:`asyncore` module solves many of the
-difficult problems for  you, making the task of building sophisticated high-
-performance  network servers and clients a snap. For "conversational"
-applications and protocols the companion  :mod:`asynchat` module is invaluable.
+If your operating system supports the :cfunc:`select` system call in its I/O
+library (and nearly all do), then you can use it to juggle multiple
+communication channels at once; doing other work while your I/O is taking place
+in the "background."  Although this strategy can seem strange and complex,
+especially at first, it is in many ways easier to understand and control than
+multi-threaded programming.  The :mod:`asyncore` module solves many of the
+difficult problems for you, making the task of building sophisticated
+high-performance network servers and clients a snap. For "conversational"
+applications and protocols the companion :mod:`asynchat` module is invaluable.
 
 The basic idea behind both modules is to create one or more network *channels*,
 instances of class :class:`asyncore.dispatcher` and

Modified: doctools/trunk/Doc-26/library/binascii.rst
==============================================================================
--- doctools/trunk/Doc-26/library/binascii.rst	(original)
+++ doctools/trunk/Doc-26/library/binascii.rst	Sun Aug  5 00:45:13 2007
@@ -16,8 +16,8 @@
 binary and various ASCII-encoded binary representations. Normally, you will not
 use these functions directly but use wrapper modules like :mod:`uu`,
 :mod:`base64`, or :mod:`binhex` instead. The :mod:`binascii` module contains
-low-level functions written in C for greater speed that are used by the higher-
-level modules.
+low-level functions written in C for greater speed that are used by the
+higher-level modules.
 
 The :mod:`binascii` module defines the following functions:
 

Modified: doctools/trunk/Doc-26/library/bz2.rst
==============================================================================
--- doctools/trunk/Doc-26/library/bz2.rst	(original)
+++ doctools/trunk/Doc-26/library/bz2.rst	Sun Aug  5 00:45:13 2007
@@ -74,8 +74,8 @@
 
 .. method:: BZ2File.readline([size])
 
-   Return the next line from the file, as a string, retaining newline. A non-
-   negative *size* argument limits the maximum number of bytes to return (an
+   Return the next line from the file, as a string, retaining newline. A
+   non-negative *size* argument limits the maximum number of bytes to return (an
    incomplete line may be returned then). Return an empty string at EOF.
 
 

Modified: doctools/trunk/Doc-26/library/cgi.rst
==============================================================================
--- doctools/trunk/Doc-26/library/cgi.rst	(original)
+++ doctools/trunk/Doc-26/library/cgi.rst	Sun Aug  5 00:45:13 2007
@@ -552,7 +552,7 @@
 .. rubric:: Footnotes
 
 .. [#] Note that some recent versions of the HTML specification do state what order the
-   field values should be supplied in, but knowing whether a request was received
-   from a conforming browser, or even from a browser at all, is tedious and error-
-   prone.
+   field values should be supplied in, but knowing whether a request was
+   received from a conforming browser, or even from a browser at all, is tedious
+   and error-prone.
 

Modified: doctools/trunk/Doc-26/library/chunk.rst
==============================================================================
--- doctools/trunk/Doc-26/library/chunk.rst	(original)
+++ doctools/trunk/Doc-26/library/chunk.rst	Sun Aug  5 00:45:13 2007
@@ -53,18 +53,18 @@
 
 .. class:: Chunk(file[, align, bigendian, inclheader])
 
-   Class which represents a chunk.  The *file* argument is expected to be a file-
-   like object.  An instance of this class is specifically allowed.  The only
-   method that is needed is :meth:`read`.  If the methods :meth:`seek` and
-   :meth:`tell` are present and don't raise an exception, they are also used.  If
-   these methods are present and raise an exception, they are expected to not have
-   altered the object.  If the optional argument *align* is true, chunks are
-   assumed to be aligned on 2-byte boundaries.  If *align* is false, no alignment
-   is assumed.  The default value is true.  If the optional argument *bigendian* is
-   false, the chunk size is assumed to be in little-endian order.  This is needed
-   for WAVE audio files. The default value is true.  If the optional argument
-   *inclheader* is true, the size given in the chunk header includes the size of
-   the header.  The default value is false.
+   Class which represents a chunk.  The *file* argument is expected to be a
+   file-like object.  An instance of this class is specifically allowed.  The
+   only method that is needed is :meth:`read`.  If the methods :meth:`seek` and
+   :meth:`tell` are present and don't raise an exception, they are also used.
+   If these methods are present and raise an exception, they are expected to not
+   have altered the object.  If the optional argument *align* is true, chunks
+   are assumed to be aligned on 2-byte boundaries.  If *align* is false, no
+   alignment is assumed.  The default value is true.  If the optional argument
+   *bigendian* is false, the chunk size is assumed to be in little-endian order.
+   This is needed for WAVE audio files. The default value is true.  If the
+   optional argument *inclheader* is true, the size given in the chunk header
+   includes the size of the header.  The default value is false.
 
 A :class:`Chunk` object supports the following methods:
 

Modified: doctools/trunk/Doc-26/library/cmath.rst
==============================================================================
--- doctools/trunk/Doc-26/library/cmath.rst	(original)
+++ doctools/trunk/Doc-26/library/cmath.rst	Sun Aug  5 00:45:13 2007
@@ -7,12 +7,12 @@
 
 
 This module is always available.  It provides access to mathematical functions
-for complex numbers.  The functions in this module accept integers, floating-
-point numbers or complex numbers as arguments. They will also accept any Python
-object that has either a :meth:`__complex__` or a :meth:`__float__` method:
-these methods are used to convert the object to a complex or floating-point
-number, respectively, and the function is then applied to the result of the
-conversion.
+for complex numbers.  The functions in this module accept integers,
+floating-point numbers or complex numbers as arguments. They will also accept
+any Python object that has either a :meth:`__complex__` or a :meth:`__float__`
+method: these methods are used to convert the object to a complex or
+floating-point number, respectively, and the function is then applied to the
+result of the conversion.
 
 The functions are:
 

Modified: doctools/trunk/Doc-26/library/code.rst
==============================================================================
--- doctools/trunk/Doc-26/library/code.rst	(original)
+++ doctools/trunk/Doc-26/library/code.rst	Sun Aug  5 00:45:13 2007
@@ -73,15 +73,15 @@
    :func:`compile_command`; the default for *filename* is ``'<input>'``, and for
    *symbol* is ``'single'``.  One several things can happen:
 
-* The input is incorrect; :func:`compile_command` raised an exception
+   * The input is incorrect; :func:`compile_command` raised an exception
      (:exc:`SyntaxError` or :exc:`OverflowError`).  A syntax traceback will be
      printed by calling the :meth:`showsyntaxerror` method.  :meth:`runsource`
      returns ``False``.
 
-* The input is incomplete, and more input is required; :func:`compile_command`
+   * The input is incomplete, and more input is required; :func:`compile_command`
      returned ``None``. :meth:`runsource` returns ``True``.
 
-* The input is complete; :func:`compile_command` returned a code object.  The
+   * The input is complete; :func:`compile_command` returned a code object.  The
      code is executed by calling the :meth:`runcode` (which also handles run-time
      exceptions, except for :exc:`SystemExit`). :meth:`runsource` returns ``False``.
 

Modified: doctools/trunk/Doc-26/library/codecs.rst
==============================================================================
--- doctools/trunk/Doc-26/library/codecs.rst	(original)
+++ doctools/trunk/Doc-26/library/codecs.rst	Sun Aug  5 00:45:13 2007
@@ -30,19 +30,19 @@
    argument, the encoding name in all lower case letters, and return a
    :class:`CodecInfo` object having the following attributes:
 
-* ``name`` The name of the encoding;
+   * ``name`` The name of the encoding;
 
-* ``encoder`` The stateless encoding function;
+   * ``encoder`` The stateless encoding function;
 
-* ``decoder`` The stateless decoding function;
+   * ``decoder`` The stateless decoding function;
 
-* ``incrementalencoder`` An incremental encoder class or factory function;
+   * ``incrementalencoder`` An incremental encoder class or factory function;
 
-* ``incrementaldecoder`` An incremental decoder class or factory function;
+   * ``incrementaldecoder`` An incremental decoder class or factory function;
 
-* ``streamwriter`` A stream writer class or factory function;
+   * ``streamwriter`` A stream writer class or factory function;
 
-* ``streamreader`` A stream reader class or factory function.
+   * ``streamreader`` A stream reader class or factory function.
 
    The various functions or classes take the following arguments:
 
@@ -408,15 +408,15 @@
    The :class:`IncrementalEncoder` may implement different error handling schemes
    by providing the *errors* keyword argument. These parameters are predefined:
 
-* ``'strict'`` Raise :exc:`ValueError` (or a subclass); this is the default.
+   * ``'strict'`` Raise :exc:`ValueError` (or a subclass); this is the default.
 
-* ``'ignore'`` Ignore the character and continue with the next.
+   * ``'ignore'`` Ignore the character and continue with the next.
 
-* ``'replace'`` Replace with a suitable replacement character
+   * ``'replace'`` Replace with a suitable replacement character
 
-* ``'xmlcharrefreplace'`` Replace with the appropriate XML character reference
+   * ``'xmlcharrefreplace'`` Replace with the appropriate XML character reference
 
-* ``'backslashreplace'`` Replace with backslashed escape sequences.
+   * ``'backslashreplace'`` Replace with backslashed escape sequences.
 
    The *errors* argument will be assigned to an attribute of the same name.
    Assigning to this attribute makes it possible to switch between different error
@@ -460,11 +460,11 @@
    The :class:`IncrementalDecoder` may implement different error handling schemes
    by providing the *errors* keyword argument. These parameters are predefined:
 
-* ``'strict'`` Raise :exc:`ValueError` (or a subclass); this is the default.
+   * ``'strict'`` Raise :exc:`ValueError` (or a subclass); this is the default.
 
-* ``'ignore'`` Ignore the character and continue with the next.
+   * ``'ignore'`` Ignore the character and continue with the next.
 
-* ``'replace'`` Replace with a suitable replacement character.
+   * ``'replace'`` Replace with a suitable replacement character.
 
    The *errors* argument will be assigned to an attribute of the same name.
    Assigning to this attribute makes it possible to switch between different error
@@ -518,15 +518,15 @@
    The :class:`StreamWriter` may implement different error handling schemes by
    providing the *errors* keyword argument. These parameters are predefined:
 
-* ``'strict'`` Raise :exc:`ValueError` (or a subclass); this is the default.
+   * ``'strict'`` Raise :exc:`ValueError` (or a subclass); this is the default.
 
-* ``'ignore'`` Ignore the character and continue with the next.
+   * ``'ignore'`` Ignore the character and continue with the next.
 
-* ``'replace'`` Replace with a suitable replacement character
+   * ``'replace'`` Replace with a suitable replacement character
 
-* ``'xmlcharrefreplace'`` Replace with the appropriate XML character reference
+   * ``'xmlcharrefreplace'`` Replace with the appropriate XML character reference
 
-* ``'backslashreplace'`` Replace with backslashed escape sequences.
+   * ``'backslashreplace'`` Replace with backslashed escape sequences.
 
    The *errors* argument will be assigned to an attribute of the same name.
    Assigning to this attribute makes it possible to switch between different error
@@ -582,11 +582,11 @@
    The :class:`StreamReader` may implement different error handling schemes by
    providing the *errors* keyword argument. These parameters are defined:
 
-* ``'strict'`` Raise :exc:`ValueError` (or a subclass); this is the default.
+   * ``'strict'`` Raise :exc:`ValueError` (or a subclass); this is the default.
 
-* ``'ignore'`` Ignore the character and continue with the next.
+   * ``'ignore'`` Ignore the character and continue with the next.
 
-* ``'replace'`` Replace with a suitable replacement character.
+   * ``'replace'`` Replace with a suitable replacement character.
 
    The *errors* argument will be assigned to an attribute of the same name.
    Assigning to this attribute makes it possible to switch between different error

Modified: doctools/trunk/Doc-26/library/codeop.rst
==============================================================================
--- doctools/trunk/Doc-26/library/codeop.rst	(original)
+++ doctools/trunk/Doc-26/library/codeop.rst	Sun Aug  5 00:45:13 2007
@@ -10,10 +10,11 @@
 
 .. % LaTeXed from excellent doc-string.
 
-The :mod:`codeop` module provides utilities upon which the Python read-eval-
-print loop can be emulated, as is done in the :mod:`code` module.  As a result,
-you probably don't want to use the module directly; if you want to include such
-a loop in your program you probably want to use the :mod:`code` module instead.
+The :mod:`codeop` module provides utilities upon which the Python
+read-eval-print loop can be emulated, as is done in the :mod:`code` module.  As
+a result, you probably don't want to use the module directly; if you want to
+include such a loop in your program you probably want to use the :mod:`code`
+module instead.
 
 There are two parts to this job:
 

Modified: doctools/trunk/Doc-26/library/cookie.rst
==============================================================================
--- doctools/trunk/Doc-26/library/cookie.rst	(original)
+++ doctools/trunk/Doc-26/library/cookie.rst	Sun Aug  5 00:45:13 2007
@@ -145,19 +145,13 @@
    Morsels are dictionary-like objects, whose set of keys is constant --- the valid
    :rfc:`2109` attributes, which are
 
-* ``expires``
-
-* ``path``
-
-* ``comment``
-
-* ``domain``
-
-* ``max-age``
-
-* ``secure``
-
-* ``version``
+   * ``expires``
+   * ``path``
+   * ``comment``
+   * ``domain``
+   * ``max-age``
+   * ``secure``
+   * ``version``
 
    The keys are case-insensitive.
 

Modified: doctools/trunk/Doc-26/library/cookielib.rst
==============================================================================
--- doctools/trunk/Doc-26/library/cookielib.rst	(original)
+++ doctools/trunk/Doc-26/library/cookielib.rst	Sun Aug  5 00:45:13 2007
@@ -94,10 +94,10 @@
    received in a :mailheader:`Set-Cookie` header with a version cookie-attribute of
    1) are treated according to the RFC 2965 rules.  However, if RFC 2965 handling
    is turned off or :attr:`rfc2109_as_netscape` is True, RFC 2109 cookies are
-   'downgraded' by the :class:`CookieJar` instance to Netscape cookies, by setting
-   the :attr:`version` attribute of the :class:`Cookie` instance to 0.
-   :class:`DefaultCookiePolicy` also provides some parameters to allow some fine-
-   tuning of policy.
+   'downgraded' by the :class:`CookieJar` instance to Netscape cookies, by
+   setting the :attr:`version` attribute of the :class:`Cookie` instance to 0.
+   :class:`DefaultCookiePolicy` also provides some parameters to allow some
+   fine-tuning of policy.
 
 
 .. class:: Cookie()
@@ -320,8 +320,8 @@
 
    .. note::
 
-      This loses information about RFC 2965 cookies, and also about newer or non-
-      standard cookie-attributes such as ``port``.
+      This loses information about RFC 2965 cookies, and also about newer or
+      non-standard cookie-attributes such as ``port``.
 
    .. warning::
 
@@ -608,9 +608,10 @@
 :class:`Cookie` instances have Python attributes roughly corresponding to the
 standard cookie-attributes specified in the various cookie standards.  The
 correspondence is not one-to-one, because there are complicated rules for
-assigning default values, because the ``max-age`` and ``expires`` cookie-
-attributes contain equivalent information, and because RFC 2109 cookies may be
-'downgraded' by :mod:`cookielib` from version 1 to version 0 (Netscape) cookies.
+assigning default values, because the ``max-age`` and ``expires``
+cookie-attributes contain equivalent information, and because RFC 2109 cookies
+may be 'downgraded' by :mod:`cookielib` from version 1 to version 0 (Netscape)
+cookies.
 
 Assignment to these attributes should not be necessary other than in rare
 circumstances in a :class:`CookiePolicy` method.  The class does not enforce
@@ -676,11 +677,11 @@
 
 .. attribute:: Cookie.rfc2109
 
-   True if this cookie was received as an RFC 2109 cookie (ie. the cookie arrived
-   in a :mailheader:`Set-Cookie` header, and the value of the Version cookie-
-   attribute in that header was 1).  This attribute is provided because
-   :mod:`cookielib` may 'downgrade' RFC 2109 cookies to Netscape cookies, in which
-   case :attr:`version` is 0.
+   True if this cookie was received as an RFC 2109 cookie (ie. the cookie
+   arrived in a :mailheader:`Set-Cookie` header, and the value of the Version
+   cookie-attribute in that header was 1).  This attribute is provided because
+   :mod:`cookielib` may 'downgrade' RFC 2109 cookies to Netscape cookies, in
+   which case :attr:`version` is 0.
 
    .. versionadded:: 2.5
 

Modified: doctools/trunk/Doc-26/library/csv.rst
==============================================================================
--- doctools/trunk/Doc-26/library/csv.rst	(original)
+++ doctools/trunk/Doc-26/library/csv.rst	Sun Aug  5 00:45:13 2007
@@ -59,7 +59,7 @@
 The :mod:`csv` module defines the following functions:
 
 
-.. function:: reader(csvfile[, dialect=``'excel'``][, fmtparam])
+.. function:: reader(csvfile[, dialect='excel'][, fmtparam])
 
    Return a reader object which will iterate over lines in the given *csvfile*.
    *csvfile* can be any object which supports the iterator protocol and returns a
@@ -87,7 +87,7 @@
       be split into lines in a manner which preserves the newline characters.
 
 
-.. function:: writer(csvfile[, dialect=``'excel'``][, fmtparam])
+.. function:: writer(csvfile[, dialect='excel'][, fmtparam])
 
    Return a writer object responsible for converting the user's data into delimited
    strings on the given file-like object.  *csvfile* can be any object with a
@@ -143,7 +143,7 @@
 The :mod:`csv` module defines the following classes:
 
 
-.. class:: DictReader(csvfile[, fieldnames=:const:`None`,[, restkey=:const:`None`[, restval=:const:`None`[, dialect=``'excel'``[, *args, **kwds]]]]])
+.. class:: DictReader(csvfile[, fieldnames=:const:None,[, restkey=:const:None[, restval=None[, dialect='excel'[, *args, **kwds]]]]])
 
    Create an object which operates like a regular reader but maps the information
    read into a dict whose keys are given by the optional  *fieldnames* parameter.
@@ -157,7 +157,7 @@
    arguments are passed to the underlying :class:`reader` instance.
 
 
-.. class:: DictWriter(csvfile, fieldnames[, restval=""[, extrasaction=``'raise'``[, dialect=``'excel'``[, *args, **kwds]]]])
+.. class:: DictWriter(csvfile, fieldnames[, restval=''[, extrasaction='raise'[, dialect='excel'[, *args, **kwds]]]])
 
    Create an object which operates like a regular writer but maps dictionaries onto
    output rows.  The *fieldnames* parameter identifies the order in which values in
@@ -202,7 +202,7 @@
 The :class:`Sniffer` class provides two methods:
 
 
-.. method:: Sniffer.sniff(sample[,delimiters=None])
+.. method:: Sniffer.sniff(sample[, delimiters=None])
 
    Analyze the given *sample* and return a :class:`Dialect` subclass reflecting the
    parameters found.  If the optional *delimiters* parameter is given, it is

Modified: doctools/trunk/Doc-26/library/ctypes.rst
==============================================================================
--- doctools/trunk/Doc-26/library/ctypes.rst	(original)
+++ doctools/trunk/Doc-26/library/ctypes.rst	Sun Aug  5 00:45:13 2007
@@ -1910,9 +1910,9 @@
 
 .. function:: string_at(address[, size])
 
-   This function returns the string starting at memory address address. If size is
-   specified, it is used as size, otherwise the string is assumed to be zero-
-   terminated.
+   This function returns the string starting at memory address address. If size
+   is specified, it is used as size, otherwise the string is assumed to be
+   zero-terminated.
 
 
 .. function:: WinError(code=None, descr=None)
@@ -1928,8 +1928,8 @@
 
    This function returns the wide character string starting at memory address
    ``address`` as unicode string. If ``size`` is specified, it is used as the
-   number of characters of the string, otherwise the string is assumed to be zero-
-   terminated.
+   number of characters of the string, otherwise the string is assumed to be
+   zero-terminated.
 
 
 .. _ctypes-data-types:
@@ -2198,9 +2198,9 @@
 
 .. class:: c_wchar_p
 
-   Represents the C ``wchar_t *`` datatype, which must be a pointer to a zero-
-   terminated wide character string. The constructor accepts an integer address, or
-   a string.
+   Represents the C ``wchar_t *`` datatype, which must be a pointer to a
+   zero-terminated wide character string. The constructor accepts an integer
+   address, or a string.
 
 
 .. class:: c_bool

Modified: doctools/trunk/Doc-26/library/curses.rst
==============================================================================
--- doctools/trunk/Doc-26/library/curses.rst	(original)
+++ doctools/trunk/Doc-26/library/curses.rst	Sun Aug  5 00:45:13 2007
@@ -11,8 +11,8 @@
 .. versionchanged:: 1.6
    Added support for the ``ncurses`` library and converted to a package.
 
-The :mod:`curses` module provides an interface to the curses library, the de-
-facto standard for portable advanced terminal handling.
+The :mod:`curses` module provides an interface to the curses library, the
+de-facto standard for portable advanced terminal handling.
 
 While curses is most widely used in the Unix environment, versions are available
 for DOS, OS/2, and possibly other systems as well.  This extension module is
@@ -641,10 +641,10 @@
    attributes *attr*.  The change is then applied to every character position in
    that window:
 
-* The attribute of every character in the window  is changed to the new
+   * The attribute of every character in the window  is changed to the new
      background attribute.
 
-* Wherever  the  former background character appears, it is changed to the new
+   * Wherever  the  former background character appears, it is changed to the new
      background character.
 
 
@@ -1023,7 +1023,7 @@
    *sminrow*, or *smincol* are treated as if they were zero.
 
 
-.. method:: window.scroll([lines\ ``= 1``])
+.. method:: window.scroll([lines=1])
 
    Scroll the screen or scrolling region upward by *lines* lines.
 
@@ -1526,8 +1526,8 @@
 The :mod:`curses.textpad` module provides a :class:`Textbox` class that handles
 elementary text editing in a curses window, supporting a set of keybindings
 resembling those of Emacs (thus, also of Netscape Navigator, BBedit 6.x,
-FrameMaker, and many other programs).  The module also provides a rectangle-
-drawing function useful for framing text boxes or for other purposes.
+FrameMaker, and many other programs).  The module also provides a
+rectangle-drawing function useful for framing text boxes or for other purposes.
 
 The module :mod:`curses.textpad` defines the following function:
 

Modified: doctools/trunk/Doc-26/library/datetime.rst
==============================================================================
--- doctools/trunk/Doc-26/library/datetime.rst	(original)
+++ doctools/trunk/Doc-26/library/datetime.rst	Sun Aug  5 00:45:13 2007
@@ -139,22 +139,17 @@
    Only *days*, *seconds* and *microseconds* are stored internally.  Arguments are
    converted to those units:
 
-* A millisecond is converted to 1000 microseconds.
-
-* A minute is converted to 60 seconds.
-
-* An hour is converted to 3600 seconds.
-
-* A week is converted to 7 days.
+   * A millisecond is converted to 1000 microseconds.
+   * A minute is converted to 60 seconds.
+   * An hour is converted to 3600 seconds.
+   * A week is converted to 7 days.
 
    and days, seconds and microseconds are then normalized so that the
    representation is unique, with
 
-* ``0 <= microseconds < 1000000``
-
-* ``0 <= seconds < 3600*24`` (the number of seconds in one day)
-
-* ``-999999999 <= days <= 999999999``
+   * ``0 <= microseconds < 1000000``
+   * ``0 <= seconds < 3600*24`` (the number of seconds in one day)
+   * ``-999999999 <= days <= 999999999``
 
    If any argument is a float and there are fractional microseconds, the fractional
    microseconds left over from all arguments are combined and their sum is rounded
@@ -291,11 +286,9 @@
    All arguments are required.  Arguments may be ints or longs, in the following
    ranges:
 
-* ``MINYEAR <= year <= MAXYEAR``
-
-* ``1 <= month <= 12``
-
-* ``1 <= day <= number of days in the given month and year``
+   * ``MINYEAR <= year <= MAXYEAR``
+   * ``1 <= month <= 12``
+   * ``1 <= day <= number of days in the given month and year``
 
    If an argument outside those ranges is given, :exc:`ValueError` is raised.
 
@@ -514,19 +507,13 @@
    instance of a :class:`tzinfo` subclass.  The remaining arguments may be ints or
    longs, in the following ranges:
 
-* ``MINYEAR <= year <= MAXYEAR``
-
-* ``1 <= month <= 12``
-
-* ``1 <= day <= number of days in the given month and year``
-
-* ``0 <= hour < 24``
-
-* ``0 <= minute < 60``
-
-* ``0 <= second < 60``
-
-* ``0 <= microsecond < 1000000``
+   * ``MINYEAR <= year <= MAXYEAR``
+   * ``1 <= month <= 12``
+   * ``1 <= day <= number of days in the given month and year``
+   * ``0 <= hour < 24``
+   * ``0 <= minute < 60``
+   * ``0 <= second < 60``
+   * ``0 <= microsecond < 1000000``
 
    If an argument outside those ranges is given, :exc:`ValueError` is raised.
 
@@ -894,13 +881,14 @@
 
 .. method:: datetime.isoformat([sep])
 
-   Return a string representing the date and time in ISO 8601 format, YYYY-MM-
-   DDTHH:MM:SS.mmmmmm or, if :attr:`microsecond` is 0, YYYY-MM-DDTHH:MM:SS
-
-   If :meth:`utcoffset` does not return ``None``, a 6-character string is appended,
-   giving the UTC offset in (signed) hours and minutes: YYYY-MM-
-   DDTHH:MM:SS.mmmmmm+HH:MM or, if :attr:`microsecond` is 0 YYYY-MM-
-   DDTHH:MM:SS+HH:MM
+   Return a string representing the date and time in ISO 8601 format,
+   YYYY-MM-DDTHH:MM:SS.mmmmmm or, if :attr:`microsecond` is 0,
+   YYYY-MM-DDTHH:MM:SS
+
+   If :meth:`utcoffset` does not return ``None``, a 6-character string is
+   appended, giving the UTC offset in (signed) hours and minutes:
+   YYYY-MM-DDTHH:MM:SS.mmmmmm+HH:MM or, if :attr:`microsecond` is 0
+   YYYY-MM-DDTHH:MM:SS+HH:MM
 
    The optional argument *sep* (default ``'T'``) is a one-character separator,
    placed between the date and time portions of the result.  For example, ::
@@ -949,13 +937,10 @@
    :class:`tzinfo` subclass.  The remaining arguments may be ints or longs, in the
    following ranges:
 
-* ``0 <= hour < 24``
-
-* ``0 <= minute < 60``
-
-* ``0 <= second < 60``
-
-* ``0 <= microsecond < 1000000``.
+   * ``0 <= hour < 24``
+   * ``0 <= minute < 60``
+   * ``0 <= second < 60``
+   * ``0 <= microsecond < 1000000``.
 
    If an argument outside those ranges is given, :exc:`ValueError` is raised.  All
    default to ``0`` except *tzinfo*, which defaults to :const:`None`.

Modified: doctools/trunk/Doc-26/library/decimal.rst
==============================================================================
--- doctools/trunk/Doc-26/library/decimal.rst	(original)
+++ doctools/trunk/Doc-26/library/decimal.rst	Sun Aug  5 00:45:13 2007
@@ -509,19 +509,13 @@
 
    The *rounding* option is one of:
 
-* :const:`ROUND_CEILING` (towards :const:`Infinity`),
-
-* :const:`ROUND_DOWN` (towards zero),
-
-* :const:`ROUND_FLOOR` (towards :const:`-Infinity`),
-
-* :const:`ROUND_HALF_DOWN` (to nearest with ties going towards zero),
-
-* :const:`ROUND_HALF_EVEN` (to nearest with ties going to nearest even integer),
-
-* :const:`ROUND_HALF_UP` (to nearest with ties going away from zero), or
-
-* :const:`ROUND_UP` (away from zero).
+   * :const:`ROUND_CEILING` (towards :const:`Infinity`),
+   * :const:`ROUND_DOWN` (towards zero),
+   * :const:`ROUND_FLOOR` (towards :const:`-Infinity`),
+   * :const:`ROUND_HALF_DOWN` (to nearest with ties going towards zero),
+   * :const:`ROUND_HALF_EVEN` (to nearest with ties going to nearest even integer),
+   * :const:`ROUND_HALF_UP` (to nearest with ties going away from zero), or
+   * :const:`ROUND_UP` (away from zero).
 
    The *traps* and *flags* fields list any signals to be set. Generally, new
    contexts should only set traps and leave the flags clear.
@@ -1260,10 +1254,10 @@
 Q. Within a complex calculation, how can I make sure that I haven't gotten a
 spurious result because of insufficient precision or rounding anomalies.
 
-A. The decimal module makes it easy to test results.  A best practice is to re-
-run calculations using greater precision and with various rounding modes. Widely
-differing results indicate insufficient precision, rounding mode issues, ill-
-conditioned inputs, or a numerically unstable algorithm.
+A. The decimal module makes it easy to test results.  A best practice is to
+re-run calculations using greater precision and with various rounding modes.
+Widely differing results indicate insufficient precision, rounding mode issues,
+ill-conditioned inputs, or a numerically unstable algorithm.
 
 Q. I noticed that context precision is applied to the results of operations but
 not to the inputs.  Is there anything to watch out for when mixing values of

Modified: doctools/trunk/Doc-26/library/difflib.rst
==============================================================================
--- doctools/trunk/Doc-26/library/difflib.rst	(original)
+++ doctools/trunk/Doc-26/library/difflib.rst	Sun Aug  5 00:45:13 2007
@@ -34,10 +34,10 @@
 
 .. class:: Differ
 
-   This is a class for comparing sequences of lines of text, and producing human-
-   readable differences or deltas.  Differ uses :class:`SequenceMatcher` both to
-   compare sequences of lines, and to compare sequences of characters within
-   similar (near-matching) lines.
+   This is a class for comparing sequences of lines of text, and producing
+   human-readable differences or deltas.  Differ uses :class:`SequenceMatcher`
+   both to compare sequences of lines, and to compare sequences of characters
+   within similar (near-matching) lines.
 
    Each line of a :class:`Differ` delta begins with a two-letter code:
 

Modified: doctools/trunk/Doc-26/library/dis.rst
==============================================================================
--- doctools/trunk/Doc-26/library/dis.rst	(original)
+++ doctools/trunk/Doc-26/library/dis.rst	Sun Aug  5 00:45:13 2007
@@ -50,19 +50,13 @@
    Disassembles a code object, indicating the last instruction if *lasti* was
    provided.  The output is divided in the following columns:
 
-#. the line number, for the first instruction of each line
-
-#. the current instruction, indicated as ``-->``,
-
-#. a labelled instruction, indicated with ``>>``,
-
-#. the address of the instruction,
-
-#. the operation code name,
-
-#. operation parameters, and
-
-#. interpretation of the parameters in parentheses.
+   #. the line number, for the first instruction of each line
+   #. the current instruction, indicated as ``-->``,
+   #. a labelled instruction, indicated with ``>>``,
+   #. the address of the instruction,
+   #. the operation code name,
+   #. operation parameters, and
+   #. interpretation of the parameters in parentheses.
 
    The parameter interpretation recognizes local and global variable names,
    constant values, branch targets, and compare operators.
@@ -541,8 +535,8 @@
 
 .. opcode:: UNPACK_SEQUENCE (count)
 
-   Unpacks TOS into *count* individual values, which are put onto the stack right-
-   to-left.
+   Unpacks TOS into *count* individual values, which are put onto the stack
+   right-to-left.
 
 .. % \begin{opcodedesc}{UNPACK_LIST}{count}
 .. % This opcode is obsolete.

Modified: doctools/trunk/Doc-26/library/dl.rst
==============================================================================
--- doctools/trunk/Doc-26/library/dl.rst	(original)
+++ doctools/trunk/Doc-26/library/dl.rst	Sun Aug  5 00:45:13 2007
@@ -28,7 +28,7 @@
 The :mod:`dl` module defines the following function:
 
 
-.. function:: open(name[, mode\ ``= RTLD_LAZY``])
+.. function:: open(name[, mode=RTLD_LAZY])
 
    Open a shared object file, and return a handle. Mode signifies late binding
    (:const:`RTLD_LAZY`) or immediate binding (:const:`RTLD_NOW`). Default is

Modified: doctools/trunk/Doc-26/library/doctest.rst
==============================================================================
--- doctools/trunk/Doc-26/library/doctest.rst	(original)
+++ doctools/trunk/Doc-26/library/doctest.rst	Sun Aug  5 00:45:13 2007
@@ -435,10 +435,10 @@
 are ignored by doctest.  The traceback stack is typically omitted, or copied
 verbatim from an interactive session.
 
-The traceback stack is followed by the most interesting part:  the line(s)
+The traceback stack is followed by the most interesting part: the line(s)
 containing the exception type and detail.  This is usually the last line of a
-traceback, but can extend across multiple lines if the exception has a multi-
-line detail::
+traceback, but can extend across multiple lines if the exception has a
+multi-line detail::
 
    >>> raise ValueError('multi\n    line\ndetail')
    Traceback (most recent call last):
@@ -823,14 +823,14 @@
    Optional argument *module_relative* specifies how the filename should be
    interpreted:
 
-* If *module_relative* is ``True`` (the default), then *filename* specifies an
+   * If *module_relative* is ``True`` (the default), then *filename* specifies an
      OS-independent module-relative path.  By default, this path is relative to the
      calling module's directory; but if the *package* argument is specified, then it
      is relative to that package.  To ensure OS-independence, *filename* should use
      ``/`` characters to separate path segments, and may not be an absolute path
      (i.e., it may not begin with ``/``).
 
-* If *module_relative* is ``False``, then *filename* specifies an OS-specific
+   * If *module_relative* is ``False``, then *filename* specifies an OS-specific
      path.  The path may be absolute or relative; relative paths are resolved with
      respect to the current working directory.
 
@@ -1000,14 +1000,14 @@
    Optional argument *module_relative* specifies how the filenames in *paths*
    should be interpreted:
 
-* If *module_relative* is ``True`` (the default), then each filename specifies
+   * If *module_relative* is ``True`` (the default), then each filename specifies
      an OS-independent module-relative path.  By default, this path is relative to
      the calling module's directory; but if the *package* argument is specified, then
      it is relative to that package.  To ensure OS-independence, each filename should
      use ``/`` characters to separate path segments, and may not be an absolute path
      (i.e., it may not begin with ``/``).
 
-* If *module_relative* is ``False``, then each filename specifies an OS-specific
+   * If *module_relative* is ``False``, then each filename specifies an OS-specific
      path.  The path may be absolute or relative; relative paths are resolved with
      respect to the current working directory.
 
@@ -1074,8 +1074,8 @@
    Optional argument *extraglobs* specifies an extra set of global variables, which
    is merged into *globs*.  By default, no extra globals are used.
 
-   Optional argument *test_finder* is the :class:`DocTestFinder` object (or a drop-
-   in replacement) that is used to extract doctests from the module.
+   Optional argument *test_finder* is the :class:`DocTestFinder` object (or a
+   drop-in replacement) that is used to extract doctests from the module.
 
    Optional arguments *setUp*, *tearDown*, and *optionflags* are the same as for
    function :func:`DocFileSuite` above.
@@ -1346,15 +1346,15 @@
    If the module is not specified or is None, then the test finder will attempt to
    automatically determine the correct module.  The object's module is used:
 
-* As a default namespace, if *globs* is not specified.
+   * As a default namespace, if *globs* is not specified.
 
-* To prevent the DocTestFinder from extracting DocTests from objects that are
+   * To prevent the DocTestFinder from extracting DocTests from objects that are
      imported from other modules.  (Contained objects with modules other than
      *module* are ignored.)
 
-* To find the name of the file containing the object.
+   * To find the name of the file containing the object.
 
-* To help find the line number of the object within its file.
+   * To help find the line number of the object within its file.
 
    If *module* is ``False``, no attempt to find the module will be made.  This is
    obscure, of use mostly in testing doctest itself: if *module* is ``False``, or

Modified: doctools/trunk/Doc-26/library/email.charset.rst
==============================================================================
--- doctools/trunk/Doc-26/library/email.charset.rst	(original)
+++ doctools/trunk/Doc-26/library/email.charset.rst	Sun Aug  5 00:45:13 2007
@@ -149,8 +149,8 @@
 
 .. method:: Charset.encoded_header_len()
 
-   Return the length of the encoded header string, properly calculating for quoted-
-   printable or base64 encoding.
+   Return the length of the encoded header string, properly calculating for
+   quoted-printable or base64 encoding.
 
 
 .. method:: Charset.header_encode(s[, convert])
@@ -210,11 +210,11 @@
    *charset* is the input character set, and must be the canonical name of a
    character set.
 
-   Optional *header_enc* and *body_enc* is either ``Charset.QP`` for quoted-
-   printable, ``Charset.BASE64`` for base64 encoding, ``Charset.SHORTEST`` for the
-   shortest of quoted-printable or base64 encoding, or ``None`` for no encoding.
-   ``SHORTEST`` is only valid for *header_enc*. The default is ``None`` for no
-   encoding.
+   Optional *header_enc* and *body_enc* is either ``Charset.QP`` for
+   quoted-printable, ``Charset.BASE64`` for base64 encoding,
+   ``Charset.SHORTEST`` for the shortest of quoted-printable or base64 encoding,
+   or ``None`` for no encoding.  ``SHORTEST`` is only valid for
+   *header_enc*. The default is ``None`` for no encoding.
 
    Optional *output_charset* is the character set that the output should be in.
    Conversions will proceed from input charset, to Unicode, to the output charset

Modified: doctools/trunk/Doc-26/library/email.generator.rst
==============================================================================
--- doctools/trunk/Doc-26/library/email.generator.rst	(original)
+++ doctools/trunk/Doc-26/library/email.generator.rst	Sun Aug  5 00:45:13 2007
@@ -100,17 +100,17 @@
    string that is used instead of the message payload. *fmt* is expanded with the
    following keywords, ``%(keyword)s`` format:
 
-* ``type`` -- Full MIME type of the non-\ :mimetype:`text` part
+   * ``type`` -- Full MIME type of the non-\ :mimetype:`text` part
 
-* ``maintype`` -- Main MIME type of the non-\ :mimetype:`text` part
+   * ``maintype`` -- Main MIME type of the non-\ :mimetype:`text` part
 
-* ``subtype`` -- Sub-MIME type of the non-\ :mimetype:`text` part
+   * ``subtype`` -- Sub-MIME type of the non-\ :mimetype:`text` part
 
-* ``filename`` -- Filename of the non-\ :mimetype:`text` part
+   * ``filename`` -- Filename of the non-\ :mimetype:`text` part
 
-* ``description`` -- Description associated with the non-\ :mimetype:`text` part
+   * ``description`` -- Description associated with the non-\ :mimetype:`text` part
 
-* ``encoding`` -- Content transfer encoding of the non-\ :mimetype:`text` part
+   * ``encoding`` -- Content transfer encoding of the non-\ :mimetype:`text` part
 
    The default value for *fmt* is ``None``, meaning ::
 

Modified: doctools/trunk/Doc-26/library/email.message.rst
==============================================================================
--- doctools/trunk/Doc-26/library/email.message.rst	(original)
+++ doctools/trunk/Doc-26/library/email.message.rst	Sun Aug  5 00:45:13 2007
@@ -15,10 +15,10 @@
 value are separated by a colon.  The colon is not part of either the field name
 or the field value.
 
-Headers are stored and returned in case-preserving form but are matched case-
-insensitively.  There may also be a single envelope header, also known as the
-*Unix-From* header or the ``From_`` header.  The payload is either a string in
-the case of simple message objects or a list of :class:`Message` objects for
+Headers are stored and returned in case-preserving form but are matched
+case-insensitively.  There may also be a single envelope header, also known as
+the *Unix-From* header or the ``From_`` header.  The payload is either a string
+in the case of simple message objects or a list of :class:`Message` objects for
 MIME container documents (e.g. :mimetype:`multipart/\*` and
 :mimetype:`message/rfc822`).
 

Modified: doctools/trunk/Doc-26/library/email.parser.rst
==============================================================================
--- doctools/trunk/Doc-26/library/email.parser.rst	(original)
+++ doctools/trunk/Doc-26/library/email.parser.rst	Sun Aug  5 00:45:13 2007
@@ -51,11 +51,11 @@
 The :class:`FeedParser`'s API is simple; you create an instance, feed it a bunch
 of text until there's no more to feed it, then close the parser to retrieve the
 root message object.  The :class:`FeedParser` is extremely accurate when parsing
-standards-compliant messages, and it does a very good job of parsing non-
-compliant messages, providing information about how a message was deemed broken.
-It will populate a message object's *defects* attribute with a list of any
-problems it found in a message.  See the :mod:`email.errors` module for the list
-of defects that it can find.
+standards-compliant messages, and it does a very good job of parsing
+non-compliant messages, providing information about how a message was deemed
+broken.  It will populate a message object's *defects* attribute with a list of
+any problems it found in a message.  See the :mod:`email.errors` module for the
+list of defects that it can find.
 
 Here is the API for the :class:`FeedParser`:
 
@@ -108,10 +108,10 @@
    The optional *strict* flag is ignored.
 
    .. deprecated:: 2.4
-      Because the :class:`Parser` class is a backward compatible API wrapper around
-      the new-in-Python 2.4 :class:`FeedParser`, *all* parsing is effectively non-
-      strict.  You should simply stop passing a *strict* flag to the :class:`Parser`
-      constructor.
+      Because the :class:`Parser` class is a backward compatible API wrapper
+      around the new-in-Python 2.4 :class:`FeedParser`, *all* parsing is
+      effectively non-strict.  You should simply stop passing a *strict* flag to
+      the :class:`Parser` constructor.
 
    .. versionchanged:: 2.2.2
       The *strict* flag was added.
@@ -129,10 +129,10 @@
    the :meth:`read` methods on file-like objects.
 
    The text contained in *fp* must be formatted as a block of :rfc:`2822` style
-   headers and header continuation lines, optionally preceded by a envelope header.
-   The header block is terminated either by the end of the data or by a blank line.
-   Following the header block is the body of the message (which may contain MIME-
-   encoded subparts).
+   headers and header continuation lines, optionally preceded by a envelope
+   header.  The header block is terminated either by the end of the data or by a
+   blank line.  Following the header block is the body of the message (which may
+   contain MIME-encoded subparts).
 
    Optional *headersonly* is as with the :meth:`parse` method.
 

Modified: doctools/trunk/Doc-26/library/errno.rst
==============================================================================
--- doctools/trunk/Doc-26/library/errno.rst	(original)
+++ doctools/trunk/Doc-26/library/errno.rst	Sun Aug  5 00:45:13 2007
@@ -8,8 +8,8 @@
 
 This module makes available standard ``errno`` system symbols. The value of each
 symbol is the corresponding integer value. The names and descriptions are
-borrowed from :file:`linux/include/errno.h`, which should be pretty all-
-inclusive.
+borrowed from :file:`linux/include/errno.h`, which should be pretty
+all-inclusive.
 
 
 .. data:: errorcode

Modified: doctools/trunk/Doc-26/library/fcntl.rst
==============================================================================
--- doctools/trunk/Doc-26/library/fcntl.rst	(original)
+++ doctools/trunk/Doc-26/library/fcntl.rst	Sun Aug  5 00:45:13 2007
@@ -104,29 +104,26 @@
    the file descriptor of the file to lock or unlock, and *operation* is one of the
    following values:
 
-* :const:`LOCK_UN` -- unlock
-
-* :const:`LOCK_SH` -- acquire a shared lock
-
-* :const:`LOCK_EX` -- acquire an exclusive lock
-
-   When *operation* is :const:`LOCK_SH` or :const:`LOCK_EX`, it can also be bit-
-   wise OR'd with :const:`LOCK_NB` to avoid blocking on lock acquisition.  If
-   :const:`LOCK_NB` is used and the lock cannot be acquired, an :exc:`IOError` will
-   be raised and the exception will have an *errno* attribute set to
-   :const:`EACCES` or :const:`EAGAIN` (depending on the operating system; for
-   portability, check for both values).  On at least some systems, :const:`LOCK_EX`
-   can only be used if the file descriptor refers to a file opened for writing.
+   * :const:`LOCK_UN` -- unlock
+   * :const:`LOCK_SH` -- acquire a shared lock
+   * :const:`LOCK_EX` -- acquire an exclusive lock
+
+   When *operation* is :const:`LOCK_SH` or :const:`LOCK_EX`, it can also be
+   bit-wise OR'd with :const:`LOCK_NB` to avoid blocking on lock acquisition.
+   If :const:`LOCK_NB` is used and the lock cannot be acquired, an
+   :exc:`IOError` will be raised and the exception will have an *errno*
+   attribute set to :const:`EACCES` or :const:`EAGAIN` (depending on the
+   operating system; for portability, check for both values).  On at least some
+   systems, :const:`LOCK_EX` can only be used if the file descriptor refers to a
+   file opened for writing.
 
    *length* is the number of bytes to lock, *start* is the byte offset at which the
    lock starts, relative to *whence*, and *whence* is as with :func:`fileobj.seek`,
    specifically:
 
-* :const:`0` -- relative to the start of the file (:const:`SEEK_SET`)
-
-* :const:`1` -- relative to the current buffer position (:const:`SEEK_CUR`)
-
-* :const:`2` -- relative to the end of the file (:const:`SEEK_END`)
+   * :const:`0` -- relative to the start of the file (:const:`SEEK_SET`)
+   * :const:`1` -- relative to the current buffer position (:const:`SEEK_CUR`)
+   * :const:`2` -- relative to the end of the file (:const:`SEEK_END`)
 
    The default for *start* is 0, which means to start at the beginning of the file.
    The default for *length* is 0 which means to lock to the end of the file.  The
@@ -151,7 +148,8 @@
 .. seealso::
 
    Module :mod:`os`
-      If the locking flags :const:`O_SHLOCK` and :const:`O_EXLOCK` are present in the
-      :mod:`os` module, the :func:`os.open` function provides a more platform-
-      independent alternative to the :func:`lockf` and :func:`flock` functions.
+      If the locking flags :const:`O_SHLOCK` and :const:`O_EXLOCK` are present
+      in the :mod:`os` module, the :func:`os.open` function provides a more
+      platform-independent alternative to the :func:`lockf` and :func:`flock`
+      functions.
 

Modified: doctools/trunk/Doc-26/library/formatter.rst
==============================================================================
--- doctools/trunk/Doc-26/library/formatter.rst	(original)
+++ doctools/trunk/Doc-26/library/formatter.rst	Sun Aug  5 00:45:13 2007
@@ -169,7 +169,7 @@
    :const:`AS_IS` values, is passed to the writer's :meth:`new_styles` method.
 
 
-.. method:: formatter.pop_style([n\ ``= 1``])
+.. method:: formatter.pop_style([n=1])
 
    Pop the last *n* style specifications passed to :meth:`push_style`.  A tuple
    representing the revised stack, including :const:`AS_IS` values, is passed to
@@ -181,12 +181,12 @@
    Set the spacing style for the writer.
 
 
-.. method:: formatter.assert_line_data([flag\ ``= 1``])
+.. method:: formatter.assert_line_data([flag=1])
 
-   Inform the formatter that data has been added to the current paragraph out-of-
-   band.  This should be used when the writer has been manipulated directly.  The
-   optional *flag* argument can be set to false if the writer manipulations
-   produced a hard line break at the end of the output.
+   Inform the formatter that data has been added to the current paragraph
+   out-of-band.  This should be used when the writer has been manipulated
+   directly.  The optional *flag* argument can be set to false if the writer
+   manipulations produced a hard line break at the end of the output.
 
 
 .. _formatter-impls:
@@ -341,7 +341,7 @@
    output.
 
 
-.. class:: DumbWriter([file[, maxcol\ ``= 72``]])
+.. class:: DumbWriter([file[, maxcol=72]])
 
    Simple writer class which writes output on the file object passed in as *file*
    or, if *file* is omitted, on standard output.  The output is simply word-wrapped

Modified: doctools/trunk/Doc-26/library/fpectl.rst
==============================================================================
--- doctools/trunk/Doc-26/library/fpectl.rst	(original)
+++ doctools/trunk/Doc-26/library/fpectl.rst	Sun Aug  5 00:45:13 2007
@@ -17,10 +17,10 @@
 
 .. index:: single: IEEE-754
 
-Most computers carry out floating point operations in conformance with the so-
-called IEEE-754 standard. On any real computer, some floating point operations
-produce results that cannot be expressed as a normal floating point value. For
-example, try ::
+Most computers carry out floating point operations in conformance with the
+so-called IEEE-754 standard. On any real computer, some floating point
+operations produce results that cannot be expressed as a normal floating point
+value. For example, try ::
 
    >>> import math
    >>> math.exp(1000)

Modified: doctools/trunk/Doc-26/library/functions.rst
==============================================================================
--- doctools/trunk/Doc-26/library/functions.rst	(original)
+++ doctools/trunk/Doc-26/library/functions.rst	Sun Aug  5 00:45:13 2007
@@ -39,16 +39,17 @@
    its *locals* argument at all, and uses its *globals* only to determine the
    package context of the :keyword:`import` statement.)
 
-   When the *name* variable is of the form ``package.module``, normally, the top-
-   level package (the name up till the first dot) is returned, *not* the module
-   named by *name*.  However, when a non-empty *fromlist* argument is given, the
-   module named by *name* is returned.  This is done for compatibility with the
-   bytecode generated for the different kinds of import statement; when using
-   ``import spam.ham.eggs``, the top-level package :mod:`spam` must be placed in
-   the importing namespace, but when using ``from spam.ham import eggs``, the
-   ``spam.ham`` subpackage must be used to find the ``eggs`` variable.  As a
-   workaround for this behavior, use :func:`getattr` to extract the desired
-   components.  For example, you could define the following helper::
+   When the *name* variable is of the form ``package.module``, normally, the
+   top-level package (the name up till the first dot) is returned, *not* the
+   module named by *name*.  However, when a non-empty *fromlist* argument is
+   given, the module named by *name* is returned.  This is done for
+   compatibility with the bytecode generated for the different kinds of import
+   statement; when using ``import spam.ham.eggs``, the top-level package
+   :mod:`spam` must be placed in the importing namespace, but when using ``from
+   spam.ham import eggs``, the ``spam.ham`` subpackage must be used to find the
+   ``eggs`` variable.  As a workaround for this behavior, use :func:`getattr` to
+   extract the desired components.  For example, you could define the following
+   helper::
 
       def my_import(name):
           mod = __import__(name)
@@ -259,19 +260,19 @@
    keyword is retained in the dictionary. For example, these all return a
    dictionary equal to ``{"one": 2, "two": 3}``:
 
-* ``dict({'one': 2, 'two': 3})``
+   * ``dict({'one': 2, 'two': 3})``
 
-* ``dict({'one': 2, 'two': 3}.items())``
+   * ``dict({'one': 2, 'two': 3}.items())``
 
-* ``dict({'one': 2, 'two': 3}.iteritems())``
+   * ``dict({'one': 2, 'two': 3}.iteritems())``
 
-* ``dict(zip(('one', 'two'), (2, 3)))``
+   * ``dict(zip(('one', 'two'), (2, 3)))``
 
-* ``dict([['two', 3], ['one', 2]])``
+   * ``dict([['two', 3], ['one', 2]])``
 
-* ``dict(one=2, two=3)``
+   * ``dict(one=2, two=3)``
 
-* ``dict([(['one', 'two'][i-2], i) for i in (2, 3)])``
+   * ``dict([(['one', 'two'][i-2], i) for i in (2, 3)])``
 
    .. versionadded:: 2.2
 
@@ -924,18 +925,18 @@
 
    When ``reload(module)`` is executed:
 
-* Python modules' code is recompiled and the module-level code reexecuted,
+   * Python modules' code is recompiled and the module-level code reexecuted,
      defining a new set of objects which are bound to names in the module's
      dictionary.  The ``init`` function of extension modules is not called a second
      time.
 
-* As with all other objects in Python the old objects are only reclaimed after
+   * As with all other objects in Python the old objects are only reclaimed after
      their reference counts drop to zero.
 
-* The names in the module namespace are updated to point to any new or changed
+   * The names in the module namespace are updated to point to any new or changed
      objects.
 
-* Other references to the old objects (such as names external to the module) are
+   * Other references to the old objects (such as names external to the module) are
      not rebound to refer to the new objects and must be updated in each namespace
      where they occur if that is desired.
 

Modified: doctools/trunk/Doc-26/library/gdbm.rst
==============================================================================
--- doctools/trunk/Doc-26/library/gdbm.rst	(original)
+++ doctools/trunk/Doc-26/library/gdbm.rst	Sun Aug  5 00:45:13 2007
@@ -40,13 +40,13 @@
    The following additional characters may be appended to the flag to control how
    the database is opened:
 
-* ``'f'`` --- Open the database in fast mode.  Writes to the database will not
+   * ``'f'`` --- Open the database in fast mode.  Writes to the database will not
      be synchronized.
 
-* ``'s'`` --- Synchronized mode. This will cause changes to the database will be
+   * ``'s'`` --- Synchronized mode. This will cause changes to the database will be
      immediately written to the file.
 
-* ``'u'`` --- Do not lock database.
+   * ``'u'`` --- Do not lock database.
 
    Not all flags are valid for all versions of ``gdbm``.  The module constant
    ``open_flags`` is a string of supported flag characters.  The exception

Modified: doctools/trunk/Doc-26/library/getopt.rst
==============================================================================
--- doctools/trunk/Doc-26/library/getopt.rst	(original)
+++ doctools/trunk/Doc-26/library/getopt.rst	Sun Aug  5 00:45:13 2007
@@ -43,13 +43,13 @@
 
    The return value consists of two elements: the first is a list of ``(option,
    value)`` pairs; the second is the list of program arguments left after the
-   option list was stripped (this is a trailing slice of *args*).  Each option-and-
-   value pair returned has the option as its first element, prefixed with a hyphen
-   for short options (e.g., ``'-x'``) or two hyphens for long options (e.g.,
-   ``'-``\ ``-long-option'``), and the option argument as its second element, or an
-   empty string if the option has no argument.  The options occur in the list in
-   the same order in which they were found, thus allowing multiple occurrences.
-   Long and short options may be mixed.
+   option list was stripped (this is a trailing slice of *args*).  Each
+   option-and-value pair returned has the option as its first element, prefixed
+   with a hyphen for short options (e.g., ``'-x'``) or two hyphens for long
+   options (e.g., ``'-``\ ``-long-option'``), and the option argument as its
+   second element, or an empty string if the option has no argument.  The
+   options occur in the list in the same order in which they were found, thus
+   allowing multiple occurrences.  Long and short options may be mixed.
 
 
 .. function:: gnu_getopt(args, options[, long_options])
@@ -60,8 +60,8 @@
    non-option argument is encountered.
 
    If the first character of the option string is '+', or if the environment
-   variable POSIXLY_CORRECT is set, then option processing stops as soon as a non-
-   option argument is encountered.
+   variable POSIXLY_CORRECT is set, then option processing stops as soon as a
+   non-option argument is encountered.
 
    .. versionadded:: 2.3
 

Modified: doctools/trunk/Doc-26/library/gettext.rst
==============================================================================
--- doctools/trunk/Doc-26/library/gettext.rst	(original)
+++ doctools/trunk/Doc-26/library/gettext.rst	Sun Aug  5 00:45:13 2007
@@ -385,10 +385,10 @@
 ids and message strings read from the catalog are converted to Unicode using
 this encoding.  The :meth:`ugettext` method always returns a Unicode, while the
 :meth:`gettext` returns an encoded 8-bit string.  For the message id arguments
-of both methods, either Unicode strings or 8-bit strings containing only US-
-ASCII characters are acceptable.  Note that the Unicode version of the methods
-(i.e. :meth:`ugettext` and :meth:`ungettext`) are the recommended interface to
-use for internationalized Python programs.
+of both methods, either Unicode strings or 8-bit strings containing only
+US-ASCII characters are acceptable.  Note that the Unicode version of the
+methods (i.e. :meth:`ugettext` and :meth:`ungettext`) are the recommended
+interface to use for internationalized Python programs.
 
 The entire set of key/value pairs are placed into a dictionary and set as the
 "protected" :attr:`_info` instance variable.

Modified: doctools/trunk/Doc-26/library/httplib.rst
==============================================================================
--- doctools/trunk/Doc-26/library/httplib.rst	(original)
+++ doctools/trunk/Doc-26/library/httplib.rst	Sun Aug  5 00:45:13 2007
@@ -100,8 +100,8 @@
 
 .. exception:: InvalidURL
 
-   A subclass of :exc:`HTTPException`, raised if a port is given and is either non-
-   numeric or empty.
+   A subclass of :exc:`HTTPException`, raised if a port is given and is either
+   non-numeric or empty.
 
    .. versionadded:: 2.3
 
@@ -396,11 +396,11 @@
 
    This will send a request to the server using the HTTP request method *method*
    and the selector *url*.  If the *body* argument is present, it should be a
-   string of data to send after the headers are finished. Alternatively, it may be
-   an open file object, in which case the contents of the file is sent; this file
-   object should support ``fileno()`` and ``read()`` methods. The header Content-
-   Length is automatically set to the correct value. The *headers* argument should
-   be a mapping of extra HTTP headers to send with the request.
+   string of data to send after the headers are finished. Alternatively, it may
+   be an open file object, in which case the contents of the file is sent; this
+   file object should support ``fileno()`` and ``read()`` methods. The header
+   Content-Length is automatically set to the correct value. The *headers*
+   argument should be a mapping of extra HTTP headers to send with the request.
 
    .. versionchanged:: 2.6
       *body* can be a file object.

Modified: doctools/trunk/Doc-26/library/imageop.rst
==============================================================================
--- doctools/trunk/Doc-26/library/imageop.rst	(original)
+++ doctools/trunk/Doc-26/library/imageop.rst	Sun Aug  5 00:45:13 2007
@@ -53,8 +53,8 @@
 
 .. function:: dither2mono(image, width, height)
 
-   Convert an 8-bit greyscale image to a 1-bit monochrome image using a (simple-
-   minded) dithering algorithm.
+   Convert an 8-bit greyscale image to a 1-bit monochrome image using a
+   (simple-minded) dithering algorithm.
 
 
 .. function:: mono2grey(image, width, height, p0, p1)
@@ -93,11 +93,12 @@
 
 .. data:: backward_compatible
 
-   If set to 0, the functions in this module use a non-backward compatible way of
-   representing multi-byte pixels on little-endian systems.  The SGI for which this
-   module was originally written is a big-endian system, so setting this variable
-   will have no effect. However, the code wasn't originally intended to run on
-   anything else, so it made assumptions about byte order which are not universal.
-   Setting this variable to 0 will cause the byte order to be reversed on little-
-   endian systems, so that it then is the same as on big-endian systems.
+   If set to 0, the functions in this module use a non-backward compatible way
+   of representing multi-byte pixels on little-endian systems.  The SGI for
+   which this module was originally written is a big-endian system, so setting
+   this variable will have no effect. However, the code wasn't originally
+   intended to run on anything else, so it made assumptions about byte order
+   which are not universal.  Setting this variable to 0 will cause the byte
+   order to be reversed on little-endian systems, so that it then is the same as
+   on big-endian systems.
 

Modified: doctools/trunk/Doc-26/library/imaplib.rst
==============================================================================
--- doctools/trunk/Doc-26/library/imaplib.rst	(original)
+++ doctools/trunk/Doc-26/library/imaplib.rst	Sun Aug  5 00:45:13 2007
@@ -232,8 +232,8 @@
 
 .. method:: IMAP4.getannotation(mailbox, entry, attribute)
 
-   Retrieve the specified ``ANNOTATION``\ s for *mailbox*. The method is non-
-   standard, but is supported by the ``Cyrus`` server.
+   Retrieve the specified ``ANNOTATION``\ s for *mailbox*. The method is
+   non-standard, but is supported by the ``Cyrus`` server.
 
    .. versionadded:: 2.5
 

Modified: doctools/trunk/Doc-26/library/imp.rst
==============================================================================
--- doctools/trunk/Doc-26/library/imp.rst	(original)
+++ doctools/trunk/Doc-26/library/imp.rst	Sun Aug  5 00:45:13 2007
@@ -179,12 +179,12 @@
 
 .. function:: init_frozen(name)
 
-   Initialize the frozen module called *name* and return its module object.  If the
-   module was already initialized, it will be initialized *again*.  If there is no
-   frozen module called *name*, ``None`` is returned.  (Frozen modules are modules
-   written in Python whose compiled byte-code object is incorporated into a custom-
-   built Python interpreter by Python's :program:`freeze` utility. See
-   :file:`Tools/freeze/` for now.)
+   Initialize the frozen module called *name* and return its module object.  If
+   the module was already initialized, it will be initialized *again*.  If there
+   is no frozen module called *name*, ``None`` is returned.  (Frozen modules are
+   modules written in Python whose compiled byte-code object is incorporated
+   into a custom-built Python interpreter by Python's :program:`freeze`
+   utility. See :file:`Tools/freeze/` for now.)
 
 
 .. function:: is_builtin(name)
@@ -242,10 +242,10 @@
 
 .. class:: NullImporter(path_string)
 
-   The :class:`NullImporter` type is a :pep:`302` import hook that handles non-
-   directory path strings by failing to find any modules.  Calling this type with
-   an existing directory or empty string raises :exc:`ImportError`.  Otherwise, a
-   :class:`NullImporter` instance is returned.
+   The :class:`NullImporter` type is a :pep:`302` import hook that handles
+   non-directory path strings by failing to find any modules.  Calling this type
+   with an existing directory or empty string raises :exc:`ImportError`.
+   Otherwise, a :class:`NullImporter` instance is returned.
 
    Python adds instances of this type to ``sys.path_importer_cache`` for any path
    entries that are not directories and are not handled by any other path hooks on

Modified: doctools/trunk/Doc-26/library/inspect.rst
==============================================================================
--- doctools/trunk/Doc-26/library/inspect.rst	(original)
+++ doctools/trunk/Doc-26/library/inspect.rst	Sun Aug  5 00:45:13 2007
@@ -202,12 +202,12 @@
    identified by *path* if it is a module, or ``None`` if it would not be
    identified as a module.  The return tuple is ``(name, suffix, mode, mtype)``,
    where *name* is the name of the module without the name of any enclosing
-   package, *suffix* is the trailing part of the file name (which may not be a dot-
-   delimited extension), *mode* is the :func:`open` mode that would be used
-   (``'r'`` or ``'rb'``), and *mtype* is an integer giving the type of the module.
-   *mtype* will have a value which can be compared to the constants defined in the
-   :mod:`imp` module; see the documentation for that module for more information on
-   module types.
+   package, *suffix* is the trailing part of the file name (which may not be a
+   dot-delimited extension), *mode* is the :func:`open` mode that would be used
+   (``'r'`` or ``'rb'``), and *mtype* is an integer giving the type of the
+   module.  *mtype* will have a value which can be compared to the constants
+   defined in the :mod:`imp` module; see the documentation for that module for
+   more information on module types.
 
 
 .. function:: getmodulename(path)

Modified: doctools/trunk/Doc-26/library/itertools.rst
==============================================================================
--- doctools/trunk/Doc-26/library/itertools.rst	(original)
+++ doctools/trunk/Doc-26/library/itertools.rst	Sun Aug  5 00:45:13 2007
@@ -279,16 +279,16 @@
    last tuple can be pre-padded with fill values using ``izip(*[chain(s,
    [None]*(n-1))]*n)``.
 
-   Note, when :func:`izip` is used with unequal length inputs, subsequent iteration
-   over the longer iterables cannot reliably be continued after :func:`izip`
-   terminates.  Potentially, up to one entry will be missing from each of the left-
-   over iterables. This occurs because a value is fetched from each iterator in-
-   turn, but the process ends when one of the iterators terminates.  This leaves
-   the last fetched values in limbo (they cannot be returned in a final, incomplete
-   tuple and they are cannot be pushed back into the iterator for retrieval with
-   ``it.next()``).  In general, :func:`izip` should only be used with unequal
-   length inputs when you don't care about trailing, unmatched values from the
-   longer iterables.
+   Note, when :func:`izip` is used with unequal length inputs, subsequent
+   iteration over the longer iterables cannot reliably be continued after
+   :func:`izip` terminates.  Potentially, up to one entry will be missing from
+   each of the left-over iterables. This occurs because a value is fetched from
+   each iterator in turn, but the process ends when one of the iterators
+   terminates.  This leaves the last fetched values in limbo (they cannot be
+   returned in a final, incomplete tuple and they are cannot be pushed back into
+   the iterator for retrieval with ``it.next()``).  In general, :func:`izip`
+   should only be used with unequal length inputs when you don't care about
+   trailing, unmatched values from the longer iterables.
 
 
 .. function:: izip_longest(*iterables[, fillvalue])

Modified: doctools/trunk/Doc-26/library/logging.rst
==============================================================================
--- doctools/trunk/Doc-26/library/logging.rst	(original)
+++ doctools/trunk/Doc-26/library/logging.rst	Sun Aug  5 00:45:13 2007
@@ -984,9 +984,9 @@
 ^^^^^^^^^^^^^
 
 The :class:`StreamHandler` class, located in the core :mod:`logging` package,
-sends logging output to streams such as *sys.stdout*, *sys.stderr* or any file-
-like object (or, more precisely, any object which supports :meth:`write` and
-:meth:`flush` methods).
+sends logging output to streams such as *sys.stdout*, *sys.stderr* or any
+file-like object (or, more precisely, any object which supports :meth:`write`
+and :meth:`flush` methods).
 
 
 .. class:: StreamHandler([strm])
@@ -1635,8 +1635,8 @@
 
 .. method:: LogRecord.getMessage()
 
-   Returns the message for this :class:`LogRecord` instance after merging any user-
-   supplied arguments with the message.
+   Returns the message for this :class:`LogRecord` instance after merging any
+   user-supplied arguments with the message.
 
 
 Thread Safety

Modified: doctools/trunk/Doc-26/library/mailbox.rst
==============================================================================
--- doctools/trunk/Doc-26/library/mailbox.rst	(original)
+++ doctools/trunk/Doc-26/library/mailbox.rst	Sun Aug  5 00:45:13 2007
@@ -617,12 +617,13 @@
 the last message, a line containing a Control-Underscore (``'\\037'``)
 character.
 
-Messages in a Babyl mailbox have two sets of headers, original headers and so-
-called visible headers. Visible headers are typically a subset of the original
-headers that have been reformatted or abridged to be more attractive. Each
-message in a Babyl mailbox also has an accompanying list of :dfn:`labels`, or
-short strings that record extra information about the message, and a list of all
-user-defined labels found in the mailbox is kept in the Babyl options section.
+Messages in a Babyl mailbox have two sets of headers, original headers and
+so-called visible headers. Visible headers are typically a subset of the
+original headers that have been reformatted or abridged to be more
+attractive. Each message in a Babyl mailbox also has an accompanying list of
+:dfn:`labels`, or short strings that record extra information about the message,
+and a list of all user-defined labels found in the mailbox is kept in the Babyl
+options section.
 
 :class:`Babyl` instances have all of the methods of :class:`Mailbox` in addition
 to the following:
@@ -772,8 +773,8 @@
 "info" section added to its file name to store information about its state.
 (Some mail readers may also add an "info" section to messages in :file:`new`.)
 The "info" section may take one of two forms: it may contain "2," followed by a
-list of standardized flags (e.g., "2,FR") or it may contain "1," followed by so-
-called experimental information. Standard flags for Maildir messages are as
+list of standardized flags (e.g., "2,FR") or it may contain "1," followed by
+so-called experimental information. Standard flags for Maildir messages are as
 follows:
 
 +------+---------+--------------------------------+
@@ -1540,9 +1541,9 @@
    :class:`UnixMailbox` except that individual messages are separated by only
    ``From`` lines.
 
-   For more information, see `Configuring Netscape Mail on Unix: Why the Content-
-   Length Format is Bad <http://home.netscape.com/eng/mozilla/2.0/relnotes/demo
-   /content-length.html>`_.
+   For more information, see `Configuring Netscape Mail on Unix: Why the
+   Content-Length Format is Bad
+   <http://home.netscape.com/eng/mozilla/2.0/relnotes/demo/content-length.html>`_.
 
 
 .. class:: PortableUnixMailbox(fp[, factory])

Modified: doctools/trunk/Doc-26/library/math.rst
==============================================================================
--- doctools/trunk/Doc-26/library/math.rst	(original)
+++ doctools/trunk/Doc-26/library/math.rst	Sun Aug  5 00:45:13 2007
@@ -209,15 +209,15 @@
 .. note::
 
    The :mod:`math` module consists mostly of thin wrappers around the platform C
-   math library functions.  Behavior in exceptional cases is loosely specified by
-   the C standards, and Python inherits much of its math-function error-reporting
-   behavior from the platform C implementation.  As a result, the specific
-   exceptions raised in error cases (and even whether some arguments are considered
-   to be exceptional at all) are not defined in any useful cross-platform or cross-
-   release way.  For example, whether ``math.log(0)`` returns ``-Inf`` or raises
-   :exc:`ValueError` or :exc:`OverflowError` isn't defined, and in cases where
-   ``math.log(0)`` raises :exc:`OverflowError`, ``math.log(0L)`` may raise
-   :exc:`ValueError` instead.
+   math library functions.  Behavior in exceptional cases is loosely specified
+   by the C standards, and Python inherits much of its math-function
+   error-reporting behavior from the platform C implementation.  As a result,
+   the specific exceptions raised in error cases (and even whether some
+   arguments are considered to be exceptional at all) are not defined in any
+   useful cross-platform or cross-release way.  For example, whether
+   ``math.log(0)`` returns ``-Inf`` or raises :exc:`ValueError` or
+   :exc:`OverflowError` isn't defined, and in cases where ``math.log(0)`` raises
+   :exc:`OverflowError`, ``math.log(0L)`` may raise :exc:`ValueError` instead.
 
 
 .. seealso::

Modified: doctools/trunk/Doc-26/library/mimetypes.rst
==============================================================================
--- doctools/trunk/Doc-26/library/mimetypes.rst	(original)
+++ doctools/trunk/Doc-26/library/mimetypes.rst	Sun Aug  5 00:45:13 2007
@@ -39,11 +39,12 @@
    Encoding suffixes are case sensitive; type suffixes are first tried case
    sensitively, then case insensitively.
 
-   Optional *strict* is a flag specifying whether the list of known MIME types is
-   limited to only the official types `registered with IANA <http://www.isi.edu/in-
-   notes/iana/assignments/media-types>`_ are recognized.  When *strict* is true
-   (the default), only the IANA types are supported; when *strict* is false, some
-   additional non-standard but commonly used MIME types are also recognized.
+   Optional *strict* is a flag specifying whether the list of known MIME types
+   is limited to only the official types `registered with IANA
+   <http://www.isi.edu/in-notes/iana/assignments/media-types>`_ are recognized.
+   When *strict* is true (the default), only the IANA types are supported; when
+   *strict* is false, some additional non-standard but commonly used MIME types
+   are also recognized.
 
 
 .. function:: guess_all_extensions(type[, strict])

Modified: doctools/trunk/Doc-26/library/mimify.rst
==============================================================================
--- doctools/trunk/Doc-26/library/mimify.rst	(original)
+++ doctools/trunk/Doc-26/library/mimify.rst	Sun Aug  5 00:45:13 2007
@@ -11,8 +11,8 @@
    module.  This module is present only to maintain backward compatibility.
 
 The :mod:`mimify` module defines two functions to convert mail messages to and
-from MIME format.  The mail message can be either a simple message or a so-
-called multipart message.  Each part is treated separately. Mimifying (a part
+from MIME format.  The mail message can be either a simple message or a
+so-called multipart message.  Each part is treated separately. Mimifying (a part
 of) a message entails encoding the message as quoted-printable if it contains
 any characters that cannot be represented using 7-bit ASCII.  Unmimifying (a
 part of) a message entails undoing the quoted-printable encoding.  Mimify and
@@ -61,9 +61,9 @@
 
 .. data:: MAXLEN
 
-   By default, a part will be encoded as quoted-printable when it contains any non-
-   ASCII characters (characters with the 8th bit set), or if there are any lines
-   longer than :const:`MAXLEN` characters (default value 200).
+   By default, a part will be encoded as quoted-printable when it contains any
+   non-ASCII characters (characters with the 8th bit set), or if there are any
+   lines longer than :const:`MAXLEN` characters (default value 200).
 
 
 .. data:: CHARSET

Modified: doctools/trunk/Doc-26/library/mmap.rst
==============================================================================
--- doctools/trunk/Doc-26/library/mmap.rst	(original)
+++ doctools/trunk/Doc-26/library/mmap.rst	Sun Aug  5 00:45:13 2007
@@ -147,8 +147,8 @@
 
 .. method:: mmap.size()
 
-   Return the length of the file, which can be larger than the size of the memory-
-   mapped area.
+   Return the length of the file, which can be larger than the size of the
+   memory-mapped area.
 
 
 .. method:: mmap.tell()

Modified: doctools/trunk/Doc-26/library/msilib.rst
==============================================================================
--- doctools/trunk/Doc-26/library/msilib.rst	(original)
+++ doctools/trunk/Doc-26/library/msilib.rst	Sun Aug  5 00:45:13 2007
@@ -424,7 +424,7 @@
    belongs to, and *name* is the control's name.
 
 
-.. method:: Control.event(event, argument[,  condition = ``1''[, ordering]])
+.. method:: Control.event(event, argument[,  condition=1[, ordering]])
 
    Make an entry into the ``ControlEvent`` table for this control.
 

Modified: doctools/trunk/Doc-26/library/multifile.rst
==============================================================================
--- doctools/trunk/Doc-26/library/multifile.rst	(original)
+++ doctools/trunk/Doc-26/library/multifile.rst	Sun Aug  5 00:45:13 2007
@@ -33,8 +33,8 @@
 It will be useful to know that in :class:`MultiFile`'s view of the world, text
 is composed of three kinds of lines: data, section-dividers, and end-markers.
 MultiFile is designed to support parsing of messages that may have multiple
-nested message parts, each with its own pattern for section-divider and end-
-marker lines.
+nested message parts, each with its own pattern for section-divider and
+end-marker lines.
 
 
 .. seealso::
@@ -110,9 +110,9 @@
    return the empty string to indicate end-of-file, until a call to :meth:`pop`
    removes the boundary a or :meth:`next` call reenables it.
 
-   It is possible to push more than one boundary.  Encountering the most-recently-
-   pushed boundary will return EOF; encountering any other boundary will raise an
-   error.
+   It is possible to push more than one boundary.  Encountering the
+   most-recently-pushed boundary will return EOF; encountering any other
+   boundary will raise an error.
 
 
 .. method:: MultiFile.pop()
@@ -122,19 +122,19 @@
 
 .. method:: MultiFile.section_divider(str)
 
-   Turn a boundary into a section-divider line.  By default, this method prepends
-   ``'-``\ ``-'`` (which MIME section boundaries have) but it is declared so it can
-   be overridden in derived classes.  This method need not append LF or CR-LF, as
-   comparison with the result ignores trailing whitespace.
+   Turn a boundary into a section-divider line.  By default, this method
+   prepends ``'--'`` (which MIME section boundaries have) but it is declared so
+   it can be overridden in derived classes.  This method need not append LF or
+   CR-LF, as comparison with the result ignores trailing whitespace.
 
 
 .. method:: MultiFile.end_marker(str)
 
    Turn a boundary string into an end-marker line.  By default, this method
-   prepends ``'-``\ ``-'`` and appends ``'-``\ ``-'`` (like a MIME-multipart end-
-   of-message marker) but it is declared so it can be overridden in derived
-   classes.  This method need not append LF or CR-LF, as comparison with the result
-   ignores trailing whitespace.
+   prepends ``'--'`` and appends ``'--'`` (like a MIME-multipart end-of-message
+   marker) but it is declared so it can be overridden in derived classes.  This
+   method need not append LF or CR-LF, as comparison with the result ignores
+   trailing whitespace.
 
 Finally, :class:`MultiFile` instances have two public instance variables:
 

Modified: doctools/trunk/Doc-26/library/netrc.rst
==============================================================================
--- doctools/trunk/Doc-26/library/netrc.rst	(original)
+++ doctools/trunk/Doc-26/library/netrc.rst	Sun Aug  5 00:45:13 2007
@@ -70,9 +70,9 @@
 
 .. note::
 
-   Passwords are limited to a subset of the ASCII character set. Versions of this
-   module prior to 2.3 were extremely limited.  Starting with 2.3, all ASCII
-   punctuation is allowed in passwords.  However, note that whitespace and non-
-   printable characters are not allowed in passwords.  This is a limitation of the
-   way the .netrc file is parsed and may be removed in the future.
+   Passwords are limited to a subset of the ASCII character set. Versions of
+   this module prior to 2.3 were extremely limited.  Starting with 2.3, all
+   ASCII punctuation is allowed in passwords.  However, note that whitespace and
+   non-printable characters are not allowed in passwords.  This is a limitation
+   of the way the .netrc file is parsed and may be removed in the future.
 

Modified: doctools/trunk/Doc-26/library/new.rst
==============================================================================
--- doctools/trunk/Doc-26/library/new.rst	(original)
+++ doctools/trunk/Doc-26/library/new.rst	Sun Aug  5 00:45:13 2007
@@ -11,8 +11,8 @@
 functions. This is for use primarily in marshal-type functions, when a new
 object needs to be created "magically" and not by using the regular creation
 functions. This module provides a low-level interface to the interpreter, so
-care must be exercised when using this module. It is possible to supply non-
-sensical arguments which crash the interpreter when the object is used.
+care must be exercised when using this module. It is possible to supply
+non-sensical arguments which crash the interpreter when the object is used.
 
 The :mod:`new` module defines the following functions:
 

Modified: doctools/trunk/Doc-26/library/nntplib.rst
==============================================================================
--- doctools/trunk/Doc-26/library/nntplib.rst	(original)
+++ doctools/trunk/Doc-26/library/nntplib.rst	Sun Aug  5 00:45:13 2007
@@ -53,18 +53,18 @@
 
 .. class:: NNTP(host[, port [, user[, password [, readermode] [, usenetrc]]]])
 
-   Return a new instance of the :class:`NNTP` class, representing a connection to
-   the NNTP server running on host *host*, listening at port *port*.  The default
-   *port* is 119.  If the optional *user* and *password* are provided,  or if
-   suitable credentials are present in :file:`/.netrc` and the optional flag
-   *usenetrc* is true (the default), the ``AUTHINFO USER`` and ``AUTHINFO PASS``
-   commands are used to identify and authenticate the user to the server.  If the
-   optional flag *readermode* is true, then a ``mode reader`` command is sent
-   before authentication is performed.  Reader mode is sometimes necessary if you
-   are connecting to an NNTP server on the local machine and intend to call reader-
-   specific commands, such as ``group``.  If you get unexpected
-   :exc:`NNTPPermanentError`\ s, you might need to set *readermode*.  *readermode*
-   defaults to ``None``. *usenetrc* defaults to ``True``.
+   Return a new instance of the :class:`NNTP` class, representing a connection
+   to the NNTP server running on host *host*, listening at port *port*.  The
+   default *port* is 119.  If the optional *user* and *password* are provided,
+   or if suitable credentials are present in :file:`/.netrc` and the optional
+   flag *usenetrc* is true (the default), the ``AUTHINFO USER`` and ``AUTHINFO
+   PASS`` commands are used to identify and authenticate the user to the server.
+   If the optional flag *readermode* is true, then a ``mode reader`` command is
+   sent before authentication is performed.  Reader mode is sometimes necessary
+   if you are connecting to an NNTP server on the local machine and intend to
+   call reader-specific commands, such as ``group``.  If you get unexpected
+   :exc:`NNTPPermanentError`\ s, you might need to set *readermode*.
+   *readermode* defaults to ``None``. *usenetrc* defaults to ``True``.
 
    .. versionchanged:: 2.4
       *usenetrc* argument added.

Modified: doctools/trunk/Doc-26/library/optparse.rst
==============================================================================
--- doctools/trunk/Doc-26/library/optparse.rst	(original)
+++ doctools/trunk/Doc-26/library/optparse.rst	Sun Aug  5 00:45:13 2007
@@ -117,18 +117,18 @@
 
    Some other option syntaxes that the world has seen include:
 
-* a hyphen followed by a few letters, e.g. ``"-pf"`` (this is *not* the same
-  as multiple options merged into a single argument)
+   * a hyphen followed by a few letters, e.g. ``"-pf"`` (this is *not* the same
+     as multiple options merged into a single argument)
 
-* a hyphen followed by a whole word, e.g. ``"-file"`` (this is technically
-  equivalent to the previous syntax, but they aren't usually seen in the same
-  program)
+   * a hyphen followed by a whole word, e.g. ``"-file"`` (this is technically
+     equivalent to the previous syntax, but they aren't usually seen in the same
+     program)
 
-* a plus sign followed by a single letter, or a few letters, or a word, e.g.
-  ``"+f"``, ``"+rgb"``
+   * a plus sign followed by a single letter, or a few letters, or a word, e.g.
+     ``"+f"``, ``"+rgb"``
 
-* a slash followed by a letter, or a few letters, or a word, e.g. ``"/f"``,
-  ``"/file"``
+   * a slash followed by a letter, or a few letters, or a word, e.g. ``"/f"``,
+     ``"/file"``
 
    These option syntaxes are not supported by :mod:`optparse`, and they never will
    be.  This is deliberate: the first three are non-standard on any environment,
@@ -470,8 +470,8 @@
 :mod:`optparse`'s ability to generate help and usage text automatically is
 useful for creating user-friendly command-line interfaces.  All you have to do
 is supply a :attr:`help` value for each option, and optionally a short usage
-message for your whole program.  Here's an OptionParser populated with user-
-friendly (documented) options::
+message for your whole program.  Here's an OptionParser populated with
+user-friendly (documented) options::
 
    usage = "usage: %prog [options] arg1 arg2"
    parser = OptionParser(usage=usage)
@@ -488,9 +488,9 @@
                      help="interaction mode: novice, intermediate, "
                           "or expert [default: %default]")
 
-If :mod:`optparse` encounters either ``"-h"`` or ``"--help"`` on the command-
-line, or if you just call :meth:`parser.print_help`, it prints the following to
-standard output::
+If :mod:`optparse` encounters either ``"-h"`` or ``"--help"`` on the
+command-line, or if you just call :meth:`parser.print_help`, it prints the
+following to standard output::
 
    usage: <yourscript> [options] arg1 arg2
 
@@ -521,12 +521,12 @@
   default: ``"usage: %prog [options]"``, which is fine if your script doesn't take
   any positional arguments.
 
-* every option defines a help string, and doesn't worry about line-
-  wrapping---\ :mod:`optparse` takes care of wrapping lines and making the help
-  output look good.
+* every option defines a help string, and doesn't worry about line-wrapping---
+  :mod:`optparse` takes care of wrapping lines and making the help output look
+  good.
 
-* options that take a value indicate this fact in their automatically-
-  generated help message, e.g. for the "mode" option::
+* options that take a value indicate this fact in their automatically-generated
+  help message, e.g. for the "mode" option::
 
      -m MODE, --mode=MODE
 
@@ -1663,14 +1663,14 @@
 where ``option`` is an :class:`Option` instance, ``opt`` is an option string
 (e.g., ``"-f"``), and ``value`` is the string from the command line that must be
 checked and converted to your desired type.  ``check_mytype()`` should return an
-object of the hypothetical type ``mytype``.  The value returned by a type-
-checking function will wind up in the OptionValues instance returned by
+object of the hypothetical type ``mytype``.  The value returned by a
+type-checking function will wind up in the OptionValues instance returned by
 :meth:`OptionParser.parse_args`, or be passed to a callback as the ``value``
 parameter.
 
 Your type-checking function should raise OptionValueError if it encounters any
-problems.  OptionValueError takes a single string argument, which is passed as-
-is to OptionParser's :meth:`error` method, which in turn prepends the program
+problems.  OptionValueError takes a single string argument, which is passed
+as-is to OptionParser's :meth:`error` method, which in turn prepends the program
 name and the string ``"error:"`` and prints everything to stderr before
 terminating the process.
 

Modified: doctools/trunk/Doc-26/library/os.rst
==============================================================================
--- doctools/trunk/Doc-26/library/os.rst	(original)
+++ doctools/trunk/Doc-26/library/os.rst	Sun Aug  5 00:45:13 2007
@@ -644,9 +644,9 @@
 
 .. function:: ttyname(fd)
 
-   Return a string which specifies the terminal device associated with file-
-   descriptor *fd*.  If *fd* is not associated with a terminal device, an exception
-   is raised. Availability:Macintosh,  Unix.
+   Return a string which specifies the terminal device associated with
+   file-descriptor *fd*.  If *fd* is not associated with a terminal device, an
+   exception is raised. Availability:Macintosh, Unix.
 
 
 .. function:: write(fd, str)
@@ -676,8 +676,8 @@
           O_EXCL
           O_TRUNC
 
-   Options for the *flag* argument to the :func:`open` function. These can be bit-
-   wise OR'd together. Availability: Macintosh, Unix, Windows.
+   Options for the *flag* argument to the :func:`open` function. These can be
+   bit-wise OR'd together. Availability: Macintosh, Unix, Windows.
 
 
 .. data:: O_DSYNC
@@ -695,8 +695,8 @@
 
 .. data:: O_BINARY
 
-   Option for the *flag* argument to the :func:`open` function. This can be bit-
-   wise OR'd together with those listed above. Availability: Windows.
+   Option for the *flag* argument to the :func:`open` function. This can be
+   bit-wise OR'd together with those listed above. Availability: Windows.
 
    .. % XXX need to check on the availability of this one.
 
@@ -708,8 +708,8 @@
           O_SEQUENTIAL
           O_TEXT
 
-   Options for the *flag* argument to the :func:`open` function. These can be bit-
-   wise OR'd together. Availability: Windows.
+   Options for the *flag* argument to the :func:`open` function. These can be
+   bit-wise OR'd together. Availability: Windows.
 
 
 .. data:: SEEK_SET
@@ -813,25 +813,16 @@
    Set the flags of *path* to the numeric *flags*. *flags* may take a combination
    (bitwise OR) of the following values (as defined in the :mod:`stat` module):
 
-* ``UF_NODUMP``
-
-* ``UF_IMMUTABLE``
-
-* ``UF_APPEND``
-
-* ``UF_OPAQUE``
-
-* ``UF_NOUNLINK``
-
-* ``SF_ARCHIVED``
-
-* ``SF_IMMUTABLE``
-
-* ``SF_APPEND``
-
-* ``SF_NOUNLINK``
-
-* ``SF_SNAPSHOT``
+   * ``UF_NODUMP``
+   * ``UF_IMMUTABLE``
+   * ``UF_APPEND``
+   * ``UF_OPAQUE``
+   * ``UF_NOUNLINK``
+   * ``SF_ARCHIVED``
+   * ``SF_IMMUTABLE``
+   * ``SF_APPEND``
+   * ``SF_NOUNLINK``
+   * ``SF_SNAPSHOT``
 
    Availability: Macintosh, Unix.
 
@@ -852,43 +843,26 @@
    following values (as defined in the :mod:`stat` module) or bitwise or-ed
    combinations of them:
 
-* ``stat.S_ISUID``
-
-* ``stat.S_ISGID``
-
-* ``stat.S_ENFMT``
-
-* ``stat.S_ISVTX``
-
-* ``stat.S_IREAD``
-
-* ``stat.S_IWRITE``
-
-* ``stat.S_IEXEC``
-
-* ``stat.S_IRWXU``
-
-* ``stat.S_IRUSR``
-
-* ``stat.S_IWUSR``
-
-* ``stat.S_IXUSR``
-
-* ``stat.S_IRWXG``
-
-* ``stat.S_IRGRP``
-
-* ``stat.S_IWGRP``
-
-* ``stat.S_IXGRP``
-
-* ``stat.S_IRWXO``
-
-* ``stat.S_IROTH``
-
-* ``stat.S_IWOTH``
 
-* ``stat.S_IXOTH``
+   * ``stat.S_ISUID``
+   * ``stat.S_ISGID``
+   * ``stat.S_ENFMT``
+   * ``stat.S_ISVTX``
+   * ``stat.S_IREAD``
+   * ``stat.S_IWRITE``
+   * ``stat.S_IEXEC``
+   * ``stat.S_IRWXU``
+   * ``stat.S_IRUSR``
+   * ``stat.S_IWUSR``
+   * ``stat.S_IXUSR``
+   * ``stat.S_IRWXG``
+   * ``stat.S_IRGRP``
+   * ``stat.S_IWGRP``
+   * ``stat.S_IXGRP``
+   * ``stat.S_IRWXO``
+   * ``stat.S_IROTH``
+   * ``stat.S_IWOTH``
+   * ``stat.S_IXOTH``
 
    Availability: Macintosh, Unix, Windows.
 
@@ -1317,7 +1291,7 @@
    Availability: Macintosh, Unix, Windows.
 
 
-.. function:: walk(top[, topdown\ ``=True`` [, onerror\ ``=None``[, followlinks\ ``=False``]]])
+.. function:: walk(top[, topdown=True [, onerror=None[, followlinks=False]]])
 
    .. index::
       single: directory; walking

Modified: doctools/trunk/Doc-26/library/ossaudiodev.rst
==============================================================================
--- doctools/trunk/Doc-26/library/ossaudiodev.rst	(original)
+++ doctools/trunk/Doc-26/library/ossaudiodev.rst	Sun Aug  5 00:45:13 2007
@@ -78,11 +78,12 @@
    module first looks in the environment variable :envvar:`AUDIODEV` for a device
    to use.  If not found, it falls back to :file:`/dev/dsp`.
 
-   *mode* is one of ``'r'`` for read-only (record) access, ``'w'`` for write-only
-   (playback) access and ``'rw'`` for both. Since many sound cards only allow one
-   process to have the recorder or player open at a time, it is a good idea to open
-   the device only for the activity needed.  Further, some sound cards are half-
-   duplex: they can be opened for reading or writing, but not both at once.
+   *mode* is one of ``'r'`` for read-only (record) access, ``'w'`` for
+   write-only (playback) access and ``'rw'`` for both. Since many sound cards
+   only allow one process to have the recorder or player open at a time, it is a
+   good idea to open the device only for the activity needed.  Further, some
+   sound cards are half-duplex: they can be opened for reading or writing, but
+   not both at once.
 
    Note the unusual calling syntax: the *first* argument is optional, and the
    second is required.  This is a historical artifact for compatibility with the

Modified: doctools/trunk/Doc-26/library/othergui.rst
==============================================================================
--- doctools/trunk/Doc-26/library/othergui.rst	(original)
+++ doctools/trunk/Doc-26/library/othergui.rst	Sun Aug  5 00:45:13 2007
@@ -61,18 +61,18 @@
       Summerfield.
 
    `wxPython <http://www.wxpython.org>`_
-      wxPython is a cross-platform GUI toolkit for Python that is built around the
-      popular `wxWidgets <http://www.wxwidgets.org/>`_ (formerly
-      wxWindows) C++ toolkit.  It provides a
-      native look and feel for applications on Windows, Mac OS X, and Unix systems by
-      using each platform's native widgets where ever possible, (GTK+ on Unix-like
-      systems).  In addition to an extensive set of widgets, wxPython provides classes
-      for online documentation and context sensitive help, printing, HTML viewing,
-      low-level device context drawing, drag and drop, system clipboard access, an
-      XML-based resource format and more, including an ever growing library of user-
-      contributed modules.  wxPython has a book,
-      `wxPython in Action <http://www.amazon.com/exec/obidos/ASIN/1932394621>`_,
-      by Noel Rappin and Robin Dunn.
+      wxPython is a cross-platform GUI toolkit for Python that is built around
+      the popular `wxWidgets <http://www.wxwidgets.org/>`_ (formerly wxWindows)
+      C++ toolkit.  It provides a native look and feel for applications on
+      Windows, Mac OS X, and Unix systems by using each platform's native
+      widgets where ever possible, (GTK+ on Unix-like systems).  In addition to
+      an extensive set of widgets, wxPython provides classes for online
+      documentation and context sensitive help, printing, HTML viewing,
+      low-level device context drawing, drag and drop, system clipboard access,
+      an XML-based resource format and more, including an ever growing library
+      of user-contributed modules.  wxPython has a book, `wxPython in Action
+      <http://www.amazon.com/exec/obidos/ASIN/1932394621>`_, by Noel Rappin and
+      Robin Dunn.
 
 PyGTK, PyQt, and wxPython, all have a modern look and feel and far more
 widgets and better documentation than Tkinter. In addition,

Modified: doctools/trunk/Doc-26/library/parser.rst
==============================================================================
--- doctools/trunk/Doc-26/library/parser.rst	(original)
+++ doctools/trunk/Doc-26/library/parser.rst	Sun Aug  5 00:45:13 2007
@@ -189,7 +189,7 @@
    information is omitted if the flag is false or omitted.
 
 
-.. function:: compileast(ast[, filename\ ``= '<ast>'``])
+.. function:: compileast(ast[, filename='<ast>'])
 
    .. index:: builtin: eval
 

Modified: doctools/trunk/Doc-26/library/pickle.rst
==============================================================================
--- doctools/trunk/Doc-26/library/pickle.rst	(original)
+++ doctools/trunk/Doc-26/library/pickle.rst	Sun Aug  5 00:45:13 2007
@@ -91,8 +91,8 @@
 with the same internal structure.  Perhaps the most obvious thing to do with
 these byte streams is to write them onto a file, but it is also conceivable to
 send them across a network or store them in a database.  The module
-:mod:`shelve` provides a simple interface to pickle and unpickle objects on DBM-
-style database files.
+:mod:`shelve` provides a simple interface to pickle and unpickle objects on
+DBM-style database files.
 
 
 Data stream format
@@ -689,9 +689,9 @@
 
    output.close()
 
-The following example reads the resulting pickled data.  When reading a pickle-
-containing file, you should open the file in binary mode because you can't be
-sure if the ASCII or binary format was used. ::
+The following example reads the resulting pickled data.  When reading a
+pickle-containing file, you should open the file in binary mode because you
+can't be sure if the ASCII or binary format was used. ::
 
    import pprint, pickle
 

Modified: doctools/trunk/Doc-26/library/profile.rst
==============================================================================
--- doctools/trunk/Doc-26/library/profile.rst	(original)
+++ doctools/trunk/Doc-26/library/profile.rst	Sun Aug  5 00:45:13 2007
@@ -295,13 +295,13 @@
 
 .. function:: run(command[, filename])
 
-   This function takes a single argument that can be passed to the :keyword:`exec`
-   statement, and an optional file name.  In all cases this routine attempts to
-   :keyword:`exec` its first argument, and gather profiling statistics from the
-   execution. If no file name is present, then this function automatically prints a
-   simple profiling report, sorted by the standard name string (file/line/function-
-   name) that is presented in each line.  The following is a typical output from
-   such a call::
+   This function takes a single argument that can be passed to the
+   :keyword:`exec` statement, and an optional file name.  In all cases this
+   routine attempts to :keyword:`exec` its first argument, and gather profiling
+   statistics from the execution. If no file name is present, then this function
+   automatically prints a simple profiling report, sorted by the standard name
+   string (file/line/function-name) that is presented in each line.  The
+   following is a typical output from such a call::
 
             2706 function calls (2004 primitive calls) in 4.504 CPU seconds
 
@@ -527,12 +527,12 @@
    argument is also identical.  Each caller is reported on its own line.  The
    format differs slightly depending on the profiler that produced the stats:
 
-* With :mod:`profile`, a number is shown in parentheses after each caller to
-     show how many times this specific call was made.  For convenience, a second non-
-     parenthesized number repeats the cumulative time spent in the function at the
-     right.
+   * With :mod:`profile`, a number is shown in parentheses after each caller to
+     show how many times this specific call was made.  For convenience, a second
+     non-parenthesized number repeats the cumulative time spent in the function
+     at the right.
 
-* With :mod:`cProfile`, each caller is preceeded by three numbers: the number of
+   * With :mod:`cProfile`, each caller is preceeded by three numbers: the number of
      times this specific call was made, and the total and cumulative times spent in
      the current function while it was invoked by this specific caller.
 

Modified: doctools/trunk/Doc-26/library/pyexpat.rst
==============================================================================
--- doctools/trunk/Doc-26/library/pyexpat.rst	(original)
+++ doctools/trunk/Doc-26/library/pyexpat.rst	Sun Aug  5 00:45:13 2007
@@ -20,8 +20,8 @@
 
 .. index:: single: Expat
 
-The :mod:`xml.parsers.expat` module is a Python interface to the Expat non-
-validating XML parser. The module provides a single extension type,
+The :mod:`xml.parsers.expat` module is a Python interface to the Expat
+non-validating XML parser. The module provides a single extension type,
 :class:`xmlparser`, that represents the current state of an XML parser.  After
 an :class:`xmlparser` object has been created, various attributes of the object
 can be set to handler functions.  When an XML document is then fed to the

Modified: doctools/trunk/Doc-26/library/random.rst
==============================================================================
--- doctools/trunk/Doc-26/library/random.rst	(original)
+++ doctools/trunk/Doc-26/library/random.rst	Sun Aug  5 00:45:13 2007
@@ -10,8 +10,8 @@
 distributions.
 
 For integers, uniform selection from a range. For sequences, uniform selection
-of a random element, a function to generate a random permutation of a list in-
-place, and a function for random sampling without replacement.
+of a random element, a function to generate a random permutation of a list
+in-place, and a function for random sampling without replacement.
 
 On the real line, there are functions to compute uniform, normal (Gaussian),
 lognormal, negative exponential, gamma, and beta distributions. For generating

Modified: doctools/trunk/Doc-26/library/re.rst
==============================================================================
--- doctools/trunk/Doc-26/library/re.rst	(original)
+++ doctools/trunk/Doc-26/library/re.rst	Sun Aug  5 00:45:13 2007
@@ -134,10 +134,10 @@
 
 ``{m,n}?``
    Causes the resulting RE to match from *m* to *n* repetitions of the preceding
-   RE, attempting to match as *few* repetitions as possible.  This is the non-
-   greedy version of the previous qualifier.  For example, on the 6-character
-   string ``'aaaaaa'``, ``a{3,5}`` will match 5 ``'a'`` characters, while
-   ``a{3,5}?`` will only match 3 characters.
+   RE, attempting to match as *few* repetitions as possible.  This is the
+   non-greedy version of the previous qualifier.  For example, on the
+   6-character string ``'aaaaaa'``, ``a{3,5}`` will match 5 ``'a'`` characters,
+   while ``a{3,5}?`` will only match 3 characters.
 
 ``'\'``
    Either escapes special characters (permitting you to match characters like
@@ -519,7 +519,7 @@
       If you want to locate a match anywhere in *string*, use :meth:`search` instead.
 
 
-.. function:: split(pattern, string[, maxsplit\ ``= 0``])
+.. function:: split(pattern, string[, maxsplit=0])
 
    Split *string* by the occurrences of *pattern*.  If capturing parentheses are
    used in *pattern*, then the text of all groups in the pattern are also returned
@@ -673,7 +673,7 @@
    :meth:`match` method.
 
 
-.. method:: RegexObject.split(string[, maxsplit\ ``= 0``])
+.. method:: RegexObject.split(string[, maxsplit=0])
 
    Identical to the :func:`split` function, using the compiled pattern.
 
@@ -688,12 +688,12 @@
    Identical to the :func:`finditer` function, using the compiled pattern.
 
 
-.. method:: RegexObject.sub(repl, string[, count\ ``= 0``])
+.. method:: RegexObject.sub(repl, string[, count=0])
 
    Identical to the :func:`sub` function, using the compiled pattern.
 
 
-.. method:: RegexObject.subn(repl, string[, count\ ``= 0``])
+.. method:: RegexObject.subn(repl, string[, count=0])
 
    Identical to the :func:`subn` function, using the compiled pattern.
 

Modified: doctools/trunk/Doc-26/library/repr.rst
==============================================================================
--- doctools/trunk/Doc-26/library/repr.rst	(original)
+++ doctools/trunk/Doc-26/library/repr.rst	Sun Aug  5 00:45:13 2007
@@ -65,8 +65,6 @@
    .. versionadded:: 2.4
       :attr:`maxset`, :attr:`maxfrozenset`, and :attr:`set`.
 
-   .
-
 
 .. attribute:: Repr.maxlong
 

Modified: doctools/trunk/Doc-26/library/rfc822.rst
==============================================================================
--- doctools/trunk/Doc-26/library/rfc822.rst	(original)
+++ doctools/trunk/Doc-26/library/rfc822.rst	Sun Aug  5 00:45:13 2007
@@ -256,9 +256,9 @@
 
 :class:`Message` instances also support a limited mapping interface. In
 particular: ``m[name]`` is like ``m.getheader(name)`` but raises :exc:`KeyError`
-if there is no matching header; and ``len(m)``, ``m.get(name[, *default*])``,
+if there is no matching header; and ``len(m)``, ``m.get(name[, default])``,
 ``m.has_key(name)``, ``m.keys()``, ``m.values()`` ``m.items()``, and
-``m.setdefault(name[, *default*])`` act as expected, with the one difference
+``m.setdefault(name[, default])`` act as expected, with the one difference
 that :meth:`setdefault` uses an empty string as the default value.
 :class:`Message` instances also support the mapping writable interface ``m[name]
 = value`` and ``del m[name]``.  :class:`Message` objects do not support the

Modified: doctools/trunk/Doc-26/library/select.rst
==============================================================================
--- doctools/trunk/Doc-26/library/select.rst	(original)
+++ doctools/trunk/Doc-26/library/select.rst	Sun Aug  5 00:45:13 2007
@@ -33,16 +33,16 @@
 .. function:: select(iwtd, owtd, ewtd[, timeout])
 
    This is a straightforward interface to the Unix :cfunc:`select` system call.
-   The first three arguments are sequences of 'waitable objects': either integers
-   representing file descriptors or objects with a parameterless method named
-   :meth:`fileno` returning such an integer.  The three sequences of waitable
-   objects are for input, output and 'exceptional conditions', respectively.  Empty
-   sequences are allowed, but acceptance of three empty sequences is platform-
-   dependent. (It is known to work on Unix but not on Windows.)  The optional
-   *timeout* argument specifies a time-out as a floating point number in seconds.
-   When the *timeout* argument is omitted the function blocks until at least one
-   file descriptor is ready.  A time-out value of zero specifies a poll and never
-   blocks.
+   The first three arguments are sequences of 'waitable objects': either
+   integers representing file descriptors or objects with a parameterless method
+   named :meth:`fileno` returning such an integer.  The three sequences of
+   waitable objects are for input, output and 'exceptional conditions',
+   respectively.  Empty sequences are allowed, but acceptance of three empty
+   sequences is platform-dependent. (It is known to work on Unix but not on
+   Windows.)  The optional *timeout* argument specifies a time-out as a floating
+   point number in seconds.  When the *timeout* argument is omitted the function
+   blocks until at least one file descriptor is ready.  A time-out value of zero
+   specifies a poll and never blocks.
 
    The return value is a triple of lists of objects that are ready: subsets of the
    first three arguments.  When the time-out is reached without a file descriptor

Modified: doctools/trunk/Doc-26/library/sgmllib.rst
==============================================================================
--- doctools/trunk/Doc-26/library/sgmllib.rst	(original)
+++ doctools/trunk/Doc-26/library/sgmllib.rst	Sun Aug  5 00:45:13 2007
@@ -21,14 +21,14 @@
    The :class:`SGMLParser` class is instantiated without arguments. The parser is
    hardcoded to recognize the following constructs:
 
-* Opening and closing tags of the form ``<tag attr="value" ...>`` and
+   * Opening and closing tags of the form ``<tag attr="value" ...>`` and
      ``</tag>``, respectively.
 
-* Numeric character references of the form ``&#name;``.
+   * Numeric character references of the form ``&#name;``.
 
-* Entity references of the form ``&name;``.
+   * Entity references of the form ``&name;``.
 
-* SGML comments of the form ``<!--text-->``.  Note that spaces, tabs, and
+   * SGML comments of the form ``<!--text-->``.  Note that spaces, tabs, and
      newlines are allowed between the trailing ``>`` and the immediately preceding
      ``--``.
 

Modified: doctools/trunk/Doc-26/library/shelve.rst
==============================================================================
--- doctools/trunk/Doc-26/library/shelve.rst	(original)
+++ doctools/trunk/Doc-26/library/shelve.rst	Sun Aug  5 00:45:13 2007
@@ -15,7 +15,7 @@
 lots of shared  sub-objects.  The keys are ordinary strings.
 
 
-.. function:: open(filename[,flag='c'[,protocol=``None``[,writeback=``False``]]])
+.. function:: open(filename[, flag='c'[, protocol=None[, writeback=False]]])
 
    Open a persistent dictionary.  The filename specified is the base filename for
    the underlying database.  As a side-effect, an extension may be added to the

Modified: doctools/trunk/Doc-26/library/shlex.rst
==============================================================================
--- doctools/trunk/Doc-26/library/shlex.rst	(original)
+++ doctools/trunk/Doc-26/library/shlex.rst	Sun Aug  5 00:45:13 2007
@@ -29,8 +29,8 @@
    Split the string *s* using shell-like syntax. If *comments* is :const:`False`
    (the default), the parsing of comments in the given string will be disabled
    (setting the :attr:`commenters` member of the :class:`shlex` instance to the
-   empty string).  This function operates in POSIX mode by default, but uses non-
-   POSIX mode if the *posix* argument is false.
+   empty string).  This function operates in POSIX mode by default, but uses
+   non-POSIX mode if the *posix* argument is false.
 
    .. versionadded:: 2.3
 
@@ -292,7 +292,7 @@
   next character that follows;
 
 * Enclosing characters in quotes which are not part of :attr:`escapedquotes`
-  (e.g. ``'''``) preserve the literal value of all characters within the quotes;
+  (e.g. ``"'"``) preserve the literal value of all characters within the quotes;
 
 * Enclosing characters in quotes which are part of :attr:`escapedquotes` (e.g.
   ``'"'``) preserves the literal value of all characters within the quotes, with

Modified: doctools/trunk/Doc-26/library/simplehttpserver.rst
==============================================================================
--- doctools/trunk/Doc-26/library/simplehttpserver.rst	(original)
+++ doctools/trunk/Doc-26/library/simplehttpserver.rst	Sun Aug  5 00:45:13 2007
@@ -7,9 +7,9 @@
 .. sectionauthor:: Moshe Zadka <moshez at zadka.site.co.il>
 
 
-The :mod:`SimpleHTTPServer` module defines a request-handler class, interface-
-compatible with :class:`BaseHTTPServer.BaseHTTPRequestHandler`, that serves
-files only from a base directory.
+The :mod:`SimpleHTTPServer` module defines a request-handler class,
+interface-compatible with :class:`BaseHTTPServer.BaseHTTPRequestHandler`, that
+serves files only from a base directory.
 
 The :mod:`SimpleHTTPServer` module defines the following class:
 

Modified: doctools/trunk/Doc-26/library/simplexmlrpcserver.rst
==============================================================================
--- doctools/trunk/Doc-26/library/simplexmlrpcserver.rst	(original)
+++ doctools/trunk/Doc-26/library/simplexmlrpcserver.rst	Sun Aug  5 00:45:13 2007
@@ -10,8 +10,8 @@
 
 .. versionadded:: 2.2
 
-The :mod:`SimpleXMLRPCServer` module provides a basic server framework for XML-
-RPC servers written in Python.  Servers can either be free standing, using
+The :mod:`SimpleXMLRPCServer` module provides a basic server framework for
+XML-RPC servers written in Python.  Servers can either be free standing, using
 :class:`SimpleXMLRPCServer`, or embedded in a CGI environment, using
 :class:`CGIXMLRPCRequestHandler`.
 

Modified: doctools/trunk/Doc-26/library/site.rst
==============================================================================
--- doctools/trunk/Doc-26/library/site.rst	(original)
+++ doctools/trunk/Doc-26/library/site.rst	Sun Aug  5 00:45:13 2007
@@ -42,10 +42,10 @@
    triple: path; configuration; file
 
 For example, suppose ``sys.prefix`` and ``sys.exec_prefix`` are set to
-:file:`/usr/local`.  The Python |release| library is then installed in
-:file:`/usr/local/lib/python|version|` (where only the first three characters of
+:file:`/usr/local`.  The Python X.Y library is then installed in
+:file:`/usr/local/lib/python{X.Y}` (where only the first three characters of
 ``sys.version`` are used to form the installation path name).  Suppose this has
-a subdirectory :file:`/usr/local/lib/python|version|/site-packages` with three
+a subdirectory :file:`/usr/local/lib/python{X.Y}/site-packages` with three
 subsubdirectories, :file:`foo`, :file:`bar` and :file:`spam`, and two path
 configuration files, :file:`foo.pth` and :file:`bar.pth`.  Assume
 :file:`foo.pth` contains the following::

Modified: doctools/trunk/Doc-26/library/socket.rst
==============================================================================
--- doctools/trunk/Doc-26/library/socket.rst	(original)
+++ doctools/trunk/Doc-26/library/socket.rst	Sun Aug  5 00:45:13 2007
@@ -686,11 +686,11 @@
 
 Some notes on socket blocking and timeouts: A socket object can be in one of
 three modes: blocking, non-blocking, or timeout.  Sockets are always created in
-blocking mode.  In blocking mode, operations block until complete.  In non-
-blocking mode, operations fail (with an error that is unfortunately system-
-dependent) if they cannot be completed immediately.  In timeout mode, operations
-fail if they cannot be completed within the timeout specified for the socket.
-The :meth:`setblocking` method is simply a shorthand for certain
+blocking mode.  In blocking mode, operations block until complete.  In
+non-blocking mode, operations fail (with an error that is unfortunately
+system-dependent) if they cannot be completed immediately.  In timeout mode,
+operations fail if they cannot be completed within the timeout specified for the
+socket.  The :meth:`setblocking` method is simply a shorthand for certain
 :meth:`settimeout` calls.
 
 Timeout mode internally sets the socket in non-blocking mode.  The blocking and

Modified: doctools/trunk/Doc-26/library/socketserver.rst
==============================================================================
--- doctools/trunk/Doc-26/library/socketserver.rst	(original)
+++ doctools/trunk/Doc-26/library/socketserver.rst	Sun Aug  5 00:45:13 2007
@@ -13,8 +13,9 @@
 server.  :class:`UDPServer` uses datagrams, which are discrete packets of
 information that may arrive out of order or be lost while in transit.  The more
 infrequently used :class:`UnixStreamServer` and :class:`UnixDatagramServer`
-classes are similar, but use Unix domain sockets; they're not available on non-
-Unix platforms.  For more details on network programming, consult a book such as
+classes are similar, but use Unix domain sockets; they're not available on
+non-Unix platforms.  For more details on network programming, consult a book
+such as
 W. Richard Steven's UNIX Network Programming or Ralph Davis's Win32 Network
 Programming.
 

Modified: doctools/trunk/Doc-26/library/sqlite3.rst
==============================================================================
--- doctools/trunk/Doc-26/library/sqlite3.rst	(original)
+++ doctools/trunk/Doc-26/library/sqlite3.rst	Sun Aug  5 00:45:13 2007
@@ -324,9 +324,9 @@
    The first argument to the callback signifies what kind of operation is to be
    authorized. The second and third argument will be arguments or :const:`None`
    depending on the first argument. The 4th argument is the name of the database
-   ("main", "temp", etc.) if applicable. The 5th argument is the name of the inner-
-   most trigger or view that is responsible for the access attempt or :const:`None`
-   if this access attempt is directly from input SQL code.
+   ("main", "temp", etc.) if applicable. The 5th argument is the name of the
+   inner-most trigger or view that is responsible for the access attempt or
+   :const:`None` if this access attempt is directly from input SQL code.
 
    Please consult the SQLite documentation about the possible values for the first
    argument and the meaning of the second and third argument depending on the first
@@ -344,12 +344,12 @@
 
    .. literalinclude:: ../includes/sqlite3/row_factory.py
 
-   If returning a tuple doesn't suffice and you want name-based access to columns,
-   you should consider setting :attr:`row_factory` to the highly-optimized
-   :class:`sqlite3.Row` type. :class:`Row` provides both index-based and case-
-   insensitive name-based access to columns with almost no memory overhead. It will
-   probably be better than your own custom  dictionary-based approach or even a
-   db_row based solution.
+   If returning a tuple doesn't suffice and you want name-based access to
+   columns, you should consider setting :attr:`row_factory` to the
+   highly-optimized :class:`sqlite3.Row` type. :class:`Row` provides both
+   index-based and case-insensitive name-based access to columns with almost no
+   memory overhead. It will probably be better than your own custom
+   dictionary-based approach or even a db_row based solution.
 
    .. % XXX what's a db_row-based solution?
 

Modified: doctools/trunk/Doc-26/library/stdtypes.rst
==============================================================================
--- doctools/trunk/Doc-26/library/stdtypes.rst	(original)
+++ doctools/trunk/Doc-26/library/stdtypes.rst	Sun Aug  5 00:45:13 2007
@@ -439,12 +439,13 @@
 .. method:: container.__iter__()
 
    Return an iterator object.  The object is required to support the iterator
-   protocol described below.  If a container supports different types of iteration,
-   additional methods can be provided to specifically request iterators for those
-   iteration types.  (An example of an object supporting multiple forms of
-   iteration would be a tree structure which supports both breadth-first and depth-
-   first traversal.)  This method corresponds to the :attr:`tp_iter` slot of the
-   type structure for Python objects in the Python/C API.
+   protocol described below.  If a container supports different types of
+   iteration, additional methods can be provided to specifically request
+   iterators for those iteration types.  (An example of an object supporting
+   multiple forms of iteration would be a tree structure which supports both
+   breadth-first and depth-first traversal.)  This method corresponds to the
+   :attr:`tp_iter` slot of the type structure for Python objects in the Python/C
+   API.
 
 The iterator objects themselves are required to support the following two
 methods, which together form the :dfn:`iterator protocol`:
@@ -1184,9 +1185,9 @@
 Notes:
 
 (1)
-   The alternate form causes a leading zero (``'0'``) to be inserted between left-
-   hand padding and the formatting of the number if the leading character of the
-   result is not already a zero.
+   The alternate form causes a leading zero (``'0'``) to be inserted between
+   left-hand padding and the formatting of the number if the leading character
+   of the result is not already a zero.
 
 (2)
    The alternate form causes a leading ``'0x'`` or ``'0X'`` (depending on whether
@@ -1294,13 +1295,13 @@
 | ``s.count(x)``               | return number of *i*'s for     |                     |
 |                              | which ``s[i] == x``            |                     |
 +------------------------------+--------------------------------+---------------------+
-| ``s.index(x[, *i*[, *j*]])`` | return smallest *k* such that  | \(4)                |
+| ``s.index(x[, i[, j]])``     | return smallest *k* such that  | \(4)                |
 |                              | ``s[k] == x`` and ``i <= k <   |                     |
 |                              | j``                            |                     |
 +------------------------------+--------------------------------+---------------------+
 | ``s.insert(i, x)``           | same as ``s[i:i] = [x]``       | \(5)                |
 +------------------------------+--------------------------------+---------------------+
-| ``s.pop([*i*])``             | same as ``x = s[i]; del s[i];  | \(6)                |
+| ``s.pop([i])``               | same as ``x = s[i]; del s[i];  | \(6)                |
 |                              | return x``                     |                     |
 +------------------------------+--------------------------------+---------------------+
 | ``s.remove(x)``              | same as ``del s[s.index(x)]``  | \(4)                |
@@ -1308,8 +1309,8 @@
 | ``s.reverse()``              | reverses the items of *s* in   | \(7)                |
 |                              | place                          |                     |
 +------------------------------+--------------------------------+---------------------+
-| ``s.sort([*cmp*[, *key*[,    | sort the items of *s* in place | (7), (8), (9), (10) |
-| *reverse*]]])``              |                                |                     |
+| ``s.sort([cmp[, key[,        | sort the items of *s* in place | (7), (8), (9), (10) |
+| reverse]]])``                |                                |                     |
 +------------------------------+--------------------------------+---------------------+
 
 .. index::
@@ -1630,23 +1631,23 @@
 +--------------------------------+---------------------------------+-----------+
 | ``a.keys()``                   | a copy of *a*'s list of keys    | \(3)      |
 +--------------------------------+---------------------------------+-----------+
-| ``a.update([*b*])``            | updates *a* with key/value      | \(9)      |
+| ``a.update([b])``              | updates *a* with key/value      | \(9)      |
 |                                | pairs from *b*, overwriting     |           |
 |                                | existing keys, returns ``None`` |           |
 +--------------------------------+---------------------------------+-----------+
-| ``a.fromkeys(seq[, *value*])`` | Creates a new dictionary with   | \(7)      |
+| ``a.fromkeys(seq[, value])``   | Creates a new dictionary with   | \(7)      |
 |                                | keys from *seq* and values set  |           |
 |                                | to *value*                      |           |
 +--------------------------------+---------------------------------+-----------+
 | ``a.values()``                 | a copy of *a*'s list of values  | \(3)      |
 +--------------------------------+---------------------------------+-----------+
-| ``a.get(k[, *x*])``            | ``a[k]`` if ``k in a``, else    | \(4)      |
+| ``a.get(k[, x])``              | ``a[k]`` if ``k in a``, else    | \(4)      |
 |                                | *x*                             |           |
 +--------------------------------+---------------------------------+-----------+
-| ``a.setdefault(k[, *x*])``     | ``a[k]`` if ``k in a``, else    | \(5)      |
+| ``a.setdefault(k[, x])``       | ``a[k]`` if ``k in a``, else    | \(5)      |
 |                                | *x* (also setting it)           |           |
 +--------------------------------+---------------------------------+-----------+
-| ``a.pop(k[, *x*])``            | ``a[k]`` if ``k in a``, else    | \(8)      |
+| ``a.pop(k[, x])``              | ``a[k]`` if ``k in a``, else    | \(8)      |
 |                                | *x* (and remove k)              |           |
 +--------------------------------+---------------------------------+-----------+
 | ``a.popitem()``                | remove and return an arbitrary  | \(6)      |
@@ -1721,13 +1722,13 @@
 
 (10)
    If a subclass of dict defines a method :meth:`__missing__`, if the key *k* is
-   not present, the *a*[*k*] operation calls that method with the key *k* as
-   argument.  The *a*[*k*] operation then returns or raises whatever is returned or
-   raised by the :func:`__missing__`\ (*k*) call if the key is not present. No
-   other operations or methods invoke :meth:`__missing__`\ (). If
-   :meth:`__missing__` is not defined, :exc:`KeyError` is raised.
-   :meth:`__missing__` must be a method; it cannot be an instance variable. For an
-   example, see :mod:`collections`.\ :class:`defaultdict`.
+   not present, the ``a[k]`` operation calls that method with the key *k* as
+   argument.  The ``a[k]`` operation then returns or raises whatever is returned
+   or raised by the ``__missing__(k)`` call if the key is not present. No other
+   operations or methods invoke :meth:`__missing__`. If :meth:`__missing__` is
+   not defined, :exc:`KeyError` is raised.  :meth:`__missing__` must be a
+   method; it cannot be an instance variable. For an example, see
+   :class:`collections.defaultdict`.
 
    .. versionadded:: 2.5
 
@@ -1793,8 +1794,8 @@
 
 .. method:: file.flush()
 
-   Flush the internal buffer, like ``stdio``'s :cfunc:`fflush`.  This may be a no-
-   op on some file-like objects.
+   Flush the internal buffer, like ``stdio``'s :cfunc:`fflush`.  This may be a
+   no-op on some file-like objects.
 
 
 .. method:: file.fileno()
@@ -1873,11 +1874,11 @@
 .. method:: file.readlines([sizehint])
 
    Read until EOF using :meth:`readline` and return a list containing the lines
-   thus read.  If the optional *sizehint* argument is present, instead of reading
-   up to EOF, whole lines totalling approximately *sizehint* bytes (possibly after
-   rounding up to an internal buffer size) are read.  Objects implementing a file-
-   like interface may choose to ignore *sizehint* if it cannot be implemented, or
-   cannot be implemented efficiently.
+   thus read.  If the optional *sizehint* argument is present, instead of
+   reading up to EOF, whole lines totalling approximately *sizehint* bytes
+   (possibly after rounding up to an internal buffer size) are read.  Objects
+   implementing a file-like interface may choose to ignore *sizehint* if it
+   cannot be implemented, or cannot be implemented efficiently.
 
 
 .. method:: file.xreadlines()
@@ -1906,9 +1907,8 @@
 
    Note that not all file objects are seekable.
 
-   .. versionchanged:: Passing float values as offset has been deprecated
-
-   [2.6]
+   .. versionchanged:: 2.6
+      Passing float values as offset has been deprecated
 
 
 .. method:: file.tell()
@@ -1986,9 +1986,9 @@
 .. attribute:: file.name
 
    If the file object was created using :func:`open`, the name of the file.
-   Otherwise, some string that indicates the source of the file object, of the form
-   ``<...>``.  This is a read-only attribute and may not be present on all file-
-   like objects.
+   Otherwise, some string that indicates the source of the file object, of the
+   form ``<...>``.  This is a read-only attribute and may not be present on all
+   file-like objects.
 
 
 .. attribute:: file.newlines
@@ -2041,7 +2041,7 @@
 to be provided for a context manager object to define a runtime context:
 
 
-.. method:: context manager.__enter__()
+.. method:: contextmanager.__enter__()
 
    Enter the runtime context and return either this object or another object
    related to the runtime context. The value returned by this method is bound to
@@ -2060,7 +2060,7 @@
    :keyword:`with` statement.
 
 
-.. method:: context manager.__exit__(exc_type, exc_val, exc_tb)
+.. method:: contextmanager.__exit__(exc_type, exc_val, exc_tb)
 
    Exit the runtime context and return a Boolean flag indicating if any expection
    that occurred should be suppressed. If an exception occurred while executing the
@@ -2129,7 +2129,7 @@
 
 Modules built into the interpreter are written like this: ``<module 'sys'
 (built-in)>``.  If loaded from a file, they are written as ``<module 'os' from
-'/usr/local/lib/python|version|/os.pyc'>``.
+'/usr/local/lib/pythonX.Y/os.pyc'>``.
 
 
 .. _typesobjects:
@@ -2150,9 +2150,9 @@
 Function objects are created by function definitions.  The only operation on a
 function object is to call it: ``func(argument-list)``.
 
-There are really two flavors of function objects: built-in functions and user-
-defined functions.  Both support the same operation (to call the function), but
-the implementation is different, hence the different object types.
+There are really two flavors of function objects: built-in functions and
+user-defined functions.  Both support the same operation (to call the function),
+but the implementation is different, hence the different object types.
 
 See :ref:`function` for more information.
 

Modified: doctools/trunk/Doc-26/library/string.rst
==============================================================================
--- doctools/trunk/Doc-26/library/string.rst	(original)
+++ doctools/trunk/Doc-26/library/string.rst	Sun Aug  5 00:45:13 2007
@@ -109,13 +109,13 @@
 * ``$$`` is an escape; it is replaced with a single ``$``.
 
 * ``$identifier`` names a substitution placeholder matching a mapping key of
-  "identifier".  By default, "identifier" must spell a Python identifier.  The
-  first non-identifier character after the ``$`` character terminates this
-  placeholder specification.
+  ``"identifier"``.  By default, ``"identifier"`` must spell a Python
+  identifier.  The first non-identifier character after the ``$`` character
+  terminates this placeholder specification.
 
 * ``${identifier}`` is equivalent to ``$identifier``.  It is required when valid
   identifier characters follow the placeholder but are not part of the
-  placeholder, such as "${noun}ification".
+  placeholder, such as ``"${noun}ification"``.
 
 Any other appearance of ``$`` in the string will result in a :exc:`ValueError`
 being raised.
@@ -190,9 +190,10 @@
   expression, as the implementation will call :meth:`re.escape` on this string as
   needed.
 
-* *idpattern* -- This is the regular expression describing the pattern for non-
-  braced placeholders (the braces will be added automatically as appropriate).
-  The default value is the regular expression ``[_a-z][_a-z0-9]*``.
+* *idpattern* -- This is the regular expression describing the pattern for
+  non-braced placeholders (the braces will be added automatically as
+  appropriate).  The default value is the regular expression
+  ``[_a-z][_a-z0-9]*``.
 
 Alternatively, you can provide the entire regular expression pattern by
 overriding the class attribute *pattern*.  If you do this, the value must be a

Modified: doctools/trunk/Doc-26/library/stringprep.rst
==============================================================================
--- doctools/trunk/Doc-26/library/stringprep.rst	(original)
+++ doctools/trunk/Doc-26/library/stringprep.rst	Sun Aug  5 00:45:13 2007
@@ -50,14 +50,14 @@
 
 .. function:: map_table_b2(code)
 
-   Return the mapped value for *code* according to tableB.2  (Mapping for case-
-   folding used with NFKC).
+   Return the mapped value for *code* according to tableB.2 (Mapping for
+   case-folding used with NFKC).
 
 
 .. function:: map_table_b3(code)
 
-   Return the mapped value for *code* according to tableB.3  (Mapping for case-
-   folding used with no normalization).
+   Return the mapped value for *code* according to tableB.3 (Mapping for
+   case-folding used with no normalization).
 
 
 .. function:: in_table_c11(code)

Modified: doctools/trunk/Doc-26/library/struct.rst
==============================================================================
--- doctools/trunk/Doc-26/library/struct.rst	(original)
+++ doctools/trunk/Doc-26/library/struct.rst	Sun Aug  5 00:45:13 2007
@@ -48,7 +48,7 @@
    (``len(string)`` must equal ``calcsize(fmt)``).
 
 
-.. function:: unpack_from(fmt, buffer[,offset ``= 0``])
+.. function:: unpack_from(fmt, buffer[,offset=0])
 
    Unpack the *buffer* according to tthe given format. The result is a tuple even
    if it contains exactly one item. The *buffer* must contain at least the amount
@@ -280,7 +280,7 @@
    (``len(string)`` must equal :attr:`self.size`).
 
 
-.. method:: Struct.unpack_from(buffer[,offset ``= 0``])
+.. method:: Struct.unpack_from(buffer[, offset=0])
 
    Identical to the :func:`unpack_from` function, using the compiled format.
    (``len(buffer[offset:])`` must be at least :attr:`self.size`).

Modified: doctools/trunk/Doc-26/library/sys.rst
==============================================================================
--- doctools/trunk/Doc-26/library/sys.rst	(original)
+++ doctools/trunk/Doc-26/library/sys.rst	Sun Aug  5 00:45:13 2007
@@ -23,8 +23,8 @@
 .. data:: byteorder
 
    An indicator of the native byte order.  This will have the value ``'big'`` on
-   big-endian (most-significant byte first) platforms, and ``'little'`` on little-
-   endian (least-significant byte first) platforms.
+   big-endian (most-significant byte first) platforms, and ``'little'`` on
+   little-endian (least-significant byte first) platforms.
 
    .. versionadded:: 2.0
 
@@ -267,14 +267,14 @@
    file names, or ``None`` if the system default encoding is used. The result value
    depends on the operating system:
 
-* On Windows 9x, the encoding is "mbcs".
+   * On Windows 9x, the encoding is "mbcs".
 
-* On Mac OS X, the encoding is "utf-8".
+   * On Mac OS X, the encoding is "utf-8".
 
-* On Unix, the encoding is the user's preference according to the result of
+   * On Unix, the encoding is the user's preference according to the result of
      nl_langinfo(CODESET), or :const:`None` if the ``nl_langinfo(CODESET)`` failed.
 
-* On Windows NT+, file names are Unicode natively, so no conversion is
+   * On Windows NT+, file names are Unicode natively, so no conversion is
      performed. :func:`getfilesystemencoding` still returns ``'mbcs'``, as this is
      the encoding that applications should use when they explicitly want to convert
      Unicode strings to byte strings that are equivalent when used as file names.
@@ -369,8 +369,9 @@
    more information.)
 
    The meaning of the variables is the same as that of the return values from
-   :func:`exc_info` above.  (Since there is only one interactive thread, thread-
-   safety is not a concern for these variables, unlike for ``exc_type`` etc.)
+   :func:`exc_info` above.  (Since there is only one interactive thread,
+   thread-safety is not a concern for these variables, unlike for ``exc_type``
+   etc.)
 
 
 .. data:: maxint

Modified: doctools/trunk/Doc-26/library/tempfile.rst
==============================================================================
--- doctools/trunk/Doc-26/library/tempfile.rst	(original)
+++ doctools/trunk/Doc-26/library/tempfile.rst	Sun Aug  5 00:45:13 2007
@@ -32,7 +32,7 @@
 The module defines the following user-callable functions:
 
 
-.. function:: TemporaryFile([mode=``'w+b'``[, bufsize=``-1``[, suffix[, prefix[, dir]]]]])
+.. function:: TemporaryFile([mode='w+b'[, bufsize=-1[, suffix[, prefix[, dir]]]]])
 
    Return a file (or file-like) object that can be used as a temporary storage
    area.  The file is created using :func:`mkstemp`. It will be destroyed as soon
@@ -50,7 +50,7 @@
    The *dir*, *prefix* and *suffix* parameters are passed to :func:`mkstemp`.
 
 
-.. function:: NamedTemporaryFile([mode=``'w+b'``[, bufsize=``-1``[, suffix[, prefix[, dir[, delete]]]]]])
+.. function:: NamedTemporaryFile([mode='w+b'[, bufsize=-1[, suffix[, prefix[, dir[, delete]]]]]])
 
    This function operates exactly as :func:`TemporaryFile` does, except that the
    file is guaranteed to have a visible name in the file system (on Unix, the
@@ -66,7 +66,7 @@
       The *delete* parameter.
 
 
-.. function:: SpooledTemporaryFile([max_size=``0``, [mode=``'w+b'``[, bufsize=``-1``[, suffix[, prefix[, dir]]]]]])
+.. function:: SpooledTemporaryFile([max_size=0, [mode='w+b'[, bufsize=-1[, suffix[, prefix[, dir]]]]]])
 
    This function operates exactly as :func:`TemporaryFile` does, except that data
    is spooled in memory until the file size exceeds *max_size*, or until the file's
@@ -98,13 +98,13 @@
    If *prefix* is specified, the file name will begin with that prefix; otherwise,
    a default prefix is used.
 
-   If *dir* is specified, the file will be created in that directory; otherwise, a
-   default directory is used.  The default directory is chosen from a platform-
-   dependent list, but the user of the application can control the directory
-   location by setting the *TMPDIR*, *TEMP* or *TMP* environment variables.  There
-   is thus no guarantee that the generated filename will have any nice properties,
-   such as not requiring quoting when passed to external commands via
-   ``os.popen()``.
+   If *dir* is specified, the file will be created in that directory; otherwise,
+   a default directory is used.  The default directory is chosen from a
+   platform-dependent list, but the user of the application can control the
+   directory location by setting the *TMPDIR*, *TEMP* or *TMP* environment
+   variables.  There is thus no guarantee that the generated filename will have
+   any nice properties, such as not requiring quoting when passed to external
+   commands via ``os.popen()``.
 
    If *text* is specified, it indicates whether to open the file in binary mode
    (the default) or text mode.  On some platforms, this makes no difference.
@@ -162,24 +162,24 @@
    Python searches a standard list of directories and sets *tempdir* to the first
    one which the calling user can create files in.  The list is:
 
-#. The directory named by the :envvar:`TMPDIR` environment variable.
+   #. The directory named by the :envvar:`TMPDIR` environment variable.
 
-#. The directory named by the :envvar:`TEMP` environment variable.
+   #. The directory named by the :envvar:`TEMP` environment variable.
 
-#. The directory named by the :envvar:`TMP` environment variable.
+   #. The directory named by the :envvar:`TMP` environment variable.
 
-#. A platform-specific location:
+   #. A platform-specific location:
 
-* On RiscOS, the directory named by the :envvar:`Wimp$ScrapDir` environment
+      * On RiscOS, the directory named by the :envvar:`Wimp$ScrapDir` environment
         variable.
 
-* On Windows, the directories :file:`C:$\\TEMP`, :file:`C:$\\TMP`,
+      * On Windows, the directories :file:`C:$\\TEMP`, :file:`C:$\\TMP`,
         :file:`\\TEMP`, and :file:`\\TMP`, in that order.
 
-* On all other platforms, the directories :file:`/tmp`, :file:`/var/tmp`, and
+      * On all other platforms, the directories :file:`/tmp`, :file:`/var/tmp`, and
         :file:`/usr/tmp`, in that order.
 
-#. As a last resort, the current working directory.
+   #. As a last resort, the current working directory.
 
 
 .. function:: gettempdir()

Modified: doctools/trunk/Doc-26/library/termios.rst
==============================================================================
--- doctools/trunk/Doc-26/library/termios.rst	(original)
+++ doctools/trunk/Doc-26/library/termios.rst	Sun Aug  5 00:45:13 2007
@@ -31,12 +31,12 @@
 .. function:: tcgetattr(fd)
 
    Return a list containing the tty attributes for file descriptor *fd*, as
-   follows: ``[``*iflag*, *oflag*, *cflag*, *lflag*, *ispeed*, *ospeed*, *cc*``]``
-   where *cc* is a list of the tty special characters (each a string of length 1,
-   except the items with indices :const:`VMIN` and :const:`VTIME`, which are
-   integers when these fields are defined).  The interpretation of the flags and
-   the speeds as well as the indexing in the *cc* array must be done using the
-   symbolic constants defined in the :mod:`termios` module.
+   follows: ``[iflag, oflag, cflag, lflag, ispeed, ospeed, cc]`` where *cc* is a
+   list of the tty special characters (each a string of length 1, except the
+   items with indices :const:`VMIN` and :const:`VTIME`, which are integers when
+   these fields are defined).  The interpretation of the flags and the speeds as
+   well as the indexing in the *cc* array must be done using the symbolic
+   constants defined in the :mod:`termios` module.
 
 
 .. function:: tcsetattr(fd, when, attributes)

Modified: doctools/trunk/Doc-26/library/textwrap.rst
==============================================================================
--- doctools/trunk/Doc-26/library/textwrap.rst	(original)
+++ doctools/trunk/Doc-26/library/textwrap.rst	Sun Aug  5 00:45:13 2007
@@ -147,7 +147,7 @@
    This is generally desired for text in a monospaced font.  However, the sentence
    detection algorithm is imperfect: it assumes that a sentence ending consists of
    a lowercase letter followed by one of ``'.'``, ``'!'``, or ``'?'``, possibly
-   followed by one of ``'"'`` or ``'''``, followed by a space.  One problem with
+   followed by one of ``'"'`` or ``"'"``, followed by a space.  One problem with
    this is algorithm is that it is unable to detect the difference between "Dr." in
    ::
 
@@ -160,9 +160,9 @@
    :attr:`fix_sentence_endings` is false by default.
 
    Since the sentence detection algorithm relies on ``string.lowercase`` for the
-   definition of "lowercase letter," and a convention of using two spaces after a
-   period to separate sentences on the same line, it is specific to English-
-   language texts.
+   definition of "lowercase letter," and a convention of using two spaces after
+   a period to separate sentences on the same line, it is specific to
+   English-language texts.
 
 
 .. attribute:: TextWrapper.break_long_words
@@ -173,8 +173,8 @@
    (Long words will be put on a line by themselves, in order to minimize the amount
    by which :attr:`width` is exceeded.)
 
-:class:`TextWrapper` also provides two public methods, analogous to the module-
-level convenience functions:
+:class:`TextWrapper` also provides two public methods, analogous to the
+module-level convenience functions:
 
 
 .. method:: TextWrapper.wrap(text)

Modified: doctools/trunk/Doc-26/library/threading.rst
==============================================================================
--- doctools/trunk/Doc-26/library/threading.rst	(original)
+++ doctools/trunk/Doc-26/library/threading.rst	Sun Aug  5 00:45:13 2007
@@ -197,7 +197,7 @@
 All methods are executed atomically.
 
 
-.. method:: Lock.acquire([blocking\ ``= 1``])
+.. method:: Lock.acquire([blocking=1])
 
    Acquire a lock, blocking or non-blocking.
 
@@ -244,7 +244,7 @@
 :meth:`acquire` to proceed.
 
 
-.. method:: RLock.acquire([blocking\ ``= 1``])
+.. method:: RLock.acquire([blocking=1])
 
    Acquire a lock, blocking or non-blocking.
 

Modified: doctools/trunk/Doc-26/library/timeit.rst
==============================================================================
--- doctools/trunk/Doc-26/library/timeit.rst	(original)
+++ doctools/trunk/Doc-26/library/timeit.rst	Sun Aug  5 00:45:13 2007
@@ -20,7 +20,7 @@
 The module defines the following public class:
 
 
-.. class:: Timer([stmt=``'pass'`` [, setup=``'pass'`` [, timer=<timer function>]]])
+.. class:: Timer([stmt='pass' [, setup='pass' [, timer=<timer function>]]])
 
    Class for timing execution speed of small code snippets.
 
@@ -40,7 +40,7 @@
       larger in this case because of the extra function calls.
 
 
-.. method:: Timer.print_exc([file=:const:`None`])
+.. method:: Timer.print_exc([file=None])
 
    Helper to print a traceback from the timed code.
 
@@ -57,7 +57,7 @@
    traceback is sent; it defaults to ``sys.stderr``.
 
 
-.. method:: Timer.repeat([repeat\ ``=3`` [, number\ ``=1000000``]])
+.. method:: Timer.repeat([repeat=3 [, number=1000000]])
 
    Call :meth:`timeit` a few times.
 
@@ -78,7 +78,7 @@
       and apply common sense rather than statistics.
 
 
-.. method:: Timer.timeit([number\ ``=1000000``])
+.. method:: Timer.timeit([number=1000000])
 
    Time *number* executions of the main statement. This executes the setup
    statement once, and then returns the time it takes to execute the main statement
@@ -99,7 +99,7 @@
 Starting with version 2.6, the module also defines two convenience functions:
 
 
-.. function:: repeat(stmt[, setup[, timer[, repeat\ ``=3`` [, number\ ``=1000000``]]]])
+.. function:: repeat(stmt[, setup[, timer[, repeat=3 [, number=1000000]]]])
 
    Create a :class:`Timer` instance with the given statement, setup code and timer
    function and run its :meth:`repeat` method with the given repeat count and
@@ -108,7 +108,7 @@
    .. versionadded:: 2.6
 
 
-.. function:: timeit(stmt[, setup[, timer[, number\ ``=1000000``]]])
+.. function:: timeit(stmt[, setup[, timer[, number=1000000]]])
 
    Create a :class:`Timer` instance with the given statement, setup code and timer
    function and run its :meth:`timeit` method with *number* executions.

Modified: doctools/trunk/Doc-26/library/tix.rst
==============================================================================
--- doctools/trunk/Doc-26/library/tix.rst	(original)
+++ doctools/trunk/Doc-26/library/tix.rst	Sun Aug  5 00:45:13 2007
@@ -263,10 +263,10 @@
 
 .. class:: DirSelectBox()
 
-   The :class:`DirSelectBox` is similar to the standard Motif(TM) directory-
-   selection box. It is generally used for the user to choose a directory.
-   DirSelectBox stores the directories mostly recently selected into a ComboBox
-   widget so that they can be quickly selected again.
+   The :class:`DirSelectBox` is similar to the standard Motif(TM)
+   directory-selection box. It is generally used for the user to choose a
+   directory.  DirSelectBox stores the directories mostly recently selected into
+   a ComboBox widget so that they can be quickly selected again.
 
 
 .. class:: ExFileSelectBox()

Modified: doctools/trunk/Doc-26/library/tkinter.rst
==============================================================================
--- doctools/trunk/Doc-26/library/tkinter.rst	(original)
+++ doctools/trunk/Doc-26/library/tkinter.rst	Sun Aug  5 00:45:13 2007
@@ -798,21 +798,21 @@
    Some options and methods for menus manipulate specific menu entries. Anytime a
    menu index is needed for an option or a parameter, you may pass in:
 
-* an integer which refers to the numeric position of the entry in the widget,
+   * an integer which refers to the numeric position of the entry in the widget,
      counted from the top, starting with 0;
 
-* the string ``'active'``, which refers to the menu position that is currently
+   * the string ``'active'``, which refers to the menu position that is currently
      under the cursor;
 
-* the string ``"last"`` which refers to the last menu item;
+   * the string ``"last"`` which refers to the last menu item;
 
-* An integer preceded by ``@``, as in ``@6``, where the integer is interpreted
+   * An integer preceded by ``@``, as in ``@6``, where the integer is interpreted
      as a y pixel coordinate in the menu's coordinate system;
 
-* the string ``"none"``, which indicates no menu entry at all, most often used
+   * the string ``"none"``, which indicates no menu entry at all, most often used
      with menu.activate() to deactivate all entries, and finally,
 
-* a text string that is pattern matched against the label of the menu entry, as
+   * a text string that is pattern matched against the label of the menu entry, as
      scanned from the top of the menu to the bottom.  Note that this index type is
      considered after all the others, which means that matches for menu items
      labelled ``last``, ``active``, or ``none`` may be interpreted as the above

Modified: doctools/trunk/Doc-26/library/turtle.rst
==============================================================================
--- doctools/trunk/Doc-26/library/turtle.rst	(original)
+++ doctools/trunk/Doc-26/library/turtle.rst	Sun Aug  5 00:45:13 2007
@@ -11,9 +11,9 @@
 .. sectionauthor:: Moshe Zadka <moshez at zadka.site.co.il>
 
 
-The :mod:`turtle` module provides turtle graphics primitives, in both an object-
-oriented and procedure-oriented ways. Because it uses :mod:`Tkinter` for the
-underlying graphics, it needs a version of python installed with Tk support.
+The :mod:`turtle` module provides turtle graphics primitives, in both an
+object-oriented and procedure-oriented ways. Because it uses :mod:`Tkinter` for
+the underlying graphics, it needs a version of python installed with Tk support.
 
 The procedural interface uses a pen and a canvas which are automagically created
 when any of the functions are called.
@@ -35,16 +35,16 @@
 
    Sets the size and position of the main window.  Keywords are:
 
-* ``width``: either a size in pixels or a fraction of the screen. The default is
+   * ``width``: either a size in pixels or a fraction of the screen. The default is
      50% of the screen.
 
-* ``height``: either a size in pixels or a fraction of the screen. The default
+   * ``height``: either a size in pixels or a fraction of the screen. The default
      is 50% of the screen.
 
-* ``startx``: starting position in pixels from the left edge of the screen.
+   * ``startx``: starting position in pixels from the left edge of the screen.
      ``None`` is the default value and  centers the window horizontally on screen.
 
-* ``starty``: starting position in pixels from the top edge of the screen.
+   * ``starty``: starting position in pixels from the top edge of the screen.
      ``None`` is the default value and  centers the window vertically on screen.
 
    Examples::

Modified: doctools/trunk/Doc-26/library/urllib.rst
==============================================================================
--- doctools/trunk/Doc-26/library/urllib.rst	(original)
+++ doctools/trunk/Doc-26/library/urllib.rst	Sun Aug  5 00:45:13 2007
@@ -12,10 +12,10 @@
    single: URL
 
 This module provides a high-level interface for fetching data across the World
-Wide Web.  In particular, the :func:`urlopen` function is similar to the built-
-in function :func:`open`, but accepts Universal Resource Locators (URLs) instead
-of filenames.  Some restrictions apply --- it can only open URLs for reading,
-and no seek operations are available.
+Wide Web.  In particular, the :func:`urlopen` function is similar to the
+built-in function :func:`open`, but accepts Universal Resource Locators (URLs)
+instead of filenames.  Some restrictions apply --- it can only open URLs for
+reading, and no seek operations are available.
 
 It defines the following public functions:
 
@@ -42,16 +42,16 @@
    .. index:: module: mimetools
 
    The :meth:`info` method returns an instance of the class
-   :class:`mimetools.Message` containing meta-information associated with the URL.
-   When the method is HTTP, these headers are those returned by the server at the
-   head of the retrieved HTML page (including Content-Length and Content-Type).
-   When the method is FTP, a Content-Length header will be present if (as is now
-   usual) the server passed back a file length in response to the FTP retrieval
-   request. A Content-Type header will be present if the MIME type can be guessed.
-   When the method is local-file, returned headers will include a Date representing
-   the file's last-modified time, a Content-Length giving file size, and a Content-
-   Type containing a guess at the file's type. See also the description of the
-   :mod:`mimetools` module.
+   :class:`mimetools.Message` containing meta-information associated with the
+   URL.  When the method is HTTP, these headers are those returned by the server
+   at the head of the retrieved HTML page (including Content-Length and
+   Content-Type).  When the method is FTP, a Content-Length header will be
+   present if (as is now usual) the server passed back a file length in response
+   to the FTP retrieval request. A Content-Type header will be present if the
+   MIME type can be guessed.  When the method is local-file, returned headers
+   will include a Date representing the file's last-modified time, a
+   Content-Length giving file size, and a Content-Type containing a guess at the
+   file's type. See also the description of the :mod:`mimetools` module.
 
    The :meth:`geturl` method returns the real URL of the page.  In some cases, the
    HTTP server redirects a client to another URL.  The :func:`urlopen` function

Modified: doctools/trunk/Doc-26/library/urllib2.rst
==============================================================================
--- doctools/trunk/Doc-26/library/urllib2.rst	(original)
+++ doctools/trunk/Doc-26/library/urllib2.rst	Sun Aug  5 00:45:13 2007
@@ -33,9 +33,9 @@
 
    This function returns a file-like object with two additional methods:
 
-* :meth:`geturl` --- return the URL of the resource retrieved
+   * :meth:`geturl` --- return the URL of the resource retrieved
 
-* :meth:`info` --- return the meta-information of the page, as a dictionary-like
+   * :meth:`info` --- return the meta-information of the page, as a dictionary-like
      object
 
    Raises :exc:`URLError` on errors.
@@ -87,9 +87,10 @@
 
 .. exception:: HTTPError
 
-   A subclass of :exc:`URLError`, it can also function as a  non-exceptional file-
-   like return value (the same thing that :func:`urlopen` returns).  This is useful
-   when handling exotic HTTP errors, such as requests for authentication.
+   A subclass of :exc:`URLError`, it can also function as a non-exceptional
+   file-like return value (the same thing that :func:`urlopen` returns).  This
+   is useful when handling exotic HTTP errors, such as requests for
+   authentication.
 
 The following classes are provided:
 
@@ -365,20 +366,20 @@
    are searched, and added to the possible chains (note that HTTP errors are a
    special case).
 
-* :meth:`protocol_open` --- signal that the handler knows how to open *protocol*
+   * :meth:`protocol_open` --- signal that the handler knows how to open *protocol*
      URLs.
 
-* :meth:`http_error_type` --- signal that the handler knows how to handle HTTP
+   * :meth:`http_error_type` --- signal that the handler knows how to handle HTTP
      errors with HTTP error code *type*.
 
-* :meth:`protocol_error` --- signal that the handler knows how to handle errors
+   * :meth:`protocol_error` --- signal that the handler knows how to handle errors
      from (non-\ ``http``) *protocol*.
 
-* :meth:`protocol_request` --- signal that the handler knows how to pre-process
+   * :meth:`protocol_request` --- signal that the handler knows how to pre-process
      *protocol* requests.
 
-* :meth:`protocol_response` --- signal that the handler knows how to post-
-     process *protocol* responses.
+   * :meth:`protocol_response` --- signal that the handler knows how to
+     post-process *protocol* responses.
 
 
 .. method:: OpenerDirector.open(url[, data][, timeout])

Modified: doctools/trunk/Doc-26/library/user.rst
==============================================================================
--- doctools/trunk/Doc-26/library/user.rst	(original)
+++ doctools/trunk/Doc-26/library/user.rst	Sun Aug  5 00:45:13 2007
@@ -51,8 +51,8 @@
 (The three-argument form of :func:`getattr` is used in case the user has not
 defined ``spam_verbose`` in their :file:`.pythonrc.py` file.)
 
-Programs with extensive customization needs are better off reading a program-
-specific customization file.
+Programs with extensive customization needs are better off reading a
+program-specific customization file.
 
 Programs with security or privacy concerns should *not* import this module; a
 user can easily break into a program by placing arbitrary code in the

Modified: doctools/trunk/Doc-26/library/winsound.rst
==============================================================================
--- doctools/trunk/Doc-26/library/winsound.rst	(original)
+++ doctools/trunk/Doc-26/library/winsound.rst	Sun Aug  5 00:45:13 2007
@@ -41,7 +41,7 @@
    :exc:`RuntimeError` is raised.
 
 
-.. function:: MessageBeep([type=``MB_OK``])
+.. function:: MessageBeep([type=MB_OK])
 
    Call the underlying :cfunc:`MessageBeep` function from the Platform API.  This
    plays a sound as specified in the registry.  The *type* argument specifies which

Modified: doctools/trunk/Doc-26/library/wsgiref.rst
==============================================================================
--- doctools/trunk/Doc-26/library/wsgiref.rst	(original)
+++ doctools/trunk/Doc-26/library/wsgiref.rst	Sun Aug  5 00:45:13 2007
@@ -234,7 +234,7 @@
 :mod:`wsgiref.util`.)
 
 
-.. function:: make_server(host, port, app [, server_class=WSGIServer [, handler_class=:class:`WSGIRequestHandler`]])
+.. function:: make_server(host, port, app [, server_class=WSGIServer [, handler_class=WSGIRequestHandler]])
 
    Create a new WSGI server listening on *host* and *port*, accepting connections
    for *app*.  The return value is an instance of the supplied *server_class*, and

Modified: doctools/trunk/Doc-26/library/xml.dom.rst
==============================================================================
--- doctools/trunk/Doc-26/library/xml.dom.rst	(original)
+++ doctools/trunk/Doc-26/library/xml.dom.rst	Sun Aug  5 00:45:13 2007
@@ -136,8 +136,8 @@
 .. data:: XMLNS_NAMESPACE
 
    The namespace URI for namespace declarations, as defined by `Document Object
-   Model (DOM) Level 2 Core Specification <http://www.w3.org/TR/DOM-
-   Level-2-Core/core.html>`_ (section 1.1.8).
+   Model (DOM) Level 2 Core Specification
+   <http://www.w3.org/TR/DOM-Level-2-Core/core.html>`_ (section 1.1.8).
 
    .. versionadded:: 2.2
 
@@ -281,12 +281,12 @@
 
 .. attribute:: Node.previousSibling
 
-   The node that immediately precedes this one with the same parent.  For instance
-   the element with an end-tag that comes just before the *self* element's start-
-   tag.  Of course, XML documents are made up of more than just elements so the
-   previous sibling could be text, a comment, or something else.  If this node is
-   the first child of the parent, this attribute will be ``None``. This is a read-
-   only attribute.
+   The node that immediately precedes this one with the same parent.  For
+   instance the element with an end-tag that comes just before the *self*
+   element's start-tag.  Of course, XML documents are made up of more than just
+   elements so the previous sibling could be text, a comment, or something else.
+   If this node is the first child of the parent, this attribute will be
+   ``None``. This is a read-only attribute.
 
 
 .. attribute:: Node.nextSibling

Modified: doctools/trunk/Doc-26/library/xml.etree.elementtree.rst
==============================================================================
--- doctools/trunk/Doc-26/library/xml.etree.elementtree.rst	(original)
+++ doctools/trunk/Doc-26/library/xml.etree.elementtree.rst	Sun Aug  5 00:45:13 2007
@@ -354,8 +354,8 @@
 .. method:: ElementTree.write(file[, encoding])
 
    Writes the element tree to a file, as XML. *file* is a file name, or a file
-   object opened for writing. *encoding* is the output encoding (default is US-
-   ASCII).
+   object opened for writing. *encoding* is the output encoding (default is
+   US-ASCII).
 
 
 .. _elementtree-qname-objects:

Modified: doctools/trunk/Doc-26/library/xml.sax.handler.rst
==============================================================================
--- doctools/trunk/Doc-26/library/xml.sax.handler.rst	(original)
+++ doctools/trunk/Doc-26/library/xml.sax.handler.rst	Sun Aug  5 00:45:13 2007
@@ -60,11 +60,11 @@
 
 .. data:: feature_namespace_prefixes
 
-   Value: ``"http://xml.org/sax/features/namespace-prefixes"`` ---  true: Report
-   the original prefixed names and attributes used for Namespace declarations. ---
-   false: Do not report attributes used for Namespace declarations, and optionally
-   do not report original prefixed names (default). ---  access: (parsing) read-
-   only; (not parsing) read/write
+   Value: ``"http://xml.org/sax/features/namespace-prefixes"`` --- true: Report
+   the original prefixed names and attributes used for Namespace
+   declarations. --- false: Do not report attributes used for Namespace
+   declarations, and optionally do not report original prefixed names
+   (default). --- access: (parsing) read-only; (not parsing) read/write
 
 
 .. data:: feature_string_interning
@@ -78,10 +78,10 @@
 
 .. data:: feature_validation
 
-   Value: ``"http://xml.org/sax/features/validation"`` ---  true: Report all
-   validation errors (implies external-general-entities and external-parameter-
-   entities). ---  false: Do not report validation errors. ---  access: (parsing)
-   read-only; (not parsing) read/write
+   Value: ``"http://xml.org/sax/features/validation"`` --- true: Report all
+   validation errors (implies external-general-entities and
+   external-parameter-entities). --- false: Do not report validation errors. ---
+   access: (parsing) read-only; (not parsing) read/write
 
 
 .. data:: feature_external_ges

Modified: doctools/trunk/Doc-26/library/xml.sax.reader.rst
==============================================================================
--- doctools/trunk/Doc-26/library/xml.sax.reader.rst	(original)
+++ doctools/trunk/Doc-26/library/xml.sax.reader.rst	Sun Aug  5 00:45:13 2007
@@ -288,8 +288,8 @@
 
 .. method:: InputSource.setByteStream(bytefile)
 
-   Set the byte stream (a Python file-like object which does not perform byte-to-
-   character conversion) for this input source.
+   Set the byte stream (a Python file-like object which does not perform
+   byte-to-character conversion) for this input source.
 
    The SAX parser will ignore this if there is also a character stream specified,
    but it will use a byte stream in preference to opening a URI connection itself.

Modified: doctools/trunk/Doc-26/library/xml.sax.utils.rst
==============================================================================
--- doctools/trunk/Doc-26/library/xml.sax.utils.rst	(original)
+++ doctools/trunk/Doc-26/library/xml.sax.utils.rst	Sun Aug  5 00:45:13 2007
@@ -37,13 +37,14 @@
 
 .. function:: quoteattr(data[, entities])
 
-   Similar to :func:`escape`, but also prepares *data* to be used as an attribute
-   value.  The return value is a quoted version of *data* with any additional
-   required replacements. :func:`quoteattr` will select a quote character based on
-   the content of *data*, attempting to avoid encoding any quote characters in the
-   string.  If both single- and double-quote characters are already in *data*, the
-   double-quote characters will be encoded and *data* will be wrapped in double-
-   quotes.  The resulting string can be used directly as an attribute value::
+   Similar to :func:`escape`, but also prepares *data* to be used as an
+   attribute value.  The return value is a quoted version of *data* with any
+   additional required replacements. :func:`quoteattr` will select a quote
+   character based on the content of *data*, attempting to avoid encoding any
+   quote characters in the string.  If both single- and double-quote characters
+   are already in *data*, the double-quote characters will be encoded and *data*
+   will be wrapped in double-quotes.  The resulting string can be used directly
+   as an attribute value::
 
       >>> print "<element attr=%s>" % quoteattr("ab ' cd \" ef")
       <element attr="ab ' cd &quot; ef">

Modified: doctools/trunk/Doc-26/license.rst
==============================================================================
--- doctools/trunk/Doc-26/license.rst	(original)
+++ doctools/trunk/Doc-26/license.rst	Sun Aug  5 00:45:13 2007
@@ -105,7 +105,7 @@
 ============================================================
 
 
-.. centered:: **PSF LICENSE AGREEMENT FOR PYTHON |release|**
+.. centered:: **PSF LICENSE AGREEMENT FOR PYTHON** |release|
 
 #. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and
    the Individual or Organization ("Licensee") accessing and otherwise using Python

Modified: doctools/trunk/Doc-26/maclib/using.rst
==============================================================================
--- doctools/trunk/Doc-26/maclib/using.rst	(original)
+++ doctools/trunk/Doc-26/maclib/using.rst	Sun Aug  5 00:45:13 2007
@@ -43,8 +43,8 @@
 
 The Apple-provided build of Python is installed in
 :file:`/System/Library/Frameworks/Python.framework` and :file:`/usr/bin/python`,
-respectively. You should never modify or delete these, as they are Apple-
-controlled and are used by Apple- or third-party software.
+respectively. You should never modify or delete these, as they are
+Apple-controlled and are used by Apple- or third-party software.
 
 IDLE includes a help menu that allows you to access Python documentation. If you
 are completely new to Python you should start reading the tutorial introduction

Modified: doctools/trunk/Doc-26/reference/datamodel.rst
==============================================================================
--- doctools/trunk/Doc-26/reference/datamodel.rst	(original)
+++ doctools/trunk/Doc-26/reference/datamodel.rst	Sun Aug  5 00:45:13 2007
@@ -251,10 +251,10 @@
       single: item selection
       single: subscription
 
-   These represent finite ordered sets indexed by non-negative numbers. The built-
-   in function :func:`len` returns the number of items of a sequence. When the
-   length of a sequence is *n*, the index set contains the numbers 0, 1, ...,
-   *n*-1.  Item *i* of sequence *a* is selected by ``a[i]``.
+   These represent finite ordered sets indexed by non-negative numbers. The
+   built-in function :func:`len` returns the number of items of a sequence. When
+   the length of a sequence is *n*, the index set contains the numbers 0, 1,
+   ..., *n*-1.  Item *i* of sequence *a* is selected by ``a[i]``.
 
    .. index:: single: slicing
 
@@ -592,13 +592,13 @@
          single: im_self (method attribute)
 
       When a user-defined method object is created by retrieving a user-defined
-      function object from a class, its :attr:`im_self` attribute is ``None`` and the
-      method object is said to be unbound. When one is created by retrieving a user-
-      defined function object from a class via one of its instances, its
-      :attr:`im_self` attribute is the instance, and the method object is said to be
-      bound. In either case, the new method's :attr:`im_class` attribute is the class
-      from which the retrieval takes place, and its :attr:`im_func` attribute is the
-      original function object.
+      function object from a class, its :attr:`im_self` attribute is ``None``
+      and the method object is said to be unbound. When one is created by
+      retrieving a user-defined function object from a class via one of its
+      instances, its :attr:`im_self` attribute is the instance, and the method
+      object is said to be bound. In either case, the new method's
+      :attr:`im_class` attribute is the class from which the retrieval takes
+      place, and its :attr:`im_func` attribute is the original function object.
 
       .. index:: single: im_func (method attribute)
 
@@ -664,14 +664,14 @@
          object: function
          pair: C; language
 
-      A built-in function object is a wrapper around a C function.  Examples of built-
-      in functions are :func:`len` and :func:`math.sin` (:mod:`math` is a standard
-      built-in module). The number and type of the arguments are determined by the C
-      function. Special read-only attributes: :attr:`__doc__` is the function's
-      documentation string, or ``None`` if unavailable; :attr:`__name__` is the
-      function's name; :attr:`__self__` is set to ``None`` (but see the next item);
-      :attr:`__module__` is the name of the module the function was defined in or
-      ``None`` if unavailable.
+      A built-in function object is a wrapper around a C function.  Examples of
+      built-in functions are :func:`len` and :func:`math.sin` (:mod:`math` is a
+      standard built-in module). The number and type of the arguments are
+      determined by the C function. Special read-only attributes:
+      :attr:`__doc__` is the function's documentation string, or ``None`` if
+      unavailable; :attr:`__name__` is the function's name; :attr:`__self__` is
+      set to ``None`` (but see the next item); :attr:`__module__` is the name of
+      the module the function was defined in or ``None`` if unavailable.
 
    Built-in methods
       .. index::
@@ -750,12 +750,12 @@
    of the shared library file.
 
 Classes
-   Class objects are created by class definitions (see section :ref:`class`).
-   A class has a namespace implemented by a dictionary object. Class
-   attribute references are translated to lookups in this dictionary, e.g., ``C.x``
-   is translated to ``C.__dict__["x"]``. When the attribute name is not found
-   there, the attribute search continues in the base classes.  The search is depth-
-   first, left-to-right in the order of occurrence in the base class list.
+   Class objects are created by class definitions (see section :ref:`class`).  A
+   class has a namespace implemented by a dictionary object. Class attribute
+   references are translated to lookups in this dictionary, e.g., ``C.x`` is
+   translated to ``C.__dict__["x"]``. When the attribute name is not found
+   there, the attribute search continues in the base classes.  The search is
+   depth-first, left-to-right in the order of occurrence in the base class list.
 
    .. index::
       object: class
@@ -766,17 +766,17 @@
       object: dictionary
       pair: class; attribute
 
-   When a class attribute reference (for class :class:`C`, say) would yield a user-
-   defined function object or an unbound user-defined method object whose
+   When a class attribute reference (for class :class:`C`, say) would yield a
+   user-defined function object or an unbound user-defined method object whose
    associated class is either :class:`C` or one of its base classes, it is
    transformed into an unbound user-defined method object whose :attr:`im_class`
    attribute is :class:`C`. When it would yield a class method object, it is
-   transformed into a bound user-defined method object whose :attr:`im_class` and
-   :attr:`im_self` attributes are both :class:`C`.  When it would yield a static
-   method object, it is transformed into the object wrapped by the static method
-   object. See section :ref:`descriptors` for another way in which attributes
-   retrieved from a class may differ from those actually contained in its
-   :attr:`__dict__`.
+   transformed into a bound user-defined method object whose :attr:`im_class`
+   and :attr:`im_self` attributes are both :class:`C`.  When it would yield a
+   static method object, it is transformed into the object wrapped by the static
+   method object. See section :ref:`descriptors` for another way in which
+   attributes retrieved from a class may differ from those actually contained in
+   its :attr:`__dict__`.
 
    .. index:: triple: class; attribute; assignment
 
@@ -2039,14 +2039,14 @@
 
    These methods are called to implement the augmented arithmetic operations
    (``+=``, ``-=``, ``*=``, ``/=``, ``//=``, ``%=``, ``**=``, ``<<=``, ``>>=``,
-   ``&=``, ``^=``, ``|=``).  These methods should attempt to do the operation in-
-   place (modifying *self*) and return the result (which could be, but does not
-   have to be, *self*).  If a specific method is not defined, the augmented
+   ``&=``, ``^=``, ``|=``).  These methods should attempt to do the operation
+   in-place (modifying *self*) and return the result (which could be, but does
+   not have to be, *self*).  If a specific method is not defined, the augmented
    operation falls back to the normal methods.  For instance, to evaluate the
    expression *x*``+=``*y*, where *x* is an instance of a class that has an
-   :meth:`__iadd__` method, ``x.__iadd__(y)`` is called.  If *x* is an instance of
-   a class that does not define a :meth:`__iadd__` method, ``x.__add__(y)`` and
-   ``y.__radd__(x)`` are considered, as with the evaluation of *x*``+``*y*.
+   :meth:`__iadd__` method, ``x.__iadd__(y)`` is called.  If *x* is an instance
+   of a class that does not define a :meth:`__iadd__` method, ``x.__add__(y)``
+   and ``y.__radd__(x)`` are considered, as with the evaluation of *x*``+``*y*.
 
 
 .. method:: numeric object.__neg__(self)

Modified: doctools/trunk/Doc-26/reference/executionmodel.rst
==============================================================================
--- doctools/trunk/Doc-26/reference/executionmodel.rst	(original)
+++ doctools/trunk/Doc-26/reference/executionmodel.rst	Sun Aug  5 00:45:13 2007
@@ -206,8 +206,8 @@
 
 Python uses the "termination" model of error handling: an exception handler can
 find out what happened and continue execution at an outer level, but it cannot
-repair the cause of the error and retry the failing operation (except by re-
-entering the offending piece of code from the top).
+repair the cause of the error and retry the failing operation (except by
+re-entering the offending piece of code from the top).
 
 .. index:: single: SystemExit (built-in exception)
 

Modified: doctools/trunk/Doc-26/reference/expressions.rst
==============================================================================
--- doctools/trunk/Doc-26/reference/expressions.rst	(original)
+++ doctools/trunk/Doc-26/reference/expressions.rst	Sun Aug  5 00:45:13 2007
@@ -196,9 +196,9 @@
    pair: empty; list
 
 A list display yields a new list object.  Its contents are specified by
-providing either a list of expressions or a list comprehension.  When a comma-
-separated list of expressions is supplied, its elements are evaluated from left
-to right and placed into the list object in that order.  When a list
+providing either a list of expressions or a list comprehension.  When a
+comma-separated list of expressions is supplied, its elements are evaluated from
+left to right and placed into the list object in that order.  When a list
 comprehension is supplied, it consists of a single expression followed by at
 least one :keyword:`for` clause and zero or more :keyword:`for` or :keyword:`if`
 clauses.  In this case, the elements of the new list are those that would be

Modified: doctools/trunk/Doc-26/reference/lexical_analysis.rst
==============================================================================
--- doctools/trunk/Doc-26/reference/lexical_analysis.rst	(original)
+++ doctools/trunk/Doc-26/reference/lexical_analysis.rst	Sun Aug  5 00:45:13 2007
@@ -457,14 +457,14 @@
 
 In plain English: String literals can be enclosed in matching single quotes
 (``'``) or double quotes (``"``).  They can also be enclosed in matching groups
-of three single or double quotes (these are generally referred to as *triple-
-quoted strings*).  The backslash (``\``) character is used to escape characters
-that otherwise have a special meaning, such as newline, backslash itself, or the
-quote character.  String literals may optionally be prefixed with a letter
-``'r'`` or ``'R'``; such strings are called :dfn:`raw strings` and use different
-rules for interpreting backslash escape sequences.  A prefix of ``'u'`` or
-``'U'`` makes the string a Unicode string.  Unicode strings use the Unicode
-character set as defined by the Unicode Consortium and ISO 10646.  Some
+of three single or double quotes (these are generally referred to as
+*triple-quoted strings*).  The backslash (``\``) character is used to escape
+characters that otherwise have a special meaning, such as newline, backslash
+itself, or the quote character.  String literals may optionally be prefixed with
+a letter ``'r'`` or ``'R'``; such strings are called :dfn:`raw strings` and use
+different rules for interpreting backslash escape sequences.  A prefix of
+``'u'`` or ``'U'`` makes the string a Unicode string.  Unicode strings use the
+Unicode character set as defined by the Unicode Consortium and ISO 10646.  Some
 additional escape sequences, described below, are available in Unicode strings.
 The two prefix characters may be combined; in this case, ``'u'`` must appear
 before ``'r'``.

Modified: doctools/trunk/Doc-26/reference/simple_stmts.rst
==============================================================================
--- doctools/trunk/Doc-26/reference/simple_stmts.rst	(original)
+++ doctools/trunk/Doc-26/reference/simple_stmts.rst	Sun Aug  5 00:45:13 2007
@@ -790,11 +790,8 @@
 can appear before a future statement are:
 
 * the module docstring (if any),
-
 * comments,
-
 * blank lines, and
-
 * other future statements.
 
 The features recognized by Python 2.5 are ``absolute_import``, ``division``,

Modified: doctools/trunk/Doc-26/tutorial/appetite.rst
==============================================================================
--- doctools/trunk/Doc-26/tutorial/appetite.rst	(original)
+++ doctools/trunk/Doc-26/tutorial/appetite.rst	Sun Aug  5 00:45:13 2007
@@ -5,10 +5,10 @@
 **********************
 
 If you do much work on computers, eventually you find that there's some task
-you'd like to automate.  For example, you may wish to perform a search-and-
-replace over a large number of text files, or rename and rearrange a bunch of
-photo files in a complicated way. Perhaps you'd like to write a small custom
-database, or a specialized GUI application, or a simple game.
+you'd like to automate.  For example, you may wish to perform a
+search-and-replace over a large number of text files, or rename and rearrange a
+bunch of photo files in a complicated way. Perhaps you'd like to write a small
+custom database, or a specialized GUI application, or a simple game.
 
 If you're a professional software developer, you may have to work with several
 C/C++/Java libraries but find the usual write/compile/test/re-compile cycle is

Modified: doctools/trunk/Doc-26/tutorial/datastructures.rst
==============================================================================
--- doctools/trunk/Doc-26/tutorial/datastructures.rst	(original)
+++ doctools/trunk/Doc-26/tutorial/datastructures.rst	Sun Aug  5 00:45:13 2007
@@ -451,8 +451,8 @@
    >>> 'guido' in tel
    True
 
-The :func:`dict` constructor builds dictionaries directly from lists of key-
-value pairs stored as tuples.  When the pairs form a pattern, list
+The :func:`dict` constructor builds dictionaries directly from lists of
+key-value pairs stored as tuples.  When the pairs form a pattern, list
 comprehensions can compactly specify the key-value list. ::
 
    >>> dict([('sape', 4139), ('guido', 4127), ('jack', 4098)])

Modified: doctools/trunk/Doc-26/tutorial/errors.rst
==============================================================================
--- doctools/trunk/Doc-26/tutorial/errors.rst	(original)
+++ doctools/trunk/Doc-26/tutorial/errors.rst	Sun Aug  5 00:45:13 2007
@@ -227,8 +227,8 @@
 fine, but there seems to be a growing stylistic preference for the latter.
 
 If you need to determine whether an exception was raised but don't intend to
-handle it, a simpler form of the :keyword:`raise` statement allows you to re-
-raise the exception::
+handle it, a simpler form of the :keyword:`raise` statement allows you to
+re-raise the exception::
 
    >>> try:
    ...     raise NameError, 'HiThere'

Modified: doctools/trunk/Doc-26/tutorial/glossary.rst
==============================================================================
--- doctools/trunk/Doc-26/tutorial/glossary.rst	(original)
+++ doctools/trunk/Doc-26/tutorial/glossary.rst	Sun Aug  5 00:45:13 2007
@@ -155,13 +155,14 @@
    .. index:: single: global interpreter lock
 
 global interpreter lock
-   The lock used by Python threads to assure that only one thread can be run at a
-   time.  This simplifies Python by assuring that no two processes can access the
-   same memory at the same time.  Locking the entire interpreter makes it easier
-   for the interpreter to be multi-threaded, at the expense of some parallelism on
-   multi-processor machines.  Efforts have been made in the past to create a "free-
-   threaded" interpreter (one which locks shared data at a much finer granularity),
-   but performance suffered in the common single-processor case.
+   The lock used by Python threads to assure that only one thread can be run at
+   a time.  This simplifies Python by assuring that no two processes can access
+   the same memory at the same time.  Locking the entire interpreter makes it
+   easier for the interpreter to be multi-threaded, at the expense of some
+   parallelism on multi-processor machines.  Efforts have been made in the past
+   to create a "free-threaded" interpreter (one which locks shared data at a
+   much finer granularity), but performance suffered in the common
+   single-processor case.
 
    .. index:: single: IDLE
 

Modified: doctools/trunk/Doc-26/tutorial/introduction.rst
==============================================================================
--- doctools/trunk/Doc-26/tutorial/introduction.rst	(original)
+++ doctools/trunk/Doc-26/tutorial/introduction.rst	Sun Aug  5 00:45:13 2007
@@ -429,9 +429,10 @@
 characters of Latin-1.
 
 For experts, there is also a raw mode just like the one for normal strings. You
-have to prefix the opening quote with 'ur' to have Python use the *Raw-Unicode-
-Escape* encoding. It will only apply the above ``\uXXXX`` conversion if there is
-an uneven number of backslashes in front of the small 'u'. ::
+have to prefix the opening quote with 'ur' to have Python use the
+*Raw-Unicode-Escape* encoding. It will only apply the above ``\uXXXX``
+conversion if there is an uneven number of backslashes in front of the small
+'u'. ::
 
    >>> ur'Hello\u0020World !'
    u'Hello World !'

Modified: doctools/trunk/Doc-26/tutorial/modules.rst
==============================================================================
--- doctools/trunk/Doc-26/tutorial/modules.rst	(original)
+++ doctools/trunk/Doc-26/tutorial/modules.rst	Sun Aug  5 00:45:13 2007
@@ -168,9 +168,9 @@
 
 As an important speed-up of the start-up time for short programs that use a lot
 of standard modules, if a file called :file:`spam.pyc` exists in the directory
-where :file:`spam.py` is found, this is assumed to contain an already-"byte-
-compiled" version of the module :mod:`spam`. The modification time of the
-version of :file:`spam.py` used to create :file:`spam.pyc` is recorded in
+where :file:`spam.py` is found, this is assumed to contain an
+already-"byte-compiled" version of the module :mod:`spam`. The modification time
+of the version of :file:`spam.py` used to create :file:`spam.pyc` is recorded in
 :file:`spam.pyc`, and the :file:`.pyc` file is ignored if these don't match.
 
 Normally, you don't need to do anything to create the :file:`spam.pyc` file.

Modified: doctools/trunk/Doc-26/tutorial/whatnow.rst
==============================================================================
--- doctools/trunk/Doc-26/tutorial/whatnow.rst	(original)
+++ doctools/trunk/Doc-26/tutorial/whatnow.rst	Sun Aug  5 00:45:13 2007
@@ -49,12 +49,12 @@
   Cookbook (O'Reilly & Associates, ISBN 0-596-00797-3.)
 
 For Python-related questions and problem reports, you can post to the newsgroup
-:newsgroup:`comp.lang.python`, or send them to the mailing list at python-
-list at python.org.  The newsgroup and mailing list are gatewayed, so messages
-posted to one will automatically be forwarded to the other.  There are around
-120 postings a day (with peaks up to several hundred), asking (and answering)
-questions, suggesting new features, and announcing new modules.  Before posting,
-be sure to check the list of `Frequently Asked Questions
+:newsgroup:`comp.lang.python`, or send them to the mailing list at
+python-list at python.org.  The newsgroup and mailing list are gatewayed, so
+messages posted to one will automatically be forwarded to the other.  There are
+around 120 postings a day (with peaks up to several hundred), asking (and
+answering) questions, suggesting new features, and announcing new modules.
+Before posting, be sure to check the list of `Frequently Asked Questions
 <http://www.python.org/doc/faq/>`_ (also called the FAQ), or look for it in the
 :file:`Misc/` directory of the Python source distribution.  Mailing list
 archives are available at http://mail.python.org/pipermail/. The FAQ answers

Modified: doctools/trunk/Doc-26/whatsnew/2.0.rst
==============================================================================
--- doctools/trunk/Doc-26/whatsnew/2.0.rst	(original)
+++ doctools/trunk/Doc-26/whatsnew/2.0.rst	Sun Aug  5 00:45:13 2007
@@ -181,7 +181,7 @@
 * ``ord(u)``, where *u* is a 1-character regular or Unicode string, returns the
   number of the character as an integer.
 
-* ``unicode(string [, *encoding*]  [, *errors*] )`` creates a Unicode string
+* ``unicode(string [, encoding]  [, errors] )`` creates a Unicode string
   from an 8-bit string.  ``encoding`` is a string naming the encoding to use. The
   ``errors`` parameter specifies the treatment of characters that are invalid for
   the current encoding; passing ``'strict'`` as the value causes an exception to

Modified: doctools/trunk/Doc-26/whatsnew/2.1.rst
==============================================================================
--- doctools/trunk/Doc-26/whatsnew/2.1.rst	(original)
+++ doctools/trunk/Doc-26/whatsnew/2.1.rst	Sun Aug  5 00:45:13 2007
@@ -755,12 +755,12 @@
   Wolfson, but after some python-dev discussion, a weaker final version was
   checked in.
 
-* Applying :func:`repr` to strings previously used octal escapes for non-
-  printable characters; for example, a newline was ``'\012'``.  This was a
+* Applying :func:`repr` to strings previously used octal escapes for
+  non-printable characters; for example, a newline was ``'\012'``.  This was a
   vestigial trace of Python's C ancestry, but today octal is of very little
   practical use.  Ka-Ping Yee suggested using hex escapes instead of octal ones,
-  and using the ``\n``, ``\t``, ``\r`` escapes for the appropriate characters, and
-  implemented this new formatting.
+  and using the ``\n``, ``\t``, ``\r`` escapes for the appropriate characters,
+  and implemented this new formatting.
 
 * Syntax errors detected at compile-time can now raise exceptions containing the
   filename and line number of the error, a pleasant side effect of the compiler

Modified: doctools/trunk/Doc-26/whatsnew/2.3.rst
==============================================================================
--- doctools/trunk/Doc-26/whatsnew/2.3.rst	(original)
+++ doctools/trunk/Doc-26/whatsnew/2.3.rst	Sun Aug  5 00:45:13 2007
@@ -1660,12 +1660,13 @@
      >{}>{}> u"www.Alliancefrançaise.nu".encode("idna")
      'www.xn--alliancefranaise-npb.nu'
 
-  The :mod:`socket` module has also been extended to transparently convert Unicode
-  hostnames to the ACE version before passing them to the C library.  Modules that
-  deal with hostnames such as :mod:`httplib` and :mod:`ftplib`) also support
-  Unicode host names; :mod:`httplib` also sends HTTP ``Host`` headers using the
-  ACE version of the domain name.  :mod:`urllib` supports Unicode URLs with non-
-  ASCII host names as long as the ``path`` part of the URL is ASCII only.
+  The :mod:`socket` module has also been extended to transparently convert
+  Unicode hostnames to the ACE version before passing them to the C library.
+  Modules that deal with hostnames such as :mod:`httplib` and :mod:`ftplib`)
+  also support Unicode host names; :mod:`httplib` also sends HTTP ``Host``
+  headers using the ACE version of the domain name.  :mod:`urllib` supports
+  Unicode URLs with non-ASCII host names as long as the ``path`` part of the URL
+  is ASCII only.
 
   To implement this change, the :mod:`stringprep` module, the  ``mkstringprep``
   tool and the ``punycode`` encoding have been added.

Modified: doctools/trunk/Doc-26/whatsnew/2.5.rst
==============================================================================
--- doctools/trunk/Doc-26/whatsnew/2.5.rst	(original)
+++ doctools/trunk/Doc-26/whatsnew/2.5.rst	Sun Aug  5 00:45:13 2007
@@ -1048,12 +1048,12 @@
   returned by the iterator evaluate as true. (Suggested by Guido van Rossum, and
   implemented by Raymond Hettinger.)
 
-* The result of a class's :meth:`__hash__` method can now  be either a long
+* The result of a class's :meth:`__hash__` method can now be either a long
   integer or a regular integer.  If a long integer is returned, the hash of that
-  value is taken.  In earlier versions the hash value was required to be a regular
-  integer, but in 2.5 the :func:`id` built-in was changed to always return non-
-  negative numbers, and users often seem to use ``id(self)`` in :meth:`__hash__`
-  methods (though this is discouraged).
+  value is taken.  In earlier versions the hash value was required to be a
+  regular integer, but in 2.5 the :func:`id` built-in was changed to always
+  return non-negative numbers, and users often seem to use ``id(self)`` in
+  :meth:`__hash__` methods (though this is discouraged).
 
   .. % Bug #1536021
 

Modified: doctools/trunk/Doc-3k/c-api/abstract.rst
==============================================================================
--- doctools/trunk/Doc-3k/c-api/abstract.rst	(original)
+++ doctools/trunk/Doc-3k/c-api/abstract.rst	Sun Aug  5 00:45:13 2007
@@ -182,9 +182,9 @@
 either is not a class object, a more general mechanism is used to determine the
 class relationship of the two objects.  When testing if *B* is a subclass of
 *A*, if *A* is *B*, :cfunc:`PyObject_IsSubclass` returns true.  If *A* and *B*
-are different objects, *B*'s :attr:`__bases__` attribute is searched in a depth-
-first fashion for *A* --- the presence of the :attr:`__bases__` attribute is
-considered sufficient for this determination.
+are different objects, *B*'s :attr:`__bases__` attribute is searched in a
+depth-first fashion for *A* --- the presence of the :attr:`__bases__` attribute
+is considered sufficient for this determination.
 
 
 .. cfunction:: int PyObject_IsSubclass(PyObject *derived, PyObject *cls)

Modified: doctools/trunk/Doc-3k/c-api/concrete.rst
==============================================================================
--- doctools/trunk/Doc-3k/c-api/concrete.rst	(original)
+++ doctools/trunk/Doc-3k/c-api/concrete.rst	Sun Aug  5 00:45:13 2007
@@ -1758,11 +1758,9 @@
 
    Rich compare two unicode strings and return one of the following:
 
-* ``NULL`` in case an exception was raised
-
-* :const:`Py_True` or :const:`Py_False` for successful comparisons
-
-* :const:`Py_NotImplemented` in case the type combination is unknown
+   * ``NULL`` in case an exception was raised
+   * :const:`Py_True` or :const:`Py_False` for successful comparisons
+   * :const:`Py_NotImplemented` in case the type combination is unknown
 
    Note that :const:`Py_EQ` and :const:`Py_NE` comparisons can cause a
    :exc:`UnicodeWarning` in case the conversion of the arguments to Unicode fails
@@ -2528,7 +2526,7 @@
 
    .. index:: single: EOFError (built-in exception)
 
-   Equivalent to ``p.readline([*n*])``, this function reads one line from the
+   Equivalent to ``p.readline([n])``, this function reads one line from the
    object *p*.  *p* may be a file object or any object with a :meth:`readline`
    method.  If *n* is ``0``, exactly one line is read, regardless of the length of
    the line.  If *n* is greater than ``0``, no more than *n* bytes will be read
@@ -2890,8 +2888,9 @@
 
 .. cvar:: PyTypeObject PySeqIter_Type
 
-   Type object for iterator objects returned by :cfunc:`PySeqIter_New` and the one-
-   argument form of the :func:`iter` built-in function for built-in sequence types.
+   Type object for iterator objects returned by :cfunc:`PySeqIter_New` and the
+   one-argument form of the :func:`iter` built-in function for built-in sequence
+   types.
 
    .. versionadded:: 2.2
 
@@ -3082,14 +3081,14 @@
 
 .. cfunction:: PyObject* PyWeakref_NewRef(PyObject *ob, PyObject *callback)
 
-   Return a weak reference object for the object *ob*.  This will always return a
-   new reference, but is not guaranteed to create a new object; an existing
+   Return a weak reference object for the object *ob*.  This will always return
+   a new reference, but is not guaranteed to create a new object; an existing
    reference object may be returned.  The second parameter, *callback*, can be a
    callable object that receives notification when *ob* is garbage collected; it
    should accept a single parameter, which will be the weak reference object
-   itself. *callback* may also be ``None`` or *NULL*.  If *ob* is not a weakly-
-   referencable object, or if *callback* is not callable, ``None``, or *NULL*, this
-   will return *NULL* and raise :exc:`TypeError`.
+   itself. *callback* may also be ``None`` or *NULL*.  If *ob* is not a
+   weakly-referencable object, or if *callback* is not callable, ``None``, or
+   *NULL*, this will return *NULL* and raise :exc:`TypeError`.
 
    .. versionadded:: 2.2
 
@@ -3098,12 +3097,12 @@
 
    Return a weak reference proxy object for the object *ob*.  This will always
    return a new reference, but is not guaranteed to create a new object; an
-   existing proxy object may be returned.  The second parameter, *callback*, can be
-   a callable object that receives notification when *ob* is garbage collected; it
-   should accept a single parameter, which will be the weak reference object
-   itself. *callback* may also be ``None`` or *NULL*.  If *ob* is not a weakly-
-   referencable object, or if *callback* is not callable, ``None``, or *NULL*, this
-   will return *NULL* and raise :exc:`TypeError`.
+   existing proxy object may be returned.  The second parameter, *callback*, can
+   be a callable object that receives notification when *ob* is garbage
+   collected; it should accept a single parameter, which will be the weak
+   reference object itself. *callback* may also be ``None`` or *NULL*.  If *ob*
+   is not a weakly-referencable object, or if *callback* is not callable,
+   ``None``, or *NULL*, this will return *NULL* and raise :exc:`TypeError`.
 
    .. versionadded:: 2.2
 

Modified: doctools/trunk/Doc-3k/c-api/init.rst
==============================================================================
--- doctools/trunk/Doc-3k/c-api/init.rst	(original)
+++ doctools/trunk/Doc-3k/c-api/init.rst	Sun Aug  5 00:45:13 2007
@@ -102,15 +102,16 @@
    ``sys.stdout`` and ``sys.stderr`` (however these refer to the same underlying
    :ctype:`FILE` structures in the C library).
 
-   The return value points to the first thread state created in the new sub-
-   interpreter.  This thread state is made in the current thread state.  Note that
-   no actual thread is created; see the discussion of thread states below.  If
-   creation of the new interpreter is unsuccessful, *NULL* is returned; no
-   exception is set since the exception state is stored in the current thread state
-   and there may not be a current thread state.  (Like all other Python/C API
-   functions, the global interpreter lock must be held before calling this function
-   and is still held when it returns; however, unlike most other Python/C API
-   functions, there needn't be a current thread state on entry.)
+   The return value points to the first thread state created in the new
+   sub-interpreter.  This thread state is made in the current thread state.
+   Note that no actual thread is created; see the discussion of thread states
+   below.  If creation of the new interpreter is unsuccessful, *NULL* is
+   returned; no exception is set since the exception state is stored in the
+   current thread state and there may not be a current thread state.  (Like all
+   other Python/C API functions, the global interpreter lock must be held before
+   calling this function and is still held when it returns; however, unlike most
+   other Python/C API functions, there needn't be a current thread state on
+   entry.)
 
    .. index::
       single: Py_Finalize()
@@ -169,15 +170,15 @@
       single: main()
       single: Py_GetPath()
 
-   This function should be called before :cfunc:`Py_Initialize` is called for the
-   first time, if it is called at all.  It tells the interpreter the value of the
-   ``argv[0]`` argument to the :cfunc:`main` function of the program.  This is used
-   by :cfunc:`Py_GetPath` and some other functions below to find the Python run-
-   time libraries relative to the interpreter executable.  The default value is
-   ``'python'``.  The argument should point to a zero-terminated character string
-   in static storage whose contents will not change for the duration of the
-   program's execution.  No code in the Python interpreter will change the contents
-   of this storage.
+   This function should be called before :cfunc:`Py_Initialize` is called for
+   the first time, if it is called at all.  It tells the interpreter the value
+   of the ``argv[0]`` argument to the :cfunc:`main` function of the program.
+   This is used by :cfunc:`Py_GetPath` and some other functions below to find
+   the Python run-time libraries relative to the interpreter executable.  The
+   default value is ``'python'``.  The argument should point to a
+   zero-terminated character string in static storage whose contents will not
+   change for the duration of the program's execution.  No code in the Python
+   interpreter will change the contents of this storage.
 
 
 .. cfunction:: char* Py_GetProgramName()
@@ -376,12 +377,12 @@
    single: interpreter lock
    single: lock, interpreter
 
-The Python interpreter is not fully thread safe.  In order to support multi-
-threaded Python programs, there's a global lock that must be held by the current
-thread before it can safely access Python objects. Without the lock, even the
-simplest operations could cause problems in a multi-threaded program: for
-example, when two threads simultaneously increment the reference count of the
-same object, the reference count could end up being incremented only once
+The Python interpreter is not fully thread safe.  In order to support
+multi-threaded Python programs, there's a global lock that must be held by the
+current thread before it can safely access Python objects. Without the lock,
+even the simplest operations could cause problems in a multi-threaded program:
+for example, when two threads simultaneously increment the reference count of
+the same object, the reference count could end up being incremented only once
 instead of twice.
 
 .. index:: single: setcheckinterval() (in module sys)

Modified: doctools/trunk/Doc-3k/c-api/intro.rst
==============================================================================
--- doctools/trunk/Doc-3k/c-api/intro.rst	(original)
+++ doctools/trunk/Doc-3k/c-api/intro.rst	Sun Aug  5 00:45:13 2007
@@ -70,7 +70,7 @@
 
 To include the headers, place both directories (if different) on your compiler's
 search path for includes.  Do *not* place the parent directories on the search
-path and then use ``#include <python|version|/Python.h>``; this will break on
+path and then use ``#include <pythonX.Y/Python.h>``; this will break on
 multi-platform builds since the platform independent headers under
 :envvar:`prefix` include the platform specific headers from
 :envvar:`exec_prefix`.
@@ -397,16 +397,16 @@
 
 .. index:: single: exc_info() (in module sys)
 
-Note that starting with Python 1.5, the preferred, thread-safe way to  access
-the exception state from Python code is to call the function
-:func:`sys.exc_info`, which returns the per-thread exception state  for Python
-code.  Also, the semantics of both ways to access the  exception state have
-changed so that a function which catches an  exception will save and restore its
-thread's exception state so as to  preserve the exception state of its caller.
-This prevents common bugs  in exception handling code caused by an innocent-
-looking function  overwriting the exception being handled; it also reduces the
-often  unwanted lifetime extension for objects that are referenced by the  stack
-frames in the traceback.
+Note that starting with Python 1.5, the preferred, thread-safe way to access the
+exception state from Python code is to call the function :func:`sys.exc_info`,
+which returns the per-thread exception state for Python code.  Also, the
+semantics of both ways to access the exception state have changed so that a
+function which catches an exception will save and restore its thread's exception
+state so as to preserve the exception state of its caller.  This prevents common
+bugs in exception handling code caused by an innocent-looking function
+overwriting the exception being handled; it also reduces the often unwanted
+lifetime extension for objects that are referenced by the stack frames in the
+traceback.
 
 As a general principle, a function that calls another function to  perform some
 task should check whether the called function raised an  exception, and if so,
@@ -531,13 +531,13 @@
 based upon its best guess for the location of the standard Python interpreter
 executable, assuming that the Python library is found in a fixed location
 relative to the Python interpreter executable.  In particular, it looks for a
-directory named :file:`lib/python|version|` relative to the parent directory
+directory named :file:`lib/python{X.Y}` relative to the parent directory
 where the executable named :file:`python` is found on the shell command search
 path (the environment variable :envvar:`PATH`).
 
 For instance, if the Python executable is found in
 :file:`/usr/local/bin/python`, it will assume that the libraries are in
-:file:`/usr/local/lib/python|version|`.  (In fact, this particular path is also
+:file:`/usr/local/lib/python{X.Y}`.  (In fact, this particular path is also
 the "fallback" location, used when no executable file named :file:`python` is
 found along :envvar:`PATH`.)  The user can override this behavior by setting the
 environment variable :envvar:`PYTHONHOME`, or insert additional directories in
@@ -589,9 +589,9 @@
 Compiling the interpreter with the :cmacro:`Py_DEBUG` macro defined produces
 what is generally meant by "a debug build" of Python. :cmacro:`Py_DEBUG` is
 enabled in the Unix build by adding :option:`--with-pydebug` to the
-:file:`configure` command.  It is also implied by the presence of the not-
-Python-specific :cmacro:`_DEBUG` macro.  When :cmacro:`Py_DEBUG` is enabled in
-the Unix build, compiler optimization is disabled.
+:file:`configure` command.  It is also implied by the presence of the
+not-Python-specific :cmacro:`_DEBUG` macro.  When :cmacro:`Py_DEBUG` is enabled
+in the Unix build, compiler optimization is disabled.
 
 In addition to the reference count debugging described below, the following
 extra checks are performed:

Modified: doctools/trunk/Doc-3k/c-api/newtypes.rst
==============================================================================
--- doctools/trunk/Doc-3k/c-api/newtypes.rst	(original)
+++ doctools/trunk/Doc-3k/c-api/newtypes.rst	Sun Aug  5 00:45:13 2007
@@ -480,10 +480,10 @@
    The basic size does not include the GC header size (this is new in Python 2.2;
    in 2.1 and 2.0, the GC header size was included in :attr:`tp_basicsize`).
 
-   These fields are inherited separately by subtypes.  If the base type has a non-
-   zero :attr:`tp_itemsize`, it is generally not safe to set :attr:`tp_itemsize` to
-   a different non-zero value in a subtype (though this depends on the
-   implementation of the base type).
+   These fields are inherited separately by subtypes.  If the base type has a
+   non-zero :attr:`tp_itemsize`, it is generally not safe to set
+   :attr:`tp_itemsize` to a different non-zero value in a subtype (though this
+   depends on the implementation of the base type).
 
    A note about alignment: if the variable items require a particular alignment,
    this should be taken care of by the value of :attr:`tp_basicsize`.  Example:

Modified: doctools/trunk/Doc-3k/c-api/utilities.rst
==============================================================================
--- doctools/trunk/Doc-3k/c-api/utilities.rst	(original)
+++ doctools/trunk/Doc-3k/c-api/utilities.rst	Sun Aug  5 00:45:13 2007
@@ -489,13 +489,13 @@
    Unicode into a character buffer. It only works for encoded data without embedded
    NUL bytes.
 
-   This format requires two arguments.  The first is only used as input, and must
-   be a :ctype:`const char\*` which points to the name of an encoding as a NUL-
-   terminated string, or *NULL*, in which case the default encoding is used.  An
-   exception is raised if the named encoding is not known to Python.  The second
-   argument must be a :ctype:`char\*\*`; the value of the pointer it references
-   will be set to a buffer with the contents of the argument text.  The text will
-   be encoded in the encoding specified by the first argument.
+   This format requires two arguments.  The first is only used as input, and
+   must be a :ctype:`const char\*` which points to the name of an encoding as a
+   NUL-terminated string, or *NULL*, in which case the default encoding is used.
+   An exception is raised if the named encoding is not known to Python.  The
+   second argument must be a :ctype:`char\*\*`; the value of the pointer it
+   references will be set to a buffer with the contents of the argument text.
+   The text will be encoded in the encoding specified by the first argument.
 
    :cfunc:`PyArg_ParseTuple` will allocate a buffer of the needed size, copy the
    encoded data into this buffer and adjust *\*buffer* to reference the newly
@@ -513,14 +513,14 @@
    input data which contains NUL characters.
 
    It requires three arguments.  The first is only used as input, and must be a
-   :ctype:`const char\*` which points to the name of an encoding as a NUL-
-   terminated string, or *NULL*, in which case the default encoding is used.  An
-   exception is raised if the named encoding is not known to Python.  The second
-   argument must be a :ctype:`char\*\*`; the value of the pointer it references
-   will be set to a buffer with the contents of the argument text.  The text will
-   be encoded in the encoding specified by the first argument.  The third argument
-   must be a pointer to an integer; the referenced integer will be set to the
-   number of bytes in the output buffer.
+   :ctype:`const char\*` which points to the name of an encoding as a
+   NUL-terminated string, or *NULL*, in which case the default encoding is used.
+   An exception is raised if the named encoding is not known to Python.  The
+   second argument must be a :ctype:`char\*\*`; the value of the pointer it
+   references will be set to a buffer with the contents of the argument text.
+   The text will be encoded in the encoding specified by the first argument.
+   The third argument must be a pointer to an integer; the referenced integer
+   will be set to the number of bytes in the output buffer.
 
    There are two modes of operation:
 
@@ -979,14 +979,14 @@
 The return value (*rv*) for these functions should be interpreted as follows:
 
 * When ``0 <= rv < size``, the output conversion was successful and *rv*
-  characters were written to *str* (excluding the trailing ``'\\0'`` byte at
+  characters were written to *str* (excluding the trailing ``'\0'`` byte at
   *str*[*rv*]).
 
 * When ``rv >= size``, the output conversion was truncated and a buffer with
-  ``rv + 1`` bytes would have been needed to succeed. *str*[*size*-1] is ``'\\0'``
+  ``rv + 1`` bytes would have been needed to succeed. *str*[*size*-1] is ``'\0'``
   in this case.
 
-* When ``rv < 0``, "something bad happened." *str*[*size*-1] is ``'\\0'`` in
+* When ``rv < 0``, "something bad happened." *str*[*size*-1] is ``'\0'`` in
   this case too, but the rest of *str* is undefined. The exact cause of the error
   depends on the underlying platform.
 

Modified: doctools/trunk/Doc-3k/distutils/apiref.rst
==============================================================================
--- doctools/trunk/Doc-3k/distutils/apiref.rst	(original)
+++ doctools/trunk/Doc-3k/distutils/apiref.rst	Sun Aug  5 00:45:13 2007
@@ -100,7 +100,7 @@
    +--------------------+--------------------------------+-------------------------------------------------------------+
 
 
-.. function:: run_setup(script_name[, script_args=``None``, stop_after=``'run'``])
+.. function:: run_setup(script_name[, script_args=None, stop_after='run'])
 
    Run a setup script in a somewhat controlled environment, and return  the
    :class:`distutils.dist.Distribution` instance that drives things.   This is
@@ -341,7 +341,7 @@
    to :command:`build`, :command:`build_ext`, :command:`build_clib`).
 
 
-.. class:: CCompiler([verbose=``0``, dry_run=``0``, force=``0``])
+.. class:: CCompiler([verbose=0, dry_run=0, force=0])
 
    The abstract base class :class:`CCompiler` defines the interface that  must be
    implemented by real compiler classes.  The class also has  some utility methods
@@ -431,7 +431,7 @@
       runtime linker may search by default.
 
 
-   .. method:: CCompiler.define_macro(name[, value=``None``])
+   .. method:: CCompiler.define_macro(name[, value=None])
 
       Define a preprocessor macro for all compilations driven by this compiler object.
       The optional parameter *value* should be a string; if it is not supplied, then
@@ -442,11 +442,11 @@
    .. method:: CCompiler.undefine_macro(name)
 
       Undefine a preprocessor macro for all compilations driven by this compiler
-      object.  If the same macro is defined by :meth:`define_macro` and undefined by
-      :meth:`undefine_macro`  the last call takes precedence (including multiple
-      redefinitions or undefinitions).  If the macro is redefined/undefined on a per-
-      compilation basis (ie. in the call to :meth:`compile`), then that takes
-      precedence.
+      object.  If the same macro is defined by :meth:`define_macro` and
+      undefined by :meth:`undefine_macro` the last call takes precedence
+      (including multiple redefinitions or undefinitions).  If the macro is
+      redefined/undefined on a per-compilation basis (ie. in the call to
+      :meth:`compile`), then that takes precedence.
 
 
    .. method:: CCompiler.add_link_object(object)
@@ -473,7 +473,7 @@
       list) to do the job.
 
 
-   .. method:: CCompiler.find_library_file(dirs, lib[, debug=``0``])
+   .. method:: CCompiler.find_library_file(dirs, lib[, debug=0])
 
       Search the specified list of directories for a static or shared library file
       *lib* and return the full path to that file.  If *debug* is true, look for a
@@ -481,7 +481,7 @@
       ``None`` if *lib* wasn't found in any of the specified directories.
 
 
-   .. method:: CCompiler.has_function(funcname [, includes=``None``, include_dirs=``None``, libraries=``None``, library_dirs=``None``])
+   .. method:: CCompiler.has_function(funcname [, includes=None, include_dirs=None, libraries=None, library_dirs=None])
 
       Return a boolean indicating whether *funcname* is supported on the current
       platform.  The optional arguments can be used to augment the compilation
@@ -536,7 +536,7 @@
    The following methods invoke stages in the build process.
 
 
-   .. method:: CCompiler.compile(sources[, output_dir=``None``, macros=``None``, include_dirs=``None``, debug=``0``, extra_preargs=``None``, extra_postargs=``None``, depends=``None``])
+   .. method:: CCompiler.compile(sources[, output_dir=None, macros=None, include_dirs=None, debug=0, extra_preargs=None, extra_postargs=None, depends=None])
 
       Compile one or more source files. Generates object files (e.g.  transforms a
       :file:`.c` file to a :file:`.o` file.)
@@ -580,7 +580,7 @@
       Raises :exc:`CompileError` on failure.
 
 
-   .. method:: CCompiler.create_static_lib(objects, output_libname[, output_dir=``None``, debug=``0``, target_lang=``None``])
+   .. method:: CCompiler.create_static_lib(objects, output_libname[, output_dir=None, debug=0, target_lang=None])
 
       Link a bunch of stuff together to create a static library file. The "bunch of
       stuff" consists of the list of object files supplied as *objects*, the extra
@@ -602,7 +602,7 @@
       Raises :exc:`LibError` on failure.
 
 
-   .. method:: CCompiler.link(target_desc, objects, output_filename[, output_dir=``None``, libraries=``None``, library_dirs=``None``, runtime_library_dirs=``None``, export_symbols=``None``, debug=``0``, extra_preargs=``None``, extra_postargs=``None``, build_temp=``None``, target_lang=``None``])
+   .. method:: CCompiler.link(target_desc, objects, output_filename[, output_dir=None, libraries=None, library_dirs=None, runtime_library_dirs=None, export_symbols=None, debug=0, extra_preargs=None, extra_postargs=None, build_temp=None, target_lang=None])
 
       Link a bunch of stuff together to create an executable or shared library file.
 
@@ -644,28 +644,28 @@
       Raises :exc:`LinkError` on failure.
 
 
-   .. method:: CCompiler.link_executable(objects, output_progname[, output_dir=``None``, libraries=``None``, library_dirs=``None``, runtime_library_dirs=``None``, debug=``0``, extra_preargs=``None``, extra_postargs=``None``, target_lang=``None``])
+   .. method:: CCompiler.link_executable(objects, output_progname[, output_dir=None, libraries=None, library_dirs=None, runtime_library_dirs=None, debug=0, extra_preargs=None, extra_postargs=None, target_lang=None])
 
       Link an executable.  *output_progname* is the name of the file executable, while
       *objects* are a list of object filenames to link in. Other arguments  are as for
       the :meth:`link` method.
 
 
-   .. method:: CCompiler.link_shared_lib(objects, output_libname[, output_dir=``None``, libraries=``None``, library_dirs=``None``, runtime_library_dirs=``None``, export_symbols=``None``, debug=``0``, extra_preargs=``None``, extra_postargs=``None``, build_temp=``None``, target_lang=``None``])
+   .. method:: CCompiler.link_shared_lib(objects, output_libname[, output_dir=None, libraries=None, library_dirs=None, runtime_library_dirs=None, export_symbols=None, debug=0, extra_preargs=None, extra_postargs=None, build_temp=None, target_lang=None])
 
       Link a shared library. *output_libname* is the name of the output  library,
       while *objects* is a list of object filenames to link in.  Other arguments are
       as for the :meth:`link` method.
 
 
-   .. method:: CCompiler.link_shared_object(objects, output_filename[, output_dir=``None``, libraries=``None``, library_dirs=``None``, runtime_library_dirs=``None``, export_symbols=``None``, debug=``0``, extra_preargs=``None``, extra_postargs=``None``, build_temp=``None``, target_lang=``None``])
+   .. method:: CCompiler.link_shared_object(objects, output_filename[, output_dir=None, libraries=None, library_dirs=None, runtime_library_dirs=None, export_symbols=None, debug=0, extra_preargs=None, extra_postargs=None, build_temp=None, target_lang=None])
 
       Link a shared object. *output_filename* is the name of the shared object that
       will be created, while *objects* is a list of object filenames  to link in.
       Other arguments are as for the :meth:`link` method.
 
 
-   .. method:: CCompiler.preprocess(source[, output_file=``None``, macros=``None``, include_dirs=``None``, extra_preargs=``None``, extra_postargs=``None``])
+   .. method:: CCompiler.preprocess(source[, output_file=None, macros=None, include_dirs=None, extra_preargs=None, extra_postargs=None])
 
       Preprocess a single C/C++ source file, named in *source*. Output will be written
       to file named *output_file*, or *stdout* if *output_file* not supplied.
@@ -680,14 +680,14 @@
    use by the various concrete subclasses.
 
 
-   .. method:: CCompiler.executable_filename(basename[, strip_dir=``0``, output_dir=``''``])
+   .. method:: CCompiler.executable_filename(basename[, strip_dir=0, output_dir=''])
 
       Returns the filename of the executable for the given *basename*.  Typically for
       non-Windows platforms this is the same as the basename,  while Windows will get
       a :file:`.exe` added.
 
 
-   .. method:: CCompiler.library_filename(libname[, lib_type=``'static'``, strip_dir=``0``, output_dir=``''``])
+   .. method:: CCompiler.library_filename(libname[, lib_type='static', strip_dir=0, output_dir=''])
 
       Returns the filename for the given library name on the current platform. On Unix
       a library with *lib_type* of ``'static'`` will typically  be of the form
@@ -695,18 +695,18 @@
       :file:`liblibname.so`.
 
 
-   .. method:: CCompiler.object_filenames(source_filenames[, strip_dir=``0``, output_dir=``''``])
+   .. method:: CCompiler.object_filenames(source_filenames[, strip_dir=0, output_dir=''])
 
       Returns the name of the object files for the given source files.
       *source_filenames* should be a list of filenames.
 
 
-   .. method:: CCompiler.shared_object_filename(basename[, strip_dir=``0``, output_dir=``''``])
+   .. method:: CCompiler.shared_object_filename(basename[, strip_dir=0, output_dir=''])
 
       Returns the name of a shared object file for the given file name *basename*.
 
 
-   .. method:: CCompiler.execute(func, args[, msg=``None``, level=``1``])
+   .. method:: CCompiler.execute(func, args[, msg=None, level=1])
 
       Invokes :func:`distutils.util.execute` This method invokes a  Python function
       *func* with the given arguments *args*, after  logging and taking into account
@@ -719,7 +719,7 @@
       the given command. XXX see also.
 
 
-   .. method:: CCompiler.mkpath(name[, mode=``511``])
+   .. method:: CCompiler.mkpath(name[, mode=511])
 
       Invokes :func:`distutils.dir_util.mkpath`. This creates a directory  and any
       missing ancestor directories. XXX see also.
@@ -731,7 +731,7 @@
       also.
 
 
-   .. method:: CCompiler.announce(msg[, level=``1``])
+   .. method:: CCompiler.announce(msg[, level=1])
 
       Write a message using :func:`distutils.log.debug`. XXX see also.
 
@@ -867,7 +867,7 @@
 tarballs or zipfiles.
 
 
-.. function:: make_archive(base_name, format[, root_dir=``None``, base_dir=``None``, verbose=``0``, dry_run=``0``])
+.. function:: make_archive(base_name, format[, root_dir=None, base_dir=None, verbose=0, dry_run=0])
 
    Create an archive file (eg. ``zip`` or ``tar``).  *base_name*  is the name of
    the file to create, minus any format-specific extension;  *format* is the
@@ -883,7 +883,7 @@
       This should be changed to support bz2 files
 
 
-.. function:: make_tarball(base_name, base_dir[, compress=``'gzip'``, verbose=``0``, dry_run=``0``])
+.. function:: make_tarball(base_name, base_dir[, compress='gzip', verbose=0, dry_run=0])
 
    'Create an (optional compressed) archive as a tar file from all files in and
    under *base_dir*. *compress* must be ``'gzip'`` (the default),  ``'compress'``,
@@ -898,7 +898,7 @@
       This should be replaced with calls to the :mod:`tarfile` module.
 
 
-.. function:: make_zipfile(base_name, base_dir[, verbose=``0``, dry_run=``0``])
+.. function:: make_zipfile(base_name, base_dir[, verbose=0, dry_run=0])
 
    Create a zip file from all files in and under *base_dir*.  The output zip file
    will be named *base_dir* + :file:`.zip`.  Uses either the  :mod:`zipfile` Python
@@ -936,7 +936,7 @@
    .. % % equivalent to a listcomp...
 
 
-.. function:: newer_group(sources, target[, missing=``'error'``])
+.. function:: newer_group(sources, target[, missing='error'])
 
    Return true if *target* is out-of-date with respect to any file listed in
    *sources*  In other words, if *target* exists and is newer than every file in
@@ -961,7 +961,7 @@
 directories.
 
 
-.. function:: mkpath(name[, mode=``0777``, verbose=``0``, dry_run=``0``])
+.. function:: mkpath(name[, mode=0777, verbose=0, dry_run=0])
 
    Create a directory and any missing ancestor directories.  If the directory
    already exists (or if *name* is the empty string, which means the current
@@ -972,7 +972,7 @@
    directories actually created.
 
 
-.. function:: create_tree(base_dir, files[, mode=``0777``, verbose=``0``, dry_run=``0``])
+.. function:: create_tree(base_dir, files[, mode=0777, verbose=0, dry_run=0])
 
    Create all the empty directories under *base_dir* needed to put *files* there.
    *base_dir* is just the a name of a directory which doesn't necessarily exist
@@ -982,7 +982,7 @@
    :func:`mkpath`.
 
 
-.. function:: copy_tree(src, dst[preserve_mode=``1``, preserve_times=``1``, preserve_symlinks=``0``, update=``0``, verbose=``0``, dry_run=``0``])
+.. function:: copy_tree(src, dst[, preserve_mode=1, preserve_times=1, preserve_symlinks=0, update=0, verbose=0, dry_run=0])
 
    Copy an entire directory tree *src* to a new location *dst*.  Both *src* and
    *dst* must be directory names.  If *src* is not a directory, raise
@@ -1002,7 +1002,7 @@
    as for :func:`copy_file`.
 
 
-.. function:: remove_tree(directory[verbose=``0``, dry_run=``0``])
+.. function:: remove_tree(directory[, verbose=0, dry_run=0])
 
    Recursively remove *directory* and all files and directories underneath it. Any
    errors are ignored (apart from being reported to ``sys.stdout`` if *verbose* is
@@ -1021,16 +1021,16 @@
 This module contains some utility functions for operating on individual files.
 
 
-.. function:: copy_file(src, dst[preserve_mode=``1``, preserve_times=``1``, update=``0``, link=``None``, verbose=``0``, dry_run=``0``])
+.. function:: copy_file(src, dst[, preserve_mode=1, preserve_times=1, update=0, link=None, verbose=0, dry_run=0])
 
    Copy file *src* to *dst*. If *dst* is a directory, then *src* is copied there
    with the same name; otherwise, it must be a filename. (If the file exists, it
    will be ruthlessly clobbered.) If *preserve_mode* is true (the default), the
-   file's mode (type and permission bits, or whatever is analogous on the current
-   platform) is copied. If *preserve_times* is true (the default), the last-
-   modified and last-access times are copied as well. If *update* is true, *src*
-   will only be copied if *dst* does not exist, or if *dst* does exist but is older
-   than *src*.
+   file's mode (type and permission bits, or whatever is analogous on the
+   current platform) is copied. If *preserve_times* is true (the default), the
+   last-modified and last-access times are copied as well. If *update* is true,
+   *src* will only be copied if *dst* does not exist, or if *dst* does exist but
+   is older than *src*.
 
    *link* allows you to make hard links (using :func:`os.link`) or symbolic links
    (using :func:`os.symlink`) instead of copying: set it to ``'hard'`` or
@@ -1051,7 +1051,7 @@
    .. % (not update) and (src newer than dst)).
 
 
-.. function:: move_file(src, dst[verbose, dry_run])
+.. function:: move_file(src, dst[, verbose, dry_run])
 
    Move file *src* to *dst*. If *dst* is a directory, the file will be moved into
    it with the same name; otherwise, *src* is just renamed to *dst*.  Returns the
@@ -1092,15 +1092,11 @@
 
    Examples of returned values:
 
-* ``linux-i586``
-
-* ``linux-alpha``
-
-* ``solaris-2.6-sun4u``
-
-* ``irix-5.3``
-
-* ``irix64-6.2``
+   * ``linux-i586``
+   * ``linux-alpha``
+   * ``solaris-2.6-sun4u``
+   * ``irix-5.3``
+   * ``irix64-6.2``
 
    For non-POSIX platforms, currently just returns ``sys.platform``.
 
@@ -1130,9 +1126,8 @@
    users can use in config files, command-line options, etc.  Currently this
    includes:
 
-* :envvar:`HOME` - user's home directory (Unix only)
-
-* :envvar:`PLAT` - description of the current platform, including hardware and
+   * :envvar:`HOME` - user's home directory (Unix only)
+   * :envvar:`PLAT` - description of the current platform, including hardware and
      OS (see :func:`get_platform`)
 
 
@@ -1150,7 +1145,7 @@
    underscore. No { } or ( ) style quoting is available.
 
 
-.. function:: grok_environment_error(exc[, prefix=``'error: '``])
+.. function:: grok_environment_error(exc[, prefix='error: '])
 
    Generate a useful error message from an :exc:`EnvironmentError`  (:exc:`IOError`
    or :exc:`OSError`) exception object.   Handles Python 1.5.1 and later styles,
@@ -1173,7 +1168,7 @@
    .. % Should probably be moved into the standard library.
 
 
-.. function:: execute(func, args[, msg=``None``, verbose=``0``, dry_run=``0``])
+.. function:: execute(func, args[, msg=None, verbose=0, dry_run=0])
 
    Perform some action that affects the outside world (for instance, writing to the
    filesystem).  Such actions are special because they are disabled by the
@@ -1191,18 +1186,16 @@
    :exc:`ValueError` if *val*  is anything else.
 
 
-.. function:: byte_compile(py_files[, optimize=``0``, force=``0``, prefix=``None``, base_dir=``None``, verbose=``1``, dry_run=``0``, direct=``None``])
+.. function:: byte_compile(py_files[, optimize=0, force=0, prefix=None, base_dir=None, verbose=1, dry_run=0, direct=None])
 
    Byte-compile a collection of Python source files to either :file:`.pyc` or
    :file:`.pyo` files in the same directory.  *py_files* is a list of files to
    compile; any files that don't end in :file:`.py` are silently skipped.
    *optimize* must be one of the following:
 
-* ``0`` - don't optimize (generate :file:`.pyc`)
-
-* ``1`` - normal optimization (like ``python -O``)
-
-* ``2`` - extra optimization (like ``python -OO``)
+   * ``0`` - don't optimize (generate :file:`.pyc`)
+   * ``1`` - normal optimization (like ``python -O``)
+   * ``2`` - extra optimization (like ``python -OO``)
 
    If *force* is true, all files are recompiled regardless of timestamps.
 
@@ -1333,7 +1326,7 @@
       later).
 
 
-.. class:: FancyGetopt([option_table=``None``])
+.. class:: FancyGetopt([option_table=None])
 
    The option_table is a list of 3-tuples: ``(long_option, short_option,
    help_string)``
@@ -1346,7 +1339,7 @@
 The :class:`FancyGetopt` class provides the following methods:
 
 
-.. method:: FancyGetopt.getopt([args=``None``, object=``None``])
+.. method:: FancyGetopt.getopt([args=None, object=None])
 
    Parse command-line options in args. Store as attributes on *object*.
 
@@ -1367,7 +1360,7 @@
    yet.
 
 
-.. method:: FancyGetopt.generate_help([header=``None``])
+.. method:: FancyGetopt.generate_help([header=None])
 
    Generate help text (a list of strings, one per suggested line of output) from
    the option table for this :class:`FancyGetopt` object.
@@ -1540,7 +1533,7 @@
 lines, and joining lines with backslashes.
 
 
-.. class:: TextFile([filename=``None``, file=``None``, **options])
+.. class:: TextFile([filename=None, file=None, **options])
 
    This class provides a file-like object that takes care of all  the things you
    commonly want to do when processing a text file  that has some line-by-line
@@ -1628,7 +1621,7 @@
       filename and the current line number).
 
 
-   .. method:: TextFile.warn(msg[,line=``None``])
+   .. method:: TextFile.warn(msg[,line=None])
 
       Print (to stderr) a warning message tied to the current logical line in the
       current file.  If the current logical line in the file spans multiple physical
@@ -1952,12 +1945,12 @@
 
 .. method:: Command.finalize_options()
 
-   Set final values for all the options that this command supports. This is always
-   called as late as possible, ie.  after any option assignments from the command-
-   line or from other commands have been done.  Thus, this is the place to to code
-   option dependencies: if *foo* depends on *bar*, then it is safe to set *foo*
-   from  *bar* as long as *foo* still has the same value it was assigned in
-   :meth:`initialize_options`.
+   Set final values for all the options that this command supports. This is
+   always called as late as possible, ie.  after any option assignments from the
+   command-line or from other commands have been done.  Thus, this is the place
+   to to code option dependencies: if *foo* depends on *bar*, then it is safe to
+   set *foo* from *bar* as long as *foo* still has the same value it was
+   assigned in :meth:`initialize_options`.
 
 
 .. method:: Command.run()

Modified: doctools/trunk/Doc-3k/extending/building.rst
==============================================================================
--- doctools/trunk/Doc-3k/extending/building.rst	(original)
+++ doctools/trunk/Doc-3k/extending/building.rst	Sun Aug  5 00:45:13 2007
@@ -47,14 +47,13 @@
 :file:`demo.so` or :file:`demo.pyd`.
 
 In the :file:`setup.py`, all execution is performed by calling the ``setup``
-function. This takes a variable number of keyword  arguments, of which the
-example above uses only a subset. Specifically, the example specifies meta-
-information to build packages, and it specifies the contents of the package.
-Normally, a package will contain of addition modules, like Python source
-modules, documentation, subpackages, etc. Please refer to the distutils
-documentation in :ref:`distutils-index`
-to learn more about the features of distutils; this section explains building
-extension modules only.
+function. This takes a variable number of keyword arguments, of which the
+example above uses only a subset. Specifically, the example specifies
+meta-information to build packages, and it specifies the contents of the
+package.  Normally, a package will contain of addition modules, like Python
+source modules, documentation, subpackages, etc. Please refer to the distutils
+documentation in :ref:`distutils-index` to learn more about the features of
+distutils; this section explains building extension modules only.
 
 It is common to pre-compute arguments to :func:`setup`, to better structure the
 driver script. In the example above, the\ ``ext_modules`` argument to

Modified: doctools/trunk/Doc-3k/extending/extending.rst
==============================================================================
--- doctools/trunk/Doc-3k/extending/extending.rst	(original)
+++ doctools/trunk/Doc-3k/extending/extending.rst	Sun Aug  5 00:45:13 2007
@@ -164,9 +164,9 @@
 
 Every failing :cfunc:`malloc` call must be turned into an exception --- the
 direct caller of :cfunc:`malloc` (or :cfunc:`realloc`) must call
-:cfunc:`PyErr_NoMemory` and return a failure indicator itself.  All the object-
-creating functions (for example, :cfunc:`PyInt_FromLong`) already do this, so
-this note is only relevant to those who call :cfunc:`malloc` directly.
+:cfunc:`PyErr_NoMemory` and return a failure indicator itself.  All the
+object-creating functions (for example, :cfunc:`PyInt_FromLong`) already do
+this, so this note is only relevant to those who call :cfunc:`malloc` directly.
 
 Also note that, with the important exception of :cfunc:`PyArg_ParseTuple` and
 friends, functions that return an integer status usually return a positive value
@@ -331,9 +331,9 @@
 
 When embedding Python, the :cfunc:`initspam` function is not called
 automatically unless there's an entry in the :cdata:`_PyImport_Inittab` table.
-The easiest way to handle this is to  statically initialize your statically-
-linked modules by directly calling :cfunc:`initspam` after the call to
-:cfunc:`Py_Initialize`::
+The easiest way to handle this is to statically initialize your
+statically-linked modules by directly calling :cfunc:`initspam` after the call
+to :cfunc:`Py_Initialize`::
 
    int
    main(int argc, char *argv[])
@@ -483,10 +483,10 @@
    Py_DECREF(arglist);
 
 :cfunc:`PyEval_CallObject` returns a Python object pointer: this is the return
-value of the Python function.  :cfunc:`PyEval_CallObject` is "reference-count-
-neutral" with respect to its arguments.  In the example a new tuple was created
-to serve as the argument list, which is :cfunc:`Py_DECREF`\ -ed immediately
-after the call.
+value of the Python function.  :cfunc:`PyEval_CallObject` is
+"reference-count-neutral" with respect to its arguments.  In the example a new
+tuple was created to serve as the argument list, which is :cfunc:`Py_DECREF`\
+-ed immediately after the call.
 
 The return value of :cfunc:`PyEval_CallObject` is "new": either it is a brand
 new object, or it is an existing object whose reference count has been

Modified: doctools/trunk/Doc-3k/extending/newtypes.rst
==============================================================================
--- doctools/trunk/Doc-3k/extending/newtypes.rst	(original)
+++ doctools/trunk/Doc-3k/extending/newtypes.rst	Sun Aug  5 00:45:13 2007
@@ -700,10 +700,10 @@
    >>> l = [n]
    >>> n.first = l
 
-This is pretty silly, but it gives us an excuse to add support for the cyclic-
-garbage collector to the :class:`Noddy` example.  To support cyclic garbage
-collection, types need to fill two slots and set a class flag that enables these
-slots:
+This is pretty silly, but it gives us an excuse to add support for the
+cyclic-garbage collector to the :class:`Noddy` example.  To support cyclic
+garbage collection, types need to fill two slots and set a class flag that
+enables these slots:
 
 .. literalinclude:: ../includes/noddy4.c
 

Modified: doctools/trunk/Doc-3k/howto/advocacy.rst
==============================================================================
--- doctools/trunk/Doc-3k/howto/advocacy.rst	(original)
+++ doctools/trunk/Doc-3k/howto/advocacy.rst	Sun Aug  5 00:45:13 2007
@@ -232,9 +232,9 @@
 being considered another one of Python's advantages. Most questions posted to
 the comp.lang.python newsgroup are quickly answered by someone.
 
-Should you need to dig into the source code, you'll find it's clear and well-
-organized, so it's not very difficult to write extensions and track down bugs
-yourself.  If you'd prefer to pay for support, there are companies and
+Should you need to dig into the source code, you'll find it's clear and
+well-organized, so it's not very difficult to write extensions and track down
+bugs yourself.  If you'd prefer to pay for support, there are companies and
 individuals who offer commercial support for Python.
 
 **Who uses Python for serious work?**

Modified: doctools/trunk/Doc-3k/howto/curses.rst
==============================================================================
--- doctools/trunk/Doc-3k/howto/curses.rst	(original)
+++ doctools/trunk/Doc-3k/howto/curses.rst	Sun Aug  5 00:45:13 2007
@@ -15,36 +15,37 @@
 What is curses?
 ===============
 
-The curses library supplies a terminal-independent screen-painting and keyboard-
-handling facility for text-based terminals; such terminals include VT100s, the
-Linux console, and the simulated terminal provided by X11 programs such as xterm
-and rxvt.  Display terminals support various control codes to perform common
-operations such as moving the cursor, scrolling the screen, and erasing areas.
-Different terminals use widely differing codes, and often have their own minor
-quirks.
-
-In a world of X displays, one might ask "why bother"?  It's true that character-
-cell display terminals are an obsolete technology, but there are niches in which
-being able to do fancy things with them are still valuable.  One is on small-
-footprint or embedded Unixes that  don't carry an X server.  Another is for
-tools like OS installers and kernel configurators that may have to run before X
-is available.
+The curses library supplies a terminal-independent screen-painting and
+keyboard-handling facility for text-based terminals; such terminals include
+VT100s, the Linux console, and the simulated terminal provided by X11 programs
+such as xterm and rxvt.  Display terminals support various control codes to
+perform common operations such as moving the cursor, scrolling the screen, and
+erasing areas.  Different terminals use widely differing codes, and often have
+their own minor quirks.
+
+In a world of X displays, one might ask "why bother"?  It's true that
+character-cell display terminals are an obsolete technology, but there are
+niches in which being able to do fancy things with them are still valuable.  One
+is on small-footprint or embedded Unixes that don't carry an X server.  Another
+is for tools like OS installers and kernel configurators that may have to run
+before X is available.
 
 The curses library hides all the details of different terminals, and provides
-the programmer with an abstraction of a display, containing multiple non-
-overlapping windows.  The contents of a window can be changed in various ways--
-adding text, erasing it, changing its appearance--and the curses library will
-automagically figure out what control codes need to be sent to the terminal to
-produce the right output.
+the programmer with an abstraction of a display, containing multiple
+non-overlapping windows.  The contents of a window can be changed in various
+ways-- adding text, erasing it, changing its appearance--and the curses library
+will automagically figure out what control codes need to be sent to the terminal
+to produce the right output.
 
 The curses library was originally written for BSD Unix; the later System V
 versions of Unix from AT&T added many enhancements and new functions. BSD curses
-is no longer maintained, having been replaced by ncurses, which is an open-
-source implementation of the AT&T interface.  If you're using an open-source
-Unix such as Linux or FreeBSD, your system almost certainly uses ncurses.  Since
-most current commercial Unix versions are based on System V code, all the
-functions described here will probably be available.  The older versions of
-curses carried by some proprietary Unixes may not support everything, though.
+is no longer maintained, having been replaced by ncurses, which is an
+open-source implementation of the AT&T interface.  If you're using an
+open-source Unix such as Linux or FreeBSD, your system almost certainly uses
+ncurses.  Since most current commercial Unix versions are based on System V
+code, all the functions described here will probably be available.  The older
+versions of curses carried by some proprietary Unixes may not support
+everything, though.
 
 No one has made a Windows port of the curses module.  On a Windows platform, try
 the Console module written by Fredrik Lundh.  The Console module provides

Modified: doctools/trunk/Doc-3k/howto/doanddont.rst
==============================================================================
--- doctools/trunk/Doc-3k/howto/doanddont.rst	(original)
+++ doctools/trunk/Doc-3k/howto/doanddont.rst	Sun Aug  5 00:45:13 2007
@@ -272,8 +272,8 @@
    print reduce(operator.add, nums)/len(nums)
 
 This cute little script prints the average of all numbers given on the command
-line. The :func:`reduce` adds up all the numbers, and the rest is just some pre-
-and postprocessing.
+line. The :func:`reduce` adds up all the numbers, and the rest is just some
+pre- and postprocessing.
 
 On the same note, note that :func:`float`, :func:`int` and :func:`long` all
 accept arguments of type string, and so are suited to parsing --- assuming you

Modified: doctools/trunk/Doc-3k/howto/functional.rst
==============================================================================
--- doctools/trunk/Doc-3k/howto/functional.rst	(original)
+++ doctools/trunk/Doc-3k/howto/functional.rst	Sun Aug  5 00:45:13 2007
@@ -1035,7 +1035,7 @@
 
 
 Grouping elements
-'''''''''''''''''
+-----------------
 
 The last function I'll discuss, ``itertools.groupby(iter, key_func=None)``, is
 the most complicated.  ``key_func(elem)`` is a function that can compute a key

Modified: doctools/trunk/Doc-3k/howto/regex.rst
==============================================================================
--- doctools/trunk/Doc-3k/howto/regex.rst	(original)
+++ doctools/trunk/Doc-3k/howto/regex.rst	Sun Aug  5 00:45:13 2007
@@ -367,9 +367,9 @@
 :file:`Tools/scripts/redemo.py`, a demonstration program included with the
 Python distribution.  It allows you to enter REs and strings, and displays
 whether the RE matches or fails. :file:`redemo.py` can be quite useful when
-trying to debug a complicated RE.  Phil Schwartz's `Kodos <http://www.phil-
-schwartz.com/kodos.spy>`_ is also an interactive tool for developing and testing
-RE patterns.
+trying to debug a complicated RE.  Phil Schwartz's `Kodos
+<http://www.phil-schwartz.com/kodos.spy>`_ is also an interactive tool for
+developing and testing RE patterns.
 
 This HOWTO uses the standard Python interpreter for its examples. First, run the
 Python interpreter, import the :mod:`re` module, and compile a RE::
@@ -708,10 +708,10 @@
    Matches only at the end of the string.
 
 ``\b``
-   Word boundary.   This is a zero-width assertion that matches only at the
+   Word boundary.  This is a zero-width assertion that matches only at the
    beginning or end of a word.  A word is defined as a sequence of alphanumeric
-   characters, so the end of a word is indicated by whitespace or a non-
-   alphanumeric character.
+   characters, so the end of a word is indicated by whitespace or a
+   non-alphanumeric character.
 
    The following example matches ``class`` only when it's a complete word; it won't
    match when it's contained inside another word. ::
@@ -1057,7 +1057,7 @@
 :func:`re.split` function, too.
 
 
-.. method:: .split(string [, maxsplit\ ``= 0``])
+.. method:: .split(string [, maxsplit=0])
    :noindex:
 
    Split *string* by the matches of the regular expression.  If capturing
@@ -1108,7 +1108,7 @@
 which can be either a string or a function, and the string to be processed.
 
 
-.. method:: .sub(replacement, string[, count\ ``= 0``])
+.. method:: .sub(replacement, string[, count=0])
    :noindex:
 
    Returns the string obtained by replacing the leftmost non-overlapping
@@ -1307,11 +1307,11 @@
    >>> print re.match('<.*?>', s).group()
    <html>
 
-(Note that parsing HTML or XML with regular expressions is painful. Quick-and-
-dirty patterns will handle common cases, but HTML and XML have special cases
-that will break the obvious regular expression; by the time you've written a
-regular expression that handles all of the possible cases, the patterns will be
-*very* complicated.  Use an HTML or XML parser module for such tasks.)
+(Note that parsing HTML or XML with regular expressions is painful.
+Quick-and-dirty patterns will handle common cases, but HTML and XML have special
+cases that will break the obvious regular expression; by the time you've written
+a regular expression that handles all of the possible cases, the patterns will
+be *very* complicated.  Use an HTML or XML parser module for such tasks.)
 
 
 Not Using re.VERBOSE
@@ -1366,9 +1366,9 @@
 Friedl's Mastering Regular Expressions, published by O'Reilly.  Unfortunately,
 it exclusively concentrates on Perl and Java's flavours of regular expressions,
 and doesn't contain any Python material at all, so it won't be useful as a
-reference for programming in Python.  (The first edition covered Python's now-
-removed :mod:`regex` module, which won't help you much.)  Consider checking it
-out from your library.
+reference for programming in Python.  (The first edition covered Python's
+now-removed :mod:`regex` module, which won't help you much.)  Consider checking
+it out from your library.
 
 
 .. rubric:: Footnotes

Modified: doctools/trunk/Doc-3k/howto/sockets.rst
==============================================================================
--- doctools/trunk/Doc-3k/howto/sockets.rst	(original)
+++ doctools/trunk/Doc-3k/howto/sockets.rst	Sun Aug  5 00:45:13 2007
@@ -29,8 +29,8 @@
 better behavior and performance from a STREAM socket than anything else. I will
 try to clear up the mystery of what a socket is, as well as some hints on how to
 work with blocking and non-blocking sockets. But I'll start by talking about
-blocking sockets. You'll need to know how they work before dealing with non-
-blocking sockets.
+blocking sockets. You'll need to know how they work before dealing with
+non-blocking sockets.
 
 Part of the trouble with understanding these things is that "socket" can mean a
 number of subtly different things, depending on context. So first, let's make a
@@ -361,12 +361,12 @@
 empty) of the corresponding list you passed in. And if you put a socket in more
 than one input list, it will only be (at most) in one output list.
 
-If a socket is in the output readable list, you can be as-close-to-certain-as-
-we-ever-get-in-this-business that a ``recv`` on that socket will return
-*something*. Same idea for the writable list. You'll be able to send
-*something*. Maybe not all you want to, but *something* is better than nothing.
-(Actually, any reasonably healthy socket will return as writable - it just means
-outbound network buffer space is available.)
+If a socket is in the output readable list, you can be
+as-close-to-certain-as-we-ever-get-in-this-business that a ``recv`` on that
+socket will return *something*. Same idea for the writable list. You'll be able
+to send *something*. Maybe not all you want to, but *something* is better than
+nothing.  (Actually, any reasonably healthy socket will return as writable - it
+just means outbound network buffer space is available.)
 
 If you have a "server" socket, put it in the potential_readers list. If it comes
 out in the readable list, your ``accept`` will (almost certainly) work. If you

Modified: doctools/trunk/Doc-3k/howto/urllib2.rst
==============================================================================
--- doctools/trunk/Doc-3k/howto/urllib2.rst	(original)
+++ doctools/trunk/Doc-3k/howto/urllib2.rst	Sun Aug  5 00:45:13 2007
@@ -432,7 +432,7 @@
 ====================
 
 To illustrate creating and installing a handler we will use the
-``HTTPBasicAuthHandler``. For a more detailed discussion of this subject -
+``HTTPBasicAuthHandler``. For a more detailed discussion of this subject --
 including an explanation of how Basic Authentication works - see the `Basic
 Authentication Tutorial
 <http://www.voidspace.org.uk/python/articles/authentication.shtml>`_.

Modified: doctools/trunk/Doc-3k/install/index.rst
==============================================================================
--- doctools/trunk/Doc-3k/install/index.rst	(original)
+++ doctools/trunk/Doc-3k/install/index.rst	Sun Aug  5 00:45:13 2007
@@ -263,7 +263,7 @@
 can find out what your Python installation uses for :file:`{prefix}` and
 :file:`{exec-prefix}` by running Python in interactive mode and typing a few
 simple commands. Under Unix, just type ``python`` at the shell prompt.  Under
-Windows, choose :menuselection:`Start --> Programs --> Python |version|-->
+Windows, choose :menuselection:`Start --> Programs --> Python X.Y -->
 Python (command line)`.   Once the interpreter is started, you type Python code
 at the prompt.  For example, on my Linux system, I type the three Python
 statements shown below, and get the output as shown, to find out my
@@ -506,8 +506,8 @@
 
 If you want to define an entire installation scheme, you just have to supply all
 of the installation directory options.  The recommended way to do this is to
-supply relative paths; for example, if you want to maintain all Python module-
-related files under :file:`python` in your home directory, and you want a
+supply relative paths; for example, if you want to maintain all Python
+module-related files under :file:`python` in your home directory, and you want a
 separate directory for each platform that you use your home directory from, you
 might define the following installation scheme::
 
@@ -645,8 +645,8 @@
 There are two environment variables that can modify ``sys.path``.
 :envvar:`PYTHONHOME` sets an alternate value for the prefix of the Python
 installation.  For example, if :envvar:`PYTHONHOME` is set to ``/www/python``,
-the search path will be set to ``['', '/www/python/lib/python|version|/',
-'/www/python/lib/python|version|/plat-linux2', ...]``.
+the search path will be set to ``['', '/www/python/lib/pythonX.Y/',
+'/www/python/lib/pythonX.Y/plat-linux2', ...]``.
 
 The :envvar:`PYTHONPATH` variable can be set to a list of paths that will be
 added to the beginning of ``sys.path``.  For example, if :envvar:`PYTHONPATH` is
@@ -812,8 +812,8 @@
 Compiling a Python extension written in C or C++ will sometimes require
 specifying custom flags for the compiler and linker in order to use a particular
 library or produce a special kind of object code. This is especially true if the
-extension hasn't been tested on your  platform, or if you're trying to cross-
-compile Python.
+extension hasn't been tested on your platform, or if you're trying to
+cross-compile Python.
 
 In the most general case, the extension author might have foreseen that
 compiling the extensions would be complicated, and provided a :file:`Setup` file

Modified: doctools/trunk/Doc-3k/library/_winreg.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/_winreg.rst	(original)
+++ doctools/trunk/Doc-3k/library/_winreg.rst	Sun Aug  5 00:45:13 2007
@@ -178,7 +178,7 @@
    :const:`HKEY_LOCAL_MACHINE` tree. This may or may not be true.
 
 
-.. function:: OpenKey(key, sub_key[, res\ ``= 0``][, sam\ ``= KEY_READ``])
+.. function:: OpenKey(key, sub_key[, res=0][, sam=KEY_READ])
 
    Opens the specified key, returning a :dfn:`handle object`
 

Modified: doctools/trunk/Doc-3k/library/asyncore.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/asyncore.rst	(original)
+++ doctools/trunk/Doc-3k/library/asyncore.rst	Sun Aug  5 00:45:13 2007
@@ -23,15 +23,15 @@
 are probably what  you really need. Network servers are rarely processor bound,
 however.
 
-If your operating system supports the :cfunc:`select` system call  in its I/O
-library (and nearly all do), then you can use it to juggle  multiple
-communication channels at once; doing other work while your  I/O is taking place
-in the "background."  Although this strategy can  seem strange and complex,
-especially at first, it is in many ways  easier to understand and control than
-multi-threaded programming.   The :mod:`asyncore` module solves many of the
-difficult problems for  you, making the task of building sophisticated high-
-performance  network servers and clients a snap. For "conversational"
-applications and protocols the companion  :mod:`asynchat` module is invaluable.
+If your operating system supports the :cfunc:`select` system call in its I/O
+library (and nearly all do), then you can use it to juggle multiple
+communication channels at once; doing other work while your I/O is taking place
+in the "background."  Although this strategy can seem strange and complex,
+especially at first, it is in many ways easier to understand and control than
+multi-threaded programming.  The :mod:`asyncore` module solves many of the
+difficult problems for you, making the task of building sophisticated
+high-performance network servers and clients a snap. For "conversational"
+applications and protocols the companion :mod:`asynchat` module is invaluable.
 
 The basic idea behind both modules is to create one or more network *channels*,
 instances of class :class:`asyncore.dispatcher` and

Modified: doctools/trunk/Doc-3k/library/binascii.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/binascii.rst	(original)
+++ doctools/trunk/Doc-3k/library/binascii.rst	Sun Aug  5 00:45:13 2007
@@ -16,8 +16,8 @@
 binary and various ASCII-encoded binary representations. Normally, you will not
 use these functions directly but use wrapper modules like :mod:`uu`,
 :mod:`base64`, or :mod:`binhex` instead. The :mod:`binascii` module contains
-low-level functions written in C for greater speed that are used by the higher-
-level modules.
+low-level functions written in C for greater speed that are used by the
+higher-level modules.
 
 The :mod:`binascii` module defines the following functions:
 

Modified: doctools/trunk/Doc-3k/library/bz2.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/bz2.rst	(original)
+++ doctools/trunk/Doc-3k/library/bz2.rst	Sun Aug  5 00:45:13 2007
@@ -74,8 +74,8 @@
 
 .. method:: BZ2File.readline([size])
 
-   Return the next line from the file, as a string, retaining newline. A non-
-   negative *size* argument limits the maximum number of bytes to return (an
+   Return the next line from the file, as a string, retaining newline. A
+   non-negative *size* argument limits the maximum number of bytes to return (an
    incomplete line may be returned then). Return an empty string at EOF.
 
 

Modified: doctools/trunk/Doc-3k/library/cgi.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/cgi.rst	(original)
+++ doctools/trunk/Doc-3k/library/cgi.rst	Sun Aug  5 00:45:13 2007
@@ -552,7 +552,7 @@
 .. rubric:: Footnotes
 
 .. [#] Note that some recent versions of the HTML specification do state what order the
-   field values should be supplied in, but knowing whether a request was received
-   from a conforming browser, or even from a browser at all, is tedious and error-
-   prone.
+   field values should be supplied in, but knowing whether a request was
+   received from a conforming browser, or even from a browser at all, is tedious
+   and error-prone.
 

Modified: doctools/trunk/Doc-3k/library/chunk.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/chunk.rst	(original)
+++ doctools/trunk/Doc-3k/library/chunk.rst	Sun Aug  5 00:45:13 2007
@@ -53,18 +53,18 @@
 
 .. class:: Chunk(file[, align, bigendian, inclheader])
 
-   Class which represents a chunk.  The *file* argument is expected to be a file-
-   like object.  An instance of this class is specifically allowed.  The only
-   method that is needed is :meth:`read`.  If the methods :meth:`seek` and
-   :meth:`tell` are present and don't raise an exception, they are also used.  If
-   these methods are present and raise an exception, they are expected to not have
-   altered the object.  If the optional argument *align* is true, chunks are
-   assumed to be aligned on 2-byte boundaries.  If *align* is false, no alignment
-   is assumed.  The default value is true.  If the optional argument *bigendian* is
-   false, the chunk size is assumed to be in little-endian order.  This is needed
-   for WAVE audio files. The default value is true.  If the optional argument
-   *inclheader* is true, the size given in the chunk header includes the size of
-   the header.  The default value is false.
+   Class which represents a chunk.  The *file* argument is expected to be a
+   file-like object.  An instance of this class is specifically allowed.  The
+   only method that is needed is :meth:`read`.  If the methods :meth:`seek` and
+   :meth:`tell` are present and don't raise an exception, they are also used.
+   If these methods are present and raise an exception, they are expected to not
+   have altered the object.  If the optional argument *align* is true, chunks
+   are assumed to be aligned on 2-byte boundaries.  If *align* is false, no
+   alignment is assumed.  The default value is true.  If the optional argument
+   *bigendian* is false, the chunk size is assumed to be in little-endian order.
+   This is needed for WAVE audio files. The default value is true.  If the
+   optional argument *inclheader* is true, the size given in the chunk header
+   includes the size of the header.  The default value is false.
 
 A :class:`Chunk` object supports the following methods:
 

Modified: doctools/trunk/Doc-3k/library/cmath.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/cmath.rst	(original)
+++ doctools/trunk/Doc-3k/library/cmath.rst	Sun Aug  5 00:45:13 2007
@@ -7,12 +7,12 @@
 
 
 This module is always available.  It provides access to mathematical functions
-for complex numbers.  The functions in this module accept integers, floating-
-point numbers or complex numbers as arguments. They will also accept any Python
-object that has either a :meth:`__complex__` or a :meth:`__float__` method:
-these methods are used to convert the object to a complex or floating-point
-number, respectively, and the function is then applied to the result of the
-conversion.
+for complex numbers.  The functions in this module accept integers,
+floating-point numbers or complex numbers as arguments. They will also accept
+any Python object that has either a :meth:`__complex__` or a :meth:`__float__`
+method: these methods are used to convert the object to a complex or
+floating-point number, respectively, and the function is then applied to the
+result of the conversion.
 
 The functions are:
 

Modified: doctools/trunk/Doc-3k/library/code.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/code.rst	(original)
+++ doctools/trunk/Doc-3k/library/code.rst	Sun Aug  5 00:45:13 2007
@@ -73,15 +73,15 @@
    :func:`compile_command`; the default for *filename* is ``'<input>'``, and for
    *symbol* is ``'single'``.  One several things can happen:
 
-* The input is incorrect; :func:`compile_command` raised an exception
+   * The input is incorrect; :func:`compile_command` raised an exception
      (:exc:`SyntaxError` or :exc:`OverflowError`).  A syntax traceback will be
      printed by calling the :meth:`showsyntaxerror` method.  :meth:`runsource`
      returns ``False``.
 
-* The input is incomplete, and more input is required; :func:`compile_command`
+   * The input is incomplete, and more input is required; :func:`compile_command`
      returned ``None``. :meth:`runsource` returns ``True``.
 
-* The input is complete; :func:`compile_command` returned a code object.  The
+   * The input is complete; :func:`compile_command` returned a code object.  The
      code is executed by calling the :meth:`runcode` (which also handles run-time
      exceptions, except for :exc:`SystemExit`). :meth:`runsource` returns ``False``.
 

Modified: doctools/trunk/Doc-3k/library/codecs.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/codecs.rst	(original)
+++ doctools/trunk/Doc-3k/library/codecs.rst	Sun Aug  5 00:45:13 2007
@@ -30,19 +30,19 @@
    argument, the encoding name in all lower case letters, and return a
    :class:`CodecInfo` object having the following attributes:
 
-* ``name`` The name of the encoding;
+   * ``name`` The name of the encoding;
 
-* ``encoder`` The stateless encoding function;
+   * ``encoder`` The stateless encoding function;
 
-* ``decoder`` The stateless decoding function;
+   * ``decoder`` The stateless decoding function;
 
-* ``incrementalencoder`` An incremental encoder class or factory function;
+   * ``incrementalencoder`` An incremental encoder class or factory function;
 
-* ``incrementaldecoder`` An incremental decoder class or factory function;
+   * ``incrementaldecoder`` An incremental decoder class or factory function;
 
-* ``streamwriter`` A stream writer class or factory function;
+   * ``streamwriter`` A stream writer class or factory function;
 
-* ``streamreader`` A stream reader class or factory function.
+   * ``streamreader`` A stream reader class or factory function.
 
    The various functions or classes take the following arguments:
 
@@ -408,15 +408,15 @@
    The :class:`IncrementalEncoder` may implement different error handling schemes
    by providing the *errors* keyword argument. These parameters are predefined:
 
-* ``'strict'`` Raise :exc:`ValueError` (or a subclass); this is the default.
+   * ``'strict'`` Raise :exc:`ValueError` (or a subclass); this is the default.
 
-* ``'ignore'`` Ignore the character and continue with the next.
+   * ``'ignore'`` Ignore the character and continue with the next.
 
-* ``'replace'`` Replace with a suitable replacement character
+   * ``'replace'`` Replace with a suitable replacement character
 
-* ``'xmlcharrefreplace'`` Replace with the appropriate XML character reference
+   * ``'xmlcharrefreplace'`` Replace with the appropriate XML character reference
 
-* ``'backslashreplace'`` Replace with backslashed escape sequences.
+   * ``'backslashreplace'`` Replace with backslashed escape sequences.
 
    The *errors* argument will be assigned to an attribute of the same name.
    Assigning to this attribute makes it possible to switch between different error
@@ -479,11 +479,11 @@
    The :class:`IncrementalDecoder` may implement different error handling schemes
    by providing the *errors* keyword argument. These parameters are predefined:
 
-* ``'strict'`` Raise :exc:`ValueError` (or a subclass); this is the default.
+   * ``'strict'`` Raise :exc:`ValueError` (or a subclass); this is the default.
 
-* ``'ignore'`` Ignore the character and continue with the next.
+   * ``'ignore'`` Ignore the character and continue with the next.
 
-* ``'replace'`` Replace with a suitable replacement character.
+   * ``'replace'`` Replace with a suitable replacement character.
 
    The *errors* argument will be assigned to an attribute of the same name.
    Assigning to this attribute makes it possible to switch between different error
@@ -562,15 +562,15 @@
    The :class:`StreamWriter` may implement different error handling schemes by
    providing the *errors* keyword argument. These parameters are predefined:
 
-* ``'strict'`` Raise :exc:`ValueError` (or a subclass); this is the default.
+   * ``'strict'`` Raise :exc:`ValueError` (or a subclass); this is the default.
 
-* ``'ignore'`` Ignore the character and continue with the next.
+   * ``'ignore'`` Ignore the character and continue with the next.
 
-* ``'replace'`` Replace with a suitable replacement character
+   * ``'replace'`` Replace with a suitable replacement character
 
-* ``'xmlcharrefreplace'`` Replace with the appropriate XML character reference
+   * ``'xmlcharrefreplace'`` Replace with the appropriate XML character reference
 
-* ``'backslashreplace'`` Replace with backslashed escape sequences.
+   * ``'backslashreplace'`` Replace with backslashed escape sequences.
 
    The *errors* argument will be assigned to an attribute of the same name.
    Assigning to this attribute makes it possible to switch between different error
@@ -626,11 +626,11 @@
    The :class:`StreamReader` may implement different error handling schemes by
    providing the *errors* keyword argument. These parameters are defined:
 
-* ``'strict'`` Raise :exc:`ValueError` (or a subclass); this is the default.
+   * ``'strict'`` Raise :exc:`ValueError` (or a subclass); this is the default.
 
-* ``'ignore'`` Ignore the character and continue with the next.
+   * ``'ignore'`` Ignore the character and continue with the next.
 
-* ``'replace'`` Replace with a suitable replacement character.
+   * ``'replace'`` Replace with a suitable replacement character.
 
    The *errors* argument will be assigned to an attribute of the same name.
    Assigning to this attribute makes it possible to switch between different error

Modified: doctools/trunk/Doc-3k/library/codeop.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/codeop.rst	(original)
+++ doctools/trunk/Doc-3k/library/codeop.rst	Sun Aug  5 00:45:13 2007
@@ -10,10 +10,11 @@
 
 .. % LaTeXed from excellent doc-string.
 
-The :mod:`codeop` module provides utilities upon which the Python read-eval-
-print loop can be emulated, as is done in the :mod:`code` module.  As a result,
-you probably don't want to use the module directly; if you want to include such
-a loop in your program you probably want to use the :mod:`code` module instead.
+The :mod:`codeop` module provides utilities upon which the Python
+read-eval-print loop can be emulated, as is done in the :mod:`code` module.  As
+a result, you probably don't want to use the module directly; if you want to
+include such a loop in your program you probably want to use the :mod:`code`
+module instead.
 
 There are two parts to this job:
 

Modified: doctools/trunk/Doc-3k/library/cookie.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/cookie.rst	(original)
+++ doctools/trunk/Doc-3k/library/cookie.rst	Sun Aug  5 00:45:13 2007
@@ -145,19 +145,13 @@
    Morsels are dictionary-like objects, whose set of keys is constant --- the valid
    :rfc:`2109` attributes, which are
 
-* ``expires``
-
-* ``path``
-
-* ``comment``
-
-* ``domain``
-
-* ``max-age``
-
-* ``secure``
-
-* ``version``
+   * ``expires``
+   * ``path``
+   * ``comment``
+   * ``domain``
+   * ``max-age``
+   * ``secure``
+   * ``version``
 
    The keys are case-insensitive.
 

Modified: doctools/trunk/Doc-3k/library/cookielib.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/cookielib.rst	(original)
+++ doctools/trunk/Doc-3k/library/cookielib.rst	Sun Aug  5 00:45:13 2007
@@ -94,10 +94,10 @@
    received in a :mailheader:`Set-Cookie` header with a version cookie-attribute of
    1) are treated according to the RFC 2965 rules.  However, if RFC 2965 handling
    is turned off or :attr:`rfc2109_as_netscape` is True, RFC 2109 cookies are
-   'downgraded' by the :class:`CookieJar` instance to Netscape cookies, by setting
-   the :attr:`version` attribute of the :class:`Cookie` instance to 0.
-   :class:`DefaultCookiePolicy` also provides some parameters to allow some fine-
-   tuning of policy.
+   'downgraded' by the :class:`CookieJar` instance to Netscape cookies, by
+   setting the :attr:`version` attribute of the :class:`Cookie` instance to 0.
+   :class:`DefaultCookiePolicy` also provides some parameters to allow some
+   fine-tuning of policy.
 
 
 .. class:: Cookie()
@@ -320,8 +320,8 @@
 
    .. note::
 
-      This loses information about RFC 2965 cookies, and also about newer or non-
-      standard cookie-attributes such as ``port``.
+      This loses information about RFC 2965 cookies, and also about newer or
+      non-standard cookie-attributes such as ``port``.
 
    .. warning::
 
@@ -608,9 +608,10 @@
 :class:`Cookie` instances have Python attributes roughly corresponding to the
 standard cookie-attributes specified in the various cookie standards.  The
 correspondence is not one-to-one, because there are complicated rules for
-assigning default values, because the ``max-age`` and ``expires`` cookie-
-attributes contain equivalent information, and because RFC 2109 cookies may be
-'downgraded' by :mod:`cookielib` from version 1 to version 0 (Netscape) cookies.
+assigning default values, because the ``max-age`` and ``expires``
+cookie-attributes contain equivalent information, and because RFC 2109 cookies
+may be 'downgraded' by :mod:`cookielib` from version 1 to version 0 (Netscape)
+cookies.
 
 Assignment to these attributes should not be necessary other than in rare
 circumstances in a :class:`CookiePolicy` method.  The class does not enforce
@@ -676,11 +677,11 @@
 
 .. attribute:: Cookie.rfc2109
 
-   True if this cookie was received as an RFC 2109 cookie (ie. the cookie arrived
-   in a :mailheader:`Set-Cookie` header, and the value of the Version cookie-
-   attribute in that header was 1).  This attribute is provided because
-   :mod:`cookielib` may 'downgrade' RFC 2109 cookies to Netscape cookies, in which
-   case :attr:`version` is 0.
+   True if this cookie was received as an RFC 2109 cookie (ie. the cookie
+   arrived in a :mailheader:`Set-Cookie` header, and the value of the Version
+   cookie-attribute in that header was 1).  This attribute is provided because
+   :mod:`cookielib` may 'downgrade' RFC 2109 cookies to Netscape cookies, in
+   which case :attr:`version` is 0.
 
    .. versionadded:: 2.5
 

Modified: doctools/trunk/Doc-3k/library/csv.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/csv.rst	(original)
+++ doctools/trunk/Doc-3k/library/csv.rst	Sun Aug  5 00:45:13 2007
@@ -59,7 +59,7 @@
 The :mod:`csv` module defines the following functions:
 
 
-.. function:: reader(csvfile[, dialect=``'excel'``][, fmtparam])
+.. function:: reader(csvfile[, dialect='excel'][, fmtparam])
 
    Return a reader object which will iterate over lines in the given *csvfile*.
    *csvfile* can be any object which supports the iterator protocol and returns a
@@ -87,7 +87,7 @@
       be split into lines in a manner which preserves the newline characters.
 
 
-.. function:: writer(csvfile[, dialect=``'excel'``][, fmtparam])
+.. function:: writer(csvfile[, dialect='excel'][, fmtparam])
 
    Return a writer object responsible for converting the user's data into delimited
    strings on the given file-like object.  *csvfile* can be any object with a
@@ -143,7 +143,7 @@
 The :mod:`csv` module defines the following classes:
 
 
-.. class:: DictReader(csvfile[, fieldnames=:const:`None`,[, restkey=:const:`None`[, restval=:const:`None`[, dialect=``'excel'``[, *args, **kwds]]]]])
+.. class:: DictReader(csvfile[, fieldnames=:const:None,[, restkey=:const:None[, restval=None[, dialect='excel'[, *args, **kwds]]]]])
 
    Create an object which operates like a regular reader but maps the information
    read into a dict whose keys are given by the optional  *fieldnames* parameter.
@@ -157,7 +157,7 @@
    arguments are passed to the underlying :class:`reader` instance.
 
 
-.. class:: DictWriter(csvfile, fieldnames[, restval=""[, extrasaction=``'raise'``[, dialect=``'excel'``[, *args, **kwds]]]])
+.. class:: DictWriter(csvfile, fieldnames[, restval=''[, extrasaction='raise'[, dialect='excel'[, *args, **kwds]]]])
 
    Create an object which operates like a regular writer but maps dictionaries onto
    output rows.  The *fieldnames* parameter identifies the order in which values in
@@ -202,7 +202,7 @@
 The :class:`Sniffer` class provides two methods:
 
 
-.. method:: Sniffer.sniff(sample[,delimiters=None])
+.. method:: Sniffer.sniff(sample[, delimiters=None])
 
    Analyze the given *sample* and return a :class:`Dialect` subclass reflecting the
    parameters found.  If the optional *delimiters* parameter is given, it is

Modified: doctools/trunk/Doc-3k/library/ctypes.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/ctypes.rst	(original)
+++ doctools/trunk/Doc-3k/library/ctypes.rst	Sun Aug  5 00:45:13 2007
@@ -1910,9 +1910,9 @@
 
 .. function:: string_at(address[, size])
 
-   This function returns the string starting at memory address address. If size is
-   specified, it is used as size, otherwise the string is assumed to be zero-
-   terminated.
+   This function returns the string starting at memory address address. If size
+   is specified, it is used as size, otherwise the string is assumed to be
+   zero-terminated.
 
 
 .. function:: WinError(code=None, descr=None)
@@ -1928,8 +1928,8 @@
 
    This function returns the wide character string starting at memory address
    ``address`` as unicode string. If ``size`` is specified, it is used as the
-   number of characters of the string, otherwise the string is assumed to be zero-
-   terminated.
+   number of characters of the string, otherwise the string is assumed to be
+   zero-terminated.
 
 
 .. _ctypes-data-types:
@@ -2198,9 +2198,9 @@
 
 .. class:: c_wchar_p
 
-   Represents the C ``wchar_t *`` datatype, which must be a pointer to a zero-
-   terminated wide character string. The constructor accepts an integer address, or
-   a string.
+   Represents the C ``wchar_t *`` datatype, which must be a pointer to a
+   zero-terminated wide character string. The constructor accepts an integer
+   address, or a string.
 
 
 .. class:: c_bool

Modified: doctools/trunk/Doc-3k/library/curses.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/curses.rst	(original)
+++ doctools/trunk/Doc-3k/library/curses.rst	Sun Aug  5 00:45:13 2007
@@ -11,8 +11,8 @@
 .. versionchanged:: 1.6
    Added support for the ``ncurses`` library and converted to a package.
 
-The :mod:`curses` module provides an interface to the curses library, the de-
-facto standard for portable advanced terminal handling.
+The :mod:`curses` module provides an interface to the curses library, the
+de-facto standard for portable advanced terminal handling.
 
 While curses is most widely used in the Unix environment, versions are available
 for DOS, OS/2, and possibly other systems as well.  This extension module is
@@ -641,10 +641,10 @@
    attributes *attr*.  The change is then applied to every character position in
    that window:
 
-* The attribute of every character in the window  is changed to the new
+   * The attribute of every character in the window  is changed to the new
      background attribute.
 
-* Wherever  the  former background character appears, it is changed to the new
+   * Wherever  the  former background character appears, it is changed to the new
      background character.
 
 
@@ -1023,7 +1023,7 @@
    *sminrow*, or *smincol* are treated as if they were zero.
 
 
-.. method:: window.scroll([lines\ ``= 1``])
+.. method:: window.scroll([lines=1])
 
    Scroll the screen or scrolling region upward by *lines* lines.
 
@@ -1526,8 +1526,8 @@
 The :mod:`curses.textpad` module provides a :class:`Textbox` class that handles
 elementary text editing in a curses window, supporting a set of keybindings
 resembling those of Emacs (thus, also of Netscape Navigator, BBedit 6.x,
-FrameMaker, and many other programs).  The module also provides a rectangle-
-drawing function useful for framing text boxes or for other purposes.
+FrameMaker, and many other programs).  The module also provides a
+rectangle-drawing function useful for framing text boxes or for other purposes.
 
 The module :mod:`curses.textpad` defines the following function:
 

Modified: doctools/trunk/Doc-3k/library/datetime.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/datetime.rst	(original)
+++ doctools/trunk/Doc-3k/library/datetime.rst	Sun Aug  5 00:45:13 2007
@@ -139,22 +139,17 @@
    Only *days*, *seconds* and *microseconds* are stored internally.  Arguments are
    converted to those units:
 
-* A millisecond is converted to 1000 microseconds.
-
-* A minute is converted to 60 seconds.
-
-* An hour is converted to 3600 seconds.
-
-* A week is converted to 7 days.
+   * A millisecond is converted to 1000 microseconds.
+   * A minute is converted to 60 seconds.
+   * An hour is converted to 3600 seconds.
+   * A week is converted to 7 days.
 
    and days, seconds and microseconds are then normalized so that the
    representation is unique, with
 
-* ``0 <= microseconds < 1000000``
-
-* ``0 <= seconds < 3600*24`` (the number of seconds in one day)
-
-* ``-999999999 <= days <= 999999999``
+   * ``0 <= microseconds < 1000000``
+   * ``0 <= seconds < 3600*24`` (the number of seconds in one day)
+   * ``-999999999 <= days <= 999999999``
 
    If any argument is a float and there are fractional microseconds, the fractional
    microseconds left over from all arguments are combined and their sum is rounded
@@ -291,11 +286,9 @@
    All arguments are required.  Arguments may be ints or longs, in the following
    ranges:
 
-* ``MINYEAR <= year <= MAXYEAR``
-
-* ``1 <= month <= 12``
-
-* ``1 <= day <= number of days in the given month and year``
+   * ``MINYEAR <= year <= MAXYEAR``
+   * ``1 <= month <= 12``
+   * ``1 <= day <= number of days in the given month and year``
 
    If an argument outside those ranges is given, :exc:`ValueError` is raised.
 
@@ -514,19 +507,13 @@
    instance of a :class:`tzinfo` subclass.  The remaining arguments may be ints or
    longs, in the following ranges:
 
-* ``MINYEAR <= year <= MAXYEAR``
-
-* ``1 <= month <= 12``
-
-* ``1 <= day <= number of days in the given month and year``
-
-* ``0 <= hour < 24``
-
-* ``0 <= minute < 60``
-
-* ``0 <= second < 60``
-
-* ``0 <= microsecond < 1000000``
+   * ``MINYEAR <= year <= MAXYEAR``
+   * ``1 <= month <= 12``
+   * ``1 <= day <= number of days in the given month and year``
+   * ``0 <= hour < 24``
+   * ``0 <= minute < 60``
+   * ``0 <= second < 60``
+   * ``0 <= microsecond < 1000000``
 
    If an argument outside those ranges is given, :exc:`ValueError` is raised.
 
@@ -894,13 +881,14 @@
 
 .. method:: datetime.isoformat([sep])
 
-   Return a string representing the date and time in ISO 8601 format, YYYY-MM-
-   DDTHH:MM:SS.mmmmmm or, if :attr:`microsecond` is 0, YYYY-MM-DDTHH:MM:SS
-
-   If :meth:`utcoffset` does not return ``None``, a 6-character string is appended,
-   giving the UTC offset in (signed) hours and minutes: YYYY-MM-
-   DDTHH:MM:SS.mmmmmm+HH:MM or, if :attr:`microsecond` is 0 YYYY-MM-
-   DDTHH:MM:SS+HH:MM
+   Return a string representing the date and time in ISO 8601 format,
+   YYYY-MM-DDTHH:MM:SS.mmmmmm or, if :attr:`microsecond` is 0,
+   YYYY-MM-DDTHH:MM:SS
+
+   If :meth:`utcoffset` does not return ``None``, a 6-character string is
+   appended, giving the UTC offset in (signed) hours and minutes:
+   YYYY-MM-DDTHH:MM:SS.mmmmmm+HH:MM or, if :attr:`microsecond` is 0
+   YYYY-MM-DDTHH:MM:SS+HH:MM
 
    The optional argument *sep* (default ``'T'``) is a one-character separator,
    placed between the date and time portions of the result.  For example, ::
@@ -949,13 +937,10 @@
    :class:`tzinfo` subclass.  The remaining arguments may be ints or longs, in the
    following ranges:
 
-* ``0 <= hour < 24``
-
-* ``0 <= minute < 60``
-
-* ``0 <= second < 60``
-
-* ``0 <= microsecond < 1000000``.
+   * ``0 <= hour < 24``
+   * ``0 <= minute < 60``
+   * ``0 <= second < 60``
+   * ``0 <= microsecond < 1000000``.
 
    If an argument outside those ranges is given, :exc:`ValueError` is raised.  All
    default to ``0`` except *tzinfo*, which defaults to :const:`None`.

Modified: doctools/trunk/Doc-3k/library/decimal.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/decimal.rst	(original)
+++ doctools/trunk/Doc-3k/library/decimal.rst	Sun Aug  5 00:45:13 2007
@@ -509,19 +509,13 @@
 
    The *rounding* option is one of:
 
-* :const:`ROUND_CEILING` (towards :const:`Infinity`),
-
-* :const:`ROUND_DOWN` (towards zero),
-
-* :const:`ROUND_FLOOR` (towards :const:`-Infinity`),
-
-* :const:`ROUND_HALF_DOWN` (to nearest with ties going towards zero),
-
-* :const:`ROUND_HALF_EVEN` (to nearest with ties going to nearest even integer),
-
-* :const:`ROUND_HALF_UP` (to nearest with ties going away from zero), or
-
-* :const:`ROUND_UP` (away from zero).
+   * :const:`ROUND_CEILING` (towards :const:`Infinity`),
+   * :const:`ROUND_DOWN` (towards zero),
+   * :const:`ROUND_FLOOR` (towards :const:`-Infinity`),
+   * :const:`ROUND_HALF_DOWN` (to nearest with ties going towards zero),
+   * :const:`ROUND_HALF_EVEN` (to nearest with ties going to nearest even integer),
+   * :const:`ROUND_HALF_UP` (to nearest with ties going away from zero), or
+   * :const:`ROUND_UP` (away from zero).
 
    The *traps* and *flags* fields list any signals to be set. Generally, new
    contexts should only set traps and leave the flags clear.
@@ -1260,10 +1254,10 @@
 Q. Within a complex calculation, how can I make sure that I haven't gotten a
 spurious result because of insufficient precision or rounding anomalies.
 
-A. The decimal module makes it easy to test results.  A best practice is to re-
-run calculations using greater precision and with various rounding modes. Widely
-differing results indicate insufficient precision, rounding mode issues, ill-
-conditioned inputs, or a numerically unstable algorithm.
+A. The decimal module makes it easy to test results.  A best practice is to
+re-run calculations using greater precision and with various rounding modes.
+Widely differing results indicate insufficient precision, rounding mode issues,
+ill-conditioned inputs, or a numerically unstable algorithm.
 
 Q. I noticed that context precision is applied to the results of operations but
 not to the inputs.  Is there anything to watch out for when mixing values of

Modified: doctools/trunk/Doc-3k/library/difflib.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/difflib.rst	(original)
+++ doctools/trunk/Doc-3k/library/difflib.rst	Sun Aug  5 00:45:13 2007
@@ -34,10 +34,10 @@
 
 .. class:: Differ
 
-   This is a class for comparing sequences of lines of text, and producing human-
-   readable differences or deltas.  Differ uses :class:`SequenceMatcher` both to
-   compare sequences of lines, and to compare sequences of characters within
-   similar (near-matching) lines.
+   This is a class for comparing sequences of lines of text, and producing
+   human-readable differences or deltas.  Differ uses :class:`SequenceMatcher`
+   both to compare sequences of lines, and to compare sequences of characters
+   within similar (near-matching) lines.
 
    Each line of a :class:`Differ` delta begins with a two-letter code:
 

Modified: doctools/trunk/Doc-3k/library/dis.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/dis.rst	(original)
+++ doctools/trunk/Doc-3k/library/dis.rst	Sun Aug  5 00:45:13 2007
@@ -50,19 +50,13 @@
    Disassembles a code object, indicating the last instruction if *lasti* was
    provided.  The output is divided in the following columns:
 
-#. the line number, for the first instruction of each line
-
-#. the current instruction, indicated as ``-->``,
-
-#. a labelled instruction, indicated with ``>>``,
-
-#. the address of the instruction,
-
-#. the operation code name,
-
-#. operation parameters, and
-
-#. interpretation of the parameters in parentheses.
+   #. the line number, for the first instruction of each line
+   #. the current instruction, indicated as ``-->``,
+   #. a labelled instruction, indicated with ``>>``,
+   #. the address of the instruction,
+   #. the operation code name,
+   #. operation parameters, and
+   #. interpretation of the parameters in parentheses.
 
    The parameter interpretation recognizes local and global variable names,
    constant values, branch targets, and compare operators.
@@ -499,8 +493,8 @@
 
 .. opcode:: UNPACK_SEQUENCE (count)
 
-   Unpacks TOS into *count* individual values, which are put onto the stack right-
-   to-left.
+   Unpacks TOS into *count* individual values, which are put onto the stack
+   right-to-left.
 
 .. % \begin{opcodedesc}{UNPACK_LIST}{count}
 .. % This opcode is obsolete.

Modified: doctools/trunk/Doc-3k/library/dl.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/dl.rst	(original)
+++ doctools/trunk/Doc-3k/library/dl.rst	Sun Aug  5 00:45:13 2007
@@ -28,7 +28,7 @@
 The :mod:`dl` module defines the following function:
 
 
-.. function:: open(name[, mode\ ``= RTLD_LAZY``])
+.. function:: open(name[, mode=RTLD_LAZY])
 
    Open a shared object file, and return a handle. Mode signifies late binding
    (:const:`RTLD_LAZY`) or immediate binding (:const:`RTLD_NOW`). Default is

Modified: doctools/trunk/Doc-3k/library/doctest.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/doctest.rst	(original)
+++ doctools/trunk/Doc-3k/library/doctest.rst	Sun Aug  5 00:45:13 2007
@@ -435,10 +435,10 @@
 are ignored by doctest.  The traceback stack is typically omitted, or copied
 verbatim from an interactive session.
 
-The traceback stack is followed by the most interesting part:  the line(s)
+The traceback stack is followed by the most interesting part: the line(s)
 containing the exception type and detail.  This is usually the last line of a
-traceback, but can extend across multiple lines if the exception has a multi-
-line detail::
+traceback, but can extend across multiple lines if the exception has a
+multi-line detail::
 
    >>> raise ValueError('multi\n    line\ndetail')
    Traceback (most recent call last):
@@ -823,14 +823,14 @@
    Optional argument *module_relative* specifies how the filename should be
    interpreted:
 
-* If *module_relative* is ``True`` (the default), then *filename* specifies an
+   * If *module_relative* is ``True`` (the default), then *filename* specifies an
      OS-independent module-relative path.  By default, this path is relative to the
      calling module's directory; but if the *package* argument is specified, then it
      is relative to that package.  To ensure OS-independence, *filename* should use
      ``/`` characters to separate path segments, and may not be an absolute path
      (i.e., it may not begin with ``/``).
 
-* If *module_relative* is ``False``, then *filename* specifies an OS-specific
+   * If *module_relative* is ``False``, then *filename* specifies an OS-specific
      path.  The path may be absolute or relative; relative paths are resolved with
      respect to the current working directory.
 
@@ -1000,14 +1000,14 @@
    Optional argument *module_relative* specifies how the filenames in *paths*
    should be interpreted:
 
-* If *module_relative* is ``True`` (the default), then each filename specifies
+   * If *module_relative* is ``True`` (the default), then each filename specifies
      an OS-independent module-relative path.  By default, this path is relative to
      the calling module's directory; but if the *package* argument is specified, then
      it is relative to that package.  To ensure OS-independence, each filename should
      use ``/`` characters to separate path segments, and may not be an absolute path
      (i.e., it may not begin with ``/``).
 
-* If *module_relative* is ``False``, then each filename specifies an OS-specific
+   * If *module_relative* is ``False``, then each filename specifies an OS-specific
      path.  The path may be absolute or relative; relative paths are resolved with
      respect to the current working directory.
 
@@ -1074,8 +1074,8 @@
    Optional argument *extraglobs* specifies an extra set of global variables, which
    is merged into *globs*.  By default, no extra globals are used.
 
-   Optional argument *test_finder* is the :class:`DocTestFinder` object (or a drop-
-   in replacement) that is used to extract doctests from the module.
+   Optional argument *test_finder* is the :class:`DocTestFinder` object (or a
+   drop-in replacement) that is used to extract doctests from the module.
 
    Optional arguments *setUp*, *tearDown*, and *optionflags* are the same as for
    function :func:`DocFileSuite` above.
@@ -1346,15 +1346,15 @@
    If the module is not specified or is None, then the test finder will attempt to
    automatically determine the correct module.  The object's module is used:
 
-* As a default namespace, if *globs* is not specified.
+   * As a default namespace, if *globs* is not specified.
 
-* To prevent the DocTestFinder from extracting DocTests from objects that are
+   * To prevent the DocTestFinder from extracting DocTests from objects that are
      imported from other modules.  (Contained objects with modules other than
      *module* are ignored.)
 
-* To find the name of the file containing the object.
+   * To find the name of the file containing the object.
 
-* To help find the line number of the object within its file.
+   * To help find the line number of the object within its file.
 
    If *module* is ``False``, no attempt to find the module will be made.  This is
    obscure, of use mostly in testing doctest itself: if *module* is ``False``, or

Modified: doctools/trunk/Doc-3k/library/email.charset.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/email.charset.rst	(original)
+++ doctools/trunk/Doc-3k/library/email.charset.rst	Sun Aug  5 00:45:13 2007
@@ -149,8 +149,8 @@
 
 .. method:: Charset.encoded_header_len()
 
-   Return the length of the encoded header string, properly calculating for quoted-
-   printable or base64 encoding.
+   Return the length of the encoded header string, properly calculating for
+   quoted-printable or base64 encoding.
 
 
 .. method:: Charset.header_encode(s[, convert])
@@ -210,11 +210,11 @@
    *charset* is the input character set, and must be the canonical name of a
    character set.
 
-   Optional *header_enc* and *body_enc* is either ``Charset.QP`` for quoted-
-   printable, ``Charset.BASE64`` for base64 encoding, ``Charset.SHORTEST`` for the
-   shortest of quoted-printable or base64 encoding, or ``None`` for no encoding.
-   ``SHORTEST`` is only valid for *header_enc*. The default is ``None`` for no
-   encoding.
+   Optional *header_enc* and *body_enc* is either ``Charset.QP`` for
+   quoted-printable, ``Charset.BASE64`` for base64 encoding,
+   ``Charset.SHORTEST`` for the shortest of quoted-printable or base64 encoding,
+   or ``None`` for no encoding.  ``SHORTEST`` is only valid for
+   *header_enc*. The default is ``None`` for no encoding.
 
    Optional *output_charset* is the character set that the output should be in.
    Conversions will proceed from input charset, to Unicode, to the output charset

Modified: doctools/trunk/Doc-3k/library/email.generator.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/email.generator.rst	(original)
+++ doctools/trunk/Doc-3k/library/email.generator.rst	Sun Aug  5 00:45:13 2007
@@ -100,17 +100,17 @@
    string that is used instead of the message payload. *fmt* is expanded with the
    following keywords, ``%(keyword)s`` format:
 
-* ``type`` -- Full MIME type of the non-\ :mimetype:`text` part
+   * ``type`` -- Full MIME type of the non-\ :mimetype:`text` part
 
-* ``maintype`` -- Main MIME type of the non-\ :mimetype:`text` part
+   * ``maintype`` -- Main MIME type of the non-\ :mimetype:`text` part
 
-* ``subtype`` -- Sub-MIME type of the non-\ :mimetype:`text` part
+   * ``subtype`` -- Sub-MIME type of the non-\ :mimetype:`text` part
 
-* ``filename`` -- Filename of the non-\ :mimetype:`text` part
+   * ``filename`` -- Filename of the non-\ :mimetype:`text` part
 
-* ``description`` -- Description associated with the non-\ :mimetype:`text` part
+   * ``description`` -- Description associated with the non-\ :mimetype:`text` part
 
-* ``encoding`` -- Content transfer encoding of the non-\ :mimetype:`text` part
+   * ``encoding`` -- Content transfer encoding of the non-\ :mimetype:`text` part
 
    The default value for *fmt* is ``None``, meaning ::
 

Modified: doctools/trunk/Doc-3k/library/email.message.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/email.message.rst	(original)
+++ doctools/trunk/Doc-3k/library/email.message.rst	Sun Aug  5 00:45:13 2007
@@ -15,10 +15,10 @@
 value are separated by a colon.  The colon is not part of either the field name
 or the field value.
 
-Headers are stored and returned in case-preserving form but are matched case-
-insensitively.  There may also be a single envelope header, also known as the
-*Unix-From* header or the ``From_`` header.  The payload is either a string in
-the case of simple message objects or a list of :class:`Message` objects for
+Headers are stored and returned in case-preserving form but are matched
+case-insensitively.  There may also be a single envelope header, also known as
+the *Unix-From* header or the ``From_`` header.  The payload is either a string
+in the case of simple message objects or a list of :class:`Message` objects for
 MIME container documents (e.g. :mimetype:`multipart/\*` and
 :mimetype:`message/rfc822`).
 

Modified: doctools/trunk/Doc-3k/library/email.parser.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/email.parser.rst	(original)
+++ doctools/trunk/Doc-3k/library/email.parser.rst	Sun Aug  5 00:45:13 2007
@@ -51,11 +51,11 @@
 The :class:`FeedParser`'s API is simple; you create an instance, feed it a bunch
 of text until there's no more to feed it, then close the parser to retrieve the
 root message object.  The :class:`FeedParser` is extremely accurate when parsing
-standards-compliant messages, and it does a very good job of parsing non-
-compliant messages, providing information about how a message was deemed broken.
-It will populate a message object's *defects* attribute with a list of any
-problems it found in a message.  See the :mod:`email.errors` module for the list
-of defects that it can find.
+standards-compliant messages, and it does a very good job of parsing
+non-compliant messages, providing information about how a message was deemed
+broken.  It will populate a message object's *defects* attribute with a list of
+any problems it found in a message.  See the :mod:`email.errors` module for the
+list of defects that it can find.
 
 Here is the API for the :class:`FeedParser`:
 
@@ -108,10 +108,10 @@
    The optional *strict* flag is ignored.
 
    .. deprecated:: 2.4
-      Because the :class:`Parser` class is a backward compatible API wrapper around
-      the new-in-Python 2.4 :class:`FeedParser`, *all* parsing is effectively non-
-      strict.  You should simply stop passing a *strict* flag to the :class:`Parser`
-      constructor.
+      Because the :class:`Parser` class is a backward compatible API wrapper
+      around the new-in-Python 2.4 :class:`FeedParser`, *all* parsing is
+      effectively non-strict.  You should simply stop passing a *strict* flag to
+      the :class:`Parser` constructor.
 
    .. versionchanged:: 2.2.2
       The *strict* flag was added.
@@ -129,10 +129,10 @@
    the :meth:`read` methods on file-like objects.
 
    The text contained in *fp* must be formatted as a block of :rfc:`2822` style
-   headers and header continuation lines, optionally preceded by a envelope header.
-   The header block is terminated either by the end of the data or by a blank line.
-   Following the header block is the body of the message (which may contain MIME-
-   encoded subparts).
+   headers and header continuation lines, optionally preceded by a envelope
+   header.  The header block is terminated either by the end of the data or by a
+   blank line.  Following the header block is the body of the message (which may
+   contain MIME-encoded subparts).
 
    Optional *headersonly* is as with the :meth:`parse` method.
 

Modified: doctools/trunk/Doc-3k/library/errno.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/errno.rst	(original)
+++ doctools/trunk/Doc-3k/library/errno.rst	Sun Aug  5 00:45:13 2007
@@ -8,8 +8,8 @@
 
 This module makes available standard ``errno`` system symbols. The value of each
 symbol is the corresponding integer value. The names and descriptions are
-borrowed from :file:`linux/include/errno.h`, which should be pretty all-
-inclusive.
+borrowed from :file:`linux/include/errno.h`, which should be pretty
+all-inclusive.
 
 
 .. data:: errorcode

Modified: doctools/trunk/Doc-3k/library/fcntl.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/fcntl.rst	(original)
+++ doctools/trunk/Doc-3k/library/fcntl.rst	Sun Aug  5 00:45:13 2007
@@ -104,29 +104,26 @@
    the file descriptor of the file to lock or unlock, and *operation* is one of the
    following values:
 
-* :const:`LOCK_UN` -- unlock
-
-* :const:`LOCK_SH` -- acquire a shared lock
-
-* :const:`LOCK_EX` -- acquire an exclusive lock
-
-   When *operation* is :const:`LOCK_SH` or :const:`LOCK_EX`, it can also be bit-
-   wise OR'd with :const:`LOCK_NB` to avoid blocking on lock acquisition.  If
-   :const:`LOCK_NB` is used and the lock cannot be acquired, an :exc:`IOError` will
-   be raised and the exception will have an *errno* attribute set to
-   :const:`EACCES` or :const:`EAGAIN` (depending on the operating system; for
-   portability, check for both values).  On at least some systems, :const:`LOCK_EX`
-   can only be used if the file descriptor refers to a file opened for writing.
+   * :const:`LOCK_UN` -- unlock
+   * :const:`LOCK_SH` -- acquire a shared lock
+   * :const:`LOCK_EX` -- acquire an exclusive lock
+
+   When *operation* is :const:`LOCK_SH` or :const:`LOCK_EX`, it can also be
+   bit-wise OR'd with :const:`LOCK_NB` to avoid blocking on lock acquisition.
+   If :const:`LOCK_NB` is used and the lock cannot be acquired, an
+   :exc:`IOError` will be raised and the exception will have an *errno*
+   attribute set to :const:`EACCES` or :const:`EAGAIN` (depending on the
+   operating system; for portability, check for both values).  On at least some
+   systems, :const:`LOCK_EX` can only be used if the file descriptor refers to a
+   file opened for writing.
 
    *length* is the number of bytes to lock, *start* is the byte offset at which the
    lock starts, relative to *whence*, and *whence* is as with :func:`fileobj.seek`,
    specifically:
 
-* :const:`0` -- relative to the start of the file (:const:`SEEK_SET`)
-
-* :const:`1` -- relative to the current buffer position (:const:`SEEK_CUR`)
-
-* :const:`2` -- relative to the end of the file (:const:`SEEK_END`)
+   * :const:`0` -- relative to the start of the file (:const:`SEEK_SET`)
+   * :const:`1` -- relative to the current buffer position (:const:`SEEK_CUR`)
+   * :const:`2` -- relative to the end of the file (:const:`SEEK_END`)
 
    The default for *start* is 0, which means to start at the beginning of the file.
    The default for *length* is 0 which means to lock to the end of the file.  The
@@ -151,7 +148,8 @@
 .. seealso::
 
    Module :mod:`os`
-      If the locking flags :const:`O_SHLOCK` and :const:`O_EXLOCK` are present in the
-      :mod:`os` module, the :func:`os.open` function provides a more platform-
-      independent alternative to the :func:`lockf` and :func:`flock` functions.
+      If the locking flags :const:`O_SHLOCK` and :const:`O_EXLOCK` are present
+      in the :mod:`os` module, the :func:`os.open` function provides a more
+      platform-independent alternative to the :func:`lockf` and :func:`flock`
+      functions.
 

Modified: doctools/trunk/Doc-3k/library/formatter.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/formatter.rst	(original)
+++ doctools/trunk/Doc-3k/library/formatter.rst	Sun Aug  5 00:45:13 2007
@@ -169,7 +169,7 @@
    :const:`AS_IS` values, is passed to the writer's :meth:`new_styles` method.
 
 
-.. method:: formatter.pop_style([n\ ``= 1``])
+.. method:: formatter.pop_style([n=1])
 
    Pop the last *n* style specifications passed to :meth:`push_style`.  A tuple
    representing the revised stack, including :const:`AS_IS` values, is passed to
@@ -181,12 +181,12 @@
    Set the spacing style for the writer.
 
 
-.. method:: formatter.assert_line_data([flag\ ``= 1``])
+.. method:: formatter.assert_line_data([flag=1])
 
-   Inform the formatter that data has been added to the current paragraph out-of-
-   band.  This should be used when the writer has been manipulated directly.  The
-   optional *flag* argument can be set to false if the writer manipulations
-   produced a hard line break at the end of the output.
+   Inform the formatter that data has been added to the current paragraph
+   out-of-band.  This should be used when the writer has been manipulated
+   directly.  The optional *flag* argument can be set to false if the writer
+   manipulations produced a hard line break at the end of the output.
 
 
 .. _formatter-impls:
@@ -341,7 +341,7 @@
    output.
 
 
-.. class:: DumbWriter([file[, maxcol\ ``= 72``]])
+.. class:: DumbWriter([file[, maxcol=72]])
 
    Simple writer class which writes output on the file object passed in as *file*
    or, if *file* is omitted, on standard output.  The output is simply word-wrapped

Modified: doctools/trunk/Doc-3k/library/fpectl.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/fpectl.rst	(original)
+++ doctools/trunk/Doc-3k/library/fpectl.rst	Sun Aug  5 00:45:13 2007
@@ -17,10 +17,10 @@
 
 .. index:: single: IEEE-754
 
-Most computers carry out floating point operations in conformance with the so-
-called IEEE-754 standard. On any real computer, some floating point operations
-produce results that cannot be expressed as a normal floating point value. For
-example, try ::
+Most computers carry out floating point operations in conformance with the
+so-called IEEE-754 standard. On any real computer, some floating point
+operations produce results that cannot be expressed as a normal floating point
+value. For example, try ::
 
    >>> import math
    >>> math.exp(1000)

Modified: doctools/trunk/Doc-3k/library/functions.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/functions.rst	(original)
+++ doctools/trunk/Doc-3k/library/functions.rst	Sun Aug  5 00:45:13 2007
@@ -39,16 +39,17 @@
    its *locals* argument at all, and uses its *globals* only to determine the
    package context of the :keyword:`import` statement.)
 
-   When the *name* variable is of the form ``package.module``, normally, the top-
-   level package (the name up till the first dot) is returned, *not* the module
-   named by *name*.  However, when a non-empty *fromlist* argument is given, the
-   module named by *name* is returned.  This is done for compatibility with the
-   bytecode generated for the different kinds of import statement; when using
-   ``import spam.ham.eggs``, the top-level package :mod:`spam` must be placed in
-   the importing namespace, but when using ``from spam.ham import eggs``, the
-   ``spam.ham`` subpackage must be used to find the ``eggs`` variable.  As a
-   workaround for this behavior, use :func:`getattr` to extract the desired
-   components.  For example, you could define the following helper::
+   When the *name* variable is of the form ``package.module``, normally, the
+   top-level package (the name up till the first dot) is returned, *not* the
+   module named by *name*.  However, when a non-empty *fromlist* argument is
+   given, the module named by *name* is returned.  This is done for
+   compatibility with the bytecode generated for the different kinds of import
+   statement; when using ``import spam.ham.eggs``, the top-level package
+   :mod:`spam` must be placed in the importing namespace, but when using ``from
+   spam.ham import eggs``, the ``spam.ham`` subpackage must be used to find the
+   ``eggs`` variable.  As a workaround for this behavior, use :func:`getattr` to
+   extract the desired components.  For example, you could define the following
+   helper::
 
       def my_import(name):
           mod = __import__(name)
@@ -258,19 +259,19 @@
    keyword is retained in the dictionary. For example, these all return a
    dictionary equal to ``{"one": 2, "two": 3}``:
 
-* ``dict({'one': 2, 'two': 3})``
+   * ``dict({'one': 2, 'two': 3})``
 
-* ``dict({'one': 2, 'two': 3}.items())``
+   * ``dict({'one': 2, 'two': 3}.items())``
 
-* ``dict({'one': 2, 'two': 3}.iteritems())``
+   * ``dict({'one': 2, 'two': 3}.iteritems())``
 
-* ``dict(zip(('one', 'two'), (2, 3)))``
+   * ``dict(zip(('one', 'two'), (2, 3)))``
 
-* ``dict([['two', 3], ['one', 2]])``
+   * ``dict([['two', 3], ['one', 2]])``
 
-* ``dict(one=2, two=3)``
+   * ``dict(one=2, two=3)``
 
-* ``dict([(['one', 'two'][i-2], i) for i in (2, 3)])``
+   * ``dict([(['one', 'two'][i-2], i) for i in (2, 3)])``
 
    .. versionadded:: 2.2
 

Modified: doctools/trunk/Doc-3k/library/gdbm.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/gdbm.rst	(original)
+++ doctools/trunk/Doc-3k/library/gdbm.rst	Sun Aug  5 00:45:13 2007
@@ -40,13 +40,13 @@
    The following additional characters may be appended to the flag to control how
    the database is opened:
 
-* ``'f'`` --- Open the database in fast mode.  Writes to the database will not
+   * ``'f'`` --- Open the database in fast mode.  Writes to the database will not
      be synchronized.
 
-* ``'s'`` --- Synchronized mode. This will cause changes to the database will be
+   * ``'s'`` --- Synchronized mode. This will cause changes to the database will be
      immediately written to the file.
 
-* ``'u'`` --- Do not lock database.
+   * ``'u'`` --- Do not lock database.
 
    Not all flags are valid for all versions of ``gdbm``.  The module constant
    ``open_flags`` is a string of supported flag characters.  The exception

Modified: doctools/trunk/Doc-3k/library/getopt.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/getopt.rst	(original)
+++ doctools/trunk/Doc-3k/library/getopt.rst	Sun Aug  5 00:45:13 2007
@@ -43,13 +43,13 @@
 
    The return value consists of two elements: the first is a list of ``(option,
    value)`` pairs; the second is the list of program arguments left after the
-   option list was stripped (this is a trailing slice of *args*).  Each option-and-
-   value pair returned has the option as its first element, prefixed with a hyphen
-   for short options (e.g., ``'-x'``) or two hyphens for long options (e.g.,
-   ``'-``\ ``-long-option'``), and the option argument as its second element, or an
-   empty string if the option has no argument.  The options occur in the list in
-   the same order in which they were found, thus allowing multiple occurrences.
-   Long and short options may be mixed.
+   option list was stripped (this is a trailing slice of *args*).  Each
+   option-and-value pair returned has the option as its first element, prefixed
+   with a hyphen for short options (e.g., ``'-x'``) or two hyphens for long
+   options (e.g., ``'-``\ ``-long-option'``), and the option argument as its
+   second element, or an empty string if the option has no argument.  The
+   options occur in the list in the same order in which they were found, thus
+   allowing multiple occurrences.  Long and short options may be mixed.
 
 
 .. function:: gnu_getopt(args, options[, long_options])
@@ -60,8 +60,8 @@
    non-option argument is encountered.
 
    If the first character of the option string is '+', or if the environment
-   variable POSIXLY_CORRECT is set, then option processing stops as soon as a non-
-   option argument is encountered.
+   variable POSIXLY_CORRECT is set, then option processing stops as soon as a
+   non-option argument is encountered.
 
    .. versionadded:: 2.3
 

Modified: doctools/trunk/Doc-3k/library/gettext.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/gettext.rst	(original)
+++ doctools/trunk/Doc-3k/library/gettext.rst	Sun Aug  5 00:45:13 2007
@@ -385,10 +385,10 @@
 ids and message strings read from the catalog are converted to Unicode using
 this encoding.  The :meth:`ugettext` method always returns a Unicode, while the
 :meth:`gettext` returns an encoded 8-bit string.  For the message id arguments
-of both methods, either Unicode strings or 8-bit strings containing only US-
-ASCII characters are acceptable.  Note that the Unicode version of the methods
-(i.e. :meth:`ugettext` and :meth:`ungettext`) are the recommended interface to
-use for internationalized Python programs.
+of both methods, either Unicode strings or 8-bit strings containing only
+US-ASCII characters are acceptable.  Note that the Unicode version of the
+methods (i.e. :meth:`ugettext` and :meth:`ungettext`) are the recommended
+interface to use for internationalized Python programs.
 
 The entire set of key/value pairs are placed into a dictionary and set as the
 "protected" :attr:`_info` instance variable.

Modified: doctools/trunk/Doc-3k/library/httplib.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/httplib.rst	(original)
+++ doctools/trunk/Doc-3k/library/httplib.rst	Sun Aug  5 00:45:13 2007
@@ -100,8 +100,8 @@
 
 .. exception:: InvalidURL
 
-   A subclass of :exc:`HTTPException`, raised if a port is given and is either non-
-   numeric or empty.
+   A subclass of :exc:`HTTPException`, raised if a port is given and is either
+   non-numeric or empty.
 
    .. versionadded:: 2.3
 
@@ -396,11 +396,11 @@
 
    This will send a request to the server using the HTTP request method *method*
    and the selector *url*.  If the *body* argument is present, it should be a
-   string of data to send after the headers are finished. Alternatively, it may be
-   an open file object, in which case the contents of the file is sent; this file
-   object should support ``fileno()`` and ``read()`` methods. The header Content-
-   Length is automatically set to the correct value. The *headers* argument should
-   be a mapping of extra HTTP headers to send with the request.
+   string of data to send after the headers are finished. Alternatively, it may
+   be an open file object, in which case the contents of the file is sent; this
+   file object should support ``fileno()`` and ``read()`` methods. The header
+   Content-Length is automatically set to the correct value. The *headers*
+   argument should be a mapping of extra HTTP headers to send with the request.
 
    .. versionchanged:: 2.6
       *body* can be a file object.

Modified: doctools/trunk/Doc-3k/library/imaplib.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/imaplib.rst	(original)
+++ doctools/trunk/Doc-3k/library/imaplib.rst	Sun Aug  5 00:45:13 2007
@@ -232,8 +232,8 @@
 
 .. method:: IMAP4.getannotation(mailbox, entry, attribute)
 
-   Retrieve the specified ``ANNOTATION``\ s for *mailbox*. The method is non-
-   standard, but is supported by the ``Cyrus`` server.
+   Retrieve the specified ``ANNOTATION``\ s for *mailbox*. The method is
+   non-standard, but is supported by the ``Cyrus`` server.
 
    .. versionadded:: 2.5
 

Modified: doctools/trunk/Doc-3k/library/imp.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/imp.rst	(original)
+++ doctools/trunk/Doc-3k/library/imp.rst	Sun Aug  5 00:45:13 2007
@@ -177,12 +177,12 @@
 
 .. function:: init_frozen(name)
 
-   Initialize the frozen module called *name* and return its module object.  If the
-   module was already initialized, it will be initialized *again*.  If there is no
-   frozen module called *name*, ``None`` is returned.  (Frozen modules are modules
-   written in Python whose compiled byte-code object is incorporated into a custom-
-   built Python interpreter by Python's :program:`freeze` utility. See
-   :file:`Tools/freeze/` for now.)
+   Initialize the frozen module called *name* and return its module object.  If
+   the module was already initialized, it will be initialized *again*.  If there
+   is no frozen module called *name*, ``None`` is returned.  (Frozen modules are
+   modules written in Python whose compiled byte-code object is incorporated
+   into a custom-built Python interpreter by Python's :program:`freeze`
+   utility. See :file:`Tools/freeze/` for now.)
 
 
 .. function:: is_builtin(name)
@@ -240,10 +240,10 @@
 
 .. class:: NullImporter(path_string)
 
-   The :class:`NullImporter` type is a :pep:`302` import hook that handles non-
-   directory path strings by failing to find any modules.  Calling this type with
-   an existing directory or empty string raises :exc:`ImportError`.  Otherwise, a
-   :class:`NullImporter` instance is returned.
+   The :class:`NullImporter` type is a :pep:`302` import hook that handles
+   non-directory path strings by failing to find any modules.  Calling this type
+   with an existing directory or empty string raises :exc:`ImportError`.
+   Otherwise, a :class:`NullImporter` instance is returned.
 
    Python adds instances of this type to ``sys.path_importer_cache`` for any path
    entries that are not directories and are not handled by any other path hooks on

Modified: doctools/trunk/Doc-3k/library/inspect.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/inspect.rst	(original)
+++ doctools/trunk/Doc-3k/library/inspect.rst	Sun Aug  5 00:45:13 2007
@@ -198,12 +198,12 @@
    identified by *path* if it is a module, or ``None`` if it would not be
    identified as a module.  The return tuple is ``(name, suffix, mode, mtype)``,
    where *name* is the name of the module without the name of any enclosing
-   package, *suffix* is the trailing part of the file name (which may not be a dot-
-   delimited extension), *mode* is the :func:`open` mode that would be used
-   (``'r'`` or ``'rb'``), and *mtype* is an integer giving the type of the module.
-   *mtype* will have a value which can be compared to the constants defined in the
-   :mod:`imp` module; see the documentation for that module for more information on
-   module types.
+   package, *suffix* is the trailing part of the file name (which may not be a
+   dot-delimited extension), *mode* is the :func:`open` mode that would be used
+   (``'r'`` or ``'rb'``), and *mtype* is an integer giving the type of the
+   module.  *mtype* will have a value which can be compared to the constants
+   defined in the :mod:`imp` module; see the documentation for that module for
+   more information on module types.
 
 
 .. function:: getmodulename(path)

Modified: doctools/trunk/Doc-3k/library/itertools.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/itertools.rst	(original)
+++ doctools/trunk/Doc-3k/library/itertools.rst	Sun Aug  5 00:45:13 2007
@@ -279,16 +279,16 @@
    last tuple can be pre-padded with fill values using ``izip(*[chain(s,
    [None]*(n-1))]*n)``.
 
-   Note, when :func:`izip` is used with unequal length inputs, subsequent iteration
-   over the longer iterables cannot reliably be continued after :func:`izip`
-   terminates.  Potentially, up to one entry will be missing from each of the left-
-   over iterables. This occurs because a value is fetched from each iterator in-
-   turn, but the process ends when one of the iterators terminates.  This leaves
-   the last fetched values in limbo (they cannot be returned in a final, incomplete
-   tuple and they are cannot be pushed back into the iterator for retrieval with
-   ``next(it)``).  In general, :func:`izip` should only be used with unequal length
-   inputs when you don't care about trailing, unmatched values from the longer
-   iterables.
+   Note, when :func:`izip` is used with unequal length inputs, subsequent
+   iteration over the longer iterables cannot reliably be continued after
+   :func:`izip` terminates.  Potentially, up to one entry will be missing from
+   each of the left-over iterables. This occurs because a value is fetched from
+   each iterator in- turn, but the process ends when one of the iterators
+   terminates.  This leaves the last fetched values in limbo (they cannot be
+   returned in a final, incomplete tuple and they are cannot be pushed back into
+   the iterator for retrieval with ``next(it)``).  In general, :func:`izip`
+   should only be used with unequal length inputs when you don't care about
+   trailing, unmatched values from the longer iterables.
 
 
 .. function:: izip_longest(*iterables[, fillvalue])

Modified: doctools/trunk/Doc-3k/library/logging.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/logging.rst	(original)
+++ doctools/trunk/Doc-3k/library/logging.rst	Sun Aug  5 00:45:13 2007
@@ -984,9 +984,9 @@
 ^^^^^^^^^^^^^
 
 The :class:`StreamHandler` class, located in the core :mod:`logging` package,
-sends logging output to streams such as *sys.stdout*, *sys.stderr* or any file-
-like object (or, more precisely, any object which supports :meth:`write` and
-:meth:`flush` methods).
+sends logging output to streams such as *sys.stdout*, *sys.stderr* or any
+file-like object (or, more precisely, any object which supports :meth:`write`
+and :meth:`flush` methods).
 
 
 .. class:: StreamHandler([strm])
@@ -1635,8 +1635,8 @@
 
 .. method:: LogRecord.getMessage()
 
-   Returns the message for this :class:`LogRecord` instance after merging any user-
-   supplied arguments with the message.
+   Returns the message for this :class:`LogRecord` instance after merging any
+   user-supplied arguments with the message.
 
 
 Thread Safety

Modified: doctools/trunk/Doc-3k/library/mailbox.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/mailbox.rst	(original)
+++ doctools/trunk/Doc-3k/library/mailbox.rst	Sun Aug  5 00:45:13 2007
@@ -617,12 +617,13 @@
 the last message, a line containing a Control-Underscore (``'\\037'``)
 character.
 
-Messages in a Babyl mailbox have two sets of headers, original headers and so-
-called visible headers. Visible headers are typically a subset of the original
-headers that have been reformatted or abridged to be more attractive. Each
-message in a Babyl mailbox also has an accompanying list of :dfn:`labels`, or
-short strings that record extra information about the message, and a list of all
-user-defined labels found in the mailbox is kept in the Babyl options section.
+Messages in a Babyl mailbox have two sets of headers, original headers and
+so-called visible headers. Visible headers are typically a subset of the
+original headers that have been reformatted or abridged to be more
+attractive. Each message in a Babyl mailbox also has an accompanying list of
+:dfn:`labels`, or short strings that record extra information about the message,
+and a list of all user-defined labels found in the mailbox is kept in the Babyl
+options section.
 
 :class:`Babyl` instances have all of the methods of :class:`Mailbox` in addition
 to the following:
@@ -772,8 +773,8 @@
 "info" section added to its file name to store information about its state.
 (Some mail readers may also add an "info" section to messages in :file:`new`.)
 The "info" section may take one of two forms: it may contain "2," followed by a
-list of standardized flags (e.g., "2,FR") or it may contain "1," followed by so-
-called experimental information. Standard flags for Maildir messages are as
+list of standardized flags (e.g., "2,FR") or it may contain "1," followed by
+so-called experimental information. Standard flags for Maildir messages are as
 follows:
 
 +------+---------+--------------------------------+
@@ -1540,9 +1541,9 @@
    :class:`UnixMailbox` except that individual messages are separated by only
    ``From`` lines.
 
-   For more information, see `Configuring Netscape Mail on Unix: Why the Content-
-   Length Format is Bad <http://home.netscape.com/eng/mozilla/2.0/relnotes/demo
-   /content-length.html>`_.
+   For more information, see `Configuring Netscape Mail on Unix: Why the
+   Content-Length Format is Bad
+   <http://home.netscape.com/eng/mozilla/2.0/relnotes/demo/content-length.html>`_.
 
 
 .. class:: PortableUnixMailbox(fp[, factory])

Modified: doctools/trunk/Doc-3k/library/math.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/math.rst	(original)
+++ doctools/trunk/Doc-3k/library/math.rst	Sun Aug  5 00:45:13 2007
@@ -209,15 +209,15 @@
 .. note::
 
    The :mod:`math` module consists mostly of thin wrappers around the platform C
-   math library functions.  Behavior in exceptional cases is loosely specified by
-   the C standards, and Python inherits much of its math-function error-reporting
-   behavior from the platform C implementation.  As a result, the specific
-   exceptions raised in error cases (and even whether some arguments are considered
-   to be exceptional at all) are not defined in any useful cross-platform or cross-
-   release way.  For example, whether ``math.log(0)`` returns ``-Inf`` or raises
-   :exc:`ValueError` or :exc:`OverflowError` isn't defined, and in cases where
-   ``math.log(0)`` raises :exc:`OverflowError`, ``math.log(0L)`` may raise
-   :exc:`ValueError` instead.
+   math library functions.  Behavior in exceptional cases is loosely specified
+   by the C standards, and Python inherits much of its math-function
+   error-reporting behavior from the platform C implementation.  As a result,
+   the specific exceptions raised in error cases (and even whether some
+   arguments are considered to be exceptional at all) are not defined in any
+   useful cross-platform or cross-release way.  For example, whether
+   ``math.log(0)`` returns ``-Inf`` or raises :exc:`ValueError` or
+   :exc:`OverflowError` isn't defined, and in cases where ``math.log(0)`` raises
+   :exc:`OverflowError`, ``math.log(0L)`` may raise :exc:`ValueError` instead.
 
 
 .. seealso::

Modified: doctools/trunk/Doc-3k/library/mimetypes.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/mimetypes.rst	(original)
+++ doctools/trunk/Doc-3k/library/mimetypes.rst	Sun Aug  5 00:45:13 2007
@@ -39,11 +39,12 @@
    Encoding suffixes are case sensitive; type suffixes are first tried case
    sensitively, then case insensitively.
 
-   Optional *strict* is a flag specifying whether the list of known MIME types is
-   limited to only the official types `registered with IANA <http://www.isi.edu/in-
-   notes/iana/assignments/media-types>`_ are recognized.  When *strict* is true
-   (the default), only the IANA types are supported; when *strict* is false, some
-   additional non-standard but commonly used MIME types are also recognized.
+   Optional *strict* is a flag specifying whether the list of known MIME types
+   is limited to only the official types `registered with IANA
+   <http://www.isi.edu/in-notes/iana/assignments/media-types>`_ are recognized.
+   When *strict* is true (the default), only the IANA types are supported; when
+   *strict* is false, some additional non-standard but commonly used MIME types
+   are also recognized.
 
 
 .. function:: guess_all_extensions(type[, strict])

Modified: doctools/trunk/Doc-3k/library/mmap.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/mmap.rst	(original)
+++ doctools/trunk/Doc-3k/library/mmap.rst	Sun Aug  5 00:45:13 2007
@@ -147,8 +147,8 @@
 
 .. method:: mmap.size()
 
-   Return the length of the file, which can be larger than the size of the memory-
-   mapped area.
+   Return the length of the file, which can be larger than the size of the
+   memory-mapped area.
 
 
 .. method:: mmap.tell()

Modified: doctools/trunk/Doc-3k/library/msilib.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/msilib.rst	(original)
+++ doctools/trunk/Doc-3k/library/msilib.rst	Sun Aug  5 00:45:13 2007
@@ -424,7 +424,7 @@
    belongs to, and *name* is the control's name.
 
 
-.. method:: Control.event(event, argument[,  condition = ``1''[, ordering]])
+.. method:: Control.event(event, argument[,  condition=1[, ordering]])
 
    Make an entry into the ``ControlEvent`` table for this control.
 

Modified: doctools/trunk/Doc-3k/library/multifile.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/multifile.rst	(original)
+++ doctools/trunk/Doc-3k/library/multifile.rst	Sun Aug  5 00:45:13 2007
@@ -33,8 +33,8 @@
 It will be useful to know that in :class:`MultiFile`'s view of the world, text
 is composed of three kinds of lines: data, section-dividers, and end-markers.
 MultiFile is designed to support parsing of messages that may have multiple
-nested message parts, each with its own pattern for section-divider and end-
-marker lines.
+nested message parts, each with its own pattern for section-divider and
+end-marker lines.
 
 
 .. seealso::
@@ -110,9 +110,9 @@
    return the empty string to indicate end-of-file, until a call to :meth:`pop`
    removes the boundary a or :meth:`next` call reenables it.
 
-   It is possible to push more than one boundary.  Encountering the most-recently-
-   pushed boundary will return EOF; encountering any other boundary will raise an
-   error.
+   It is possible to push more than one boundary.  Encountering the
+   most-recently-pushed boundary will return EOF; encountering any other
+   boundary will raise an error.
 
 
 .. method:: MultiFile.pop()
@@ -122,19 +122,19 @@
 
 .. method:: MultiFile.section_divider(str)
 
-   Turn a boundary into a section-divider line.  By default, this method prepends
-   ``'-``\ ``-'`` (which MIME section boundaries have) but it is declared so it can
-   be overridden in derived classes.  This method need not append LF or CR-LF, as
-   comparison with the result ignores trailing whitespace.
+   Turn a boundary into a section-divider line.  By default, this method
+   prepends ``'--'`` (which MIME section boundaries have) but it is declared so
+   it can be overridden in derived classes.  This method need not append LF or
+   CR-LF, as comparison with the result ignores trailing whitespace.
 
 
 .. method:: MultiFile.end_marker(str)
 
    Turn a boundary string into an end-marker line.  By default, this method
-   prepends ``'-``\ ``-'`` and appends ``'-``\ ``-'`` (like a MIME-multipart end-
-   of-message marker) but it is declared so it can be overridden in derived
-   classes.  This method need not append LF or CR-LF, as comparison with the result
-   ignores trailing whitespace.
+   prepends ``'--'`` and appends ``'--'`` (like a MIME-multipart end-of-message
+   marker) but it is declared so it can be overridden in derived classes.  This
+   method need not append LF or CR-LF, as comparison with the result ignores
+   trailing whitespace.
 
 Finally, :class:`MultiFile` instances have two public instance variables:
 

Modified: doctools/trunk/Doc-3k/library/netrc.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/netrc.rst	(original)
+++ doctools/trunk/Doc-3k/library/netrc.rst	Sun Aug  5 00:45:13 2007
@@ -70,9 +70,9 @@
 
 .. note::
 
-   Passwords are limited to a subset of the ASCII character set. Versions of this
-   module prior to 2.3 were extremely limited.  Starting with 2.3, all ASCII
-   punctuation is allowed in passwords.  However, note that whitespace and non-
-   printable characters are not allowed in passwords.  This is a limitation of the
-   way the .netrc file is parsed and may be removed in the future.
+   Passwords are limited to a subset of the ASCII character set. Versions of
+   this module prior to 2.3 were extremely limited.  Starting with 2.3, all
+   ASCII punctuation is allowed in passwords.  However, note that whitespace and
+   non-printable characters are not allowed in passwords.  This is a limitation
+   of the way the .netrc file is parsed and may be removed in the future.
 

Modified: doctools/trunk/Doc-3k/library/new.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/new.rst	(original)
+++ doctools/trunk/Doc-3k/library/new.rst	Sun Aug  5 00:45:13 2007
@@ -11,8 +11,8 @@
 functions. This is for use primarily in marshal-type functions, when a new
 object needs to be created "magically" and not by using the regular creation
 functions. This module provides a low-level interface to the interpreter, so
-care must be exercised when using this module. It is possible to supply non-
-sensical arguments which crash the interpreter when the object is used.
+care must be exercised when using this module. It is possible to supply
+non-sensical arguments which crash the interpreter when the object is used.
 
 The :mod:`new` module defines the following functions:
 

Modified: doctools/trunk/Doc-3k/library/nntplib.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/nntplib.rst	(original)
+++ doctools/trunk/Doc-3k/library/nntplib.rst	Sun Aug  5 00:45:13 2007
@@ -53,18 +53,18 @@
 
 .. class:: NNTP(host[, port [, user[, password [, readermode] [, usenetrc]]]])
 
-   Return a new instance of the :class:`NNTP` class, representing a connection to
-   the NNTP server running on host *host*, listening at port *port*.  The default
-   *port* is 119.  If the optional *user* and *password* are provided,  or if
-   suitable credentials are present in :file:`/.netrc` and the optional flag
-   *usenetrc* is true (the default), the ``AUTHINFO USER`` and ``AUTHINFO PASS``
-   commands are used to identify and authenticate the user to the server.  If the
-   optional flag *readermode* is true, then a ``mode reader`` command is sent
-   before authentication is performed.  Reader mode is sometimes necessary if you
-   are connecting to an NNTP server on the local machine and intend to call reader-
-   specific commands, such as ``group``.  If you get unexpected
-   :exc:`NNTPPermanentError`\ s, you might need to set *readermode*.  *readermode*
-   defaults to ``None``. *usenetrc* defaults to ``True``.
+   Return a new instance of the :class:`NNTP` class, representing a connection
+   to the NNTP server running on host *host*, listening at port *port*.  The
+   default *port* is 119.  If the optional *user* and *password* are provided,
+   or if suitable credentials are present in :file:`/.netrc` and the optional
+   flag *usenetrc* is true (the default), the ``AUTHINFO USER`` and ``AUTHINFO
+   PASS`` commands are used to identify and authenticate the user to the server.
+   If the optional flag *readermode* is true, then a ``mode reader`` command is
+   sent before authentication is performed.  Reader mode is sometimes necessary
+   if you are connecting to an NNTP server on the local machine and intend to
+   call reader-specific commands, such as ``group``.  If you get unexpected
+   :exc:`NNTPPermanentError`\ s, you might need to set *readermode*.
+   *readermode* defaults to ``None``. *usenetrc* defaults to ``True``.
 
    .. versionchanged:: 2.4
       *usenetrc* argument added.

Modified: doctools/trunk/Doc-3k/library/optparse.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/optparse.rst	(original)
+++ doctools/trunk/Doc-3k/library/optparse.rst	Sun Aug  5 00:45:13 2007
@@ -117,18 +117,18 @@
 
    Some other option syntaxes that the world has seen include:
 
-* a hyphen followed by a few letters, e.g. ``"-pf"`` (this is *not* the same
-  as multiple options merged into a single argument)
+   * a hyphen followed by a few letters, e.g. ``"-pf"`` (this is *not* the same
+     as multiple options merged into a single argument)
 
-* a hyphen followed by a whole word, e.g. ``"-file"`` (this is technically
-  equivalent to the previous syntax, but they aren't usually seen in the same
-  program)
+   * a hyphen followed by a whole word, e.g. ``"-file"`` (this is technically
+     equivalent to the previous syntax, but they aren't usually seen in the same
+     program)
 
-* a plus sign followed by a single letter, or a few letters, or a word, e.g.
-  ``"+f"``, ``"+rgb"``
+   * a plus sign followed by a single letter, or a few letters, or a word, e.g.
+     ``"+f"``, ``"+rgb"``
 
-* a slash followed by a letter, or a few letters, or a word, e.g. ``"/f"``,
-  ``"/file"``
+   * a slash followed by a letter, or a few letters, or a word, e.g. ``"/f"``,
+     ``"/file"``
 
    These option syntaxes are not supported by :mod:`optparse`, and they never will
    be.  This is deliberate: the first three are non-standard on any environment,
@@ -470,8 +470,8 @@
 :mod:`optparse`'s ability to generate help and usage text automatically is
 useful for creating user-friendly command-line interfaces.  All you have to do
 is supply a :attr:`help` value for each option, and optionally a short usage
-message for your whole program.  Here's an OptionParser populated with user-
-friendly (documented) options::
+message for your whole program.  Here's an OptionParser populated with
+user-friendly (documented) options::
 
    usage = "usage: %prog [options] arg1 arg2"
    parser = OptionParser(usage=usage)
@@ -488,9 +488,9 @@
                      help="interaction mode: novice, intermediate, "
                           "or expert [default: %default]")
 
-If :mod:`optparse` encounters either ``"-h"`` or ``"--help"`` on the command-
-line, or if you just call :meth:`parser.print_help`, it prints the following to
-standard output::
+If :mod:`optparse` encounters either ``"-h"`` or ``"--help"`` on the
+command-line, or if you just call :meth:`parser.print_help`, it prints the
+following to standard output::
 
    usage: <yourscript> [options] arg1 arg2
 
@@ -521,12 +521,12 @@
   default: ``"usage: %prog [options]"``, which is fine if your script doesn't take
   any positional arguments.
 
-* every option defines a help string, and doesn't worry about line-
-  wrapping---\ :mod:`optparse` takes care of wrapping lines and making the help
-  output look good.
+* every option defines a help string, and doesn't worry about line-wrapping---
+  :mod:`optparse` takes care of wrapping lines and making the help output look
+  good.
 
-* options that take a value indicate this fact in their automatically-
-  generated help message, e.g. for the "mode" option::
+* options that take a value indicate this fact in their automatically-generated
+  help message, e.g. for the "mode" option::
 
      -m MODE, --mode=MODE
 
@@ -1663,14 +1663,14 @@
 where ``option`` is an :class:`Option` instance, ``opt`` is an option string
 (e.g., ``"-f"``), and ``value`` is the string from the command line that must be
 checked and converted to your desired type.  ``check_mytype()`` should return an
-object of the hypothetical type ``mytype``.  The value returned by a type-
-checking function will wind up in the OptionValues instance returned by
+object of the hypothetical type ``mytype``.  The value returned by a
+type-checking function will wind up in the OptionValues instance returned by
 :meth:`OptionParser.parse_args`, or be passed to a callback as the ``value``
 parameter.
 
 Your type-checking function should raise OptionValueError if it encounters any
-problems.  OptionValueError takes a single string argument, which is passed as-
-is to OptionParser's :meth:`error` method, which in turn prepends the program
+problems.  OptionValueError takes a single string argument, which is passed
+as-is to OptionParser's :meth:`error` method, which in turn prepends the program
 name and the string ``"error:"`` and prints everything to stderr before
 terminating the process.
 

Modified: doctools/trunk/Doc-3k/library/os.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/os.rst	(original)
+++ doctools/trunk/Doc-3k/library/os.rst	Sun Aug  5 00:45:13 2007
@@ -568,9 +568,9 @@
 
 .. function:: ttyname(fd)
 
-   Return a string which specifies the terminal device associated with file-
-   descriptor *fd*.  If *fd* is not associated with a terminal device, an exception
-   is raised. Availability:Macintosh,  Unix.
+   Return a string which specifies the terminal device associated with
+   file-descriptor *fd*.  If *fd* is not associated with a terminal device, an
+   exception is raised. Availability:Macintosh, Unix.
 
 
 .. function:: write(fd, str)
@@ -600,8 +600,8 @@
           O_EXCL
           O_TRUNC
 
-   Options for the *flag* argument to the :func:`open` function. These can be bit-
-   wise OR'd together. Availability: Macintosh, Unix, Windows.
+   Options for the *flag* argument to the :func:`open` function. These can be
+   bit-wise OR'd together. Availability: Macintosh, Unix, Windows.
 
 
 .. data:: O_DSYNC
@@ -619,8 +619,8 @@
 
 .. data:: O_BINARY
 
-   Option for the *flag* argument to the :func:`open` function. This can be bit-
-   wise OR'd together with those listed above. Availability: Windows.
+   Option for the *flag* argument to the :func:`open` function. This can be
+   bit-wise OR'd together with those listed above. Availability: Windows.
 
    .. % XXX need to check on the availability of this one.
 
@@ -632,8 +632,8 @@
           O_SEQUENTIAL
           O_TEXT
 
-   Options for the *flag* argument to the :func:`open` function. These can be bit-
-   wise OR'd together. Availability: Windows.
+   Options for the *flag* argument to the :func:`open` function. These can be
+   bit-wise OR'd together. Availability: Windows.
 
 
 .. data:: SEEK_SET
@@ -737,25 +737,16 @@
    Set the flags of *path* to the numeric *flags*. *flags* may take a combination
    (bitwise OR) of the following values (as defined in the :mod:`stat` module):
 
-* ``UF_NODUMP``
-
-* ``UF_IMMUTABLE``
-
-* ``UF_APPEND``
-
-* ``UF_OPAQUE``
-
-* ``UF_NOUNLINK``
-
-* ``SF_ARCHIVED``
-
-* ``SF_IMMUTABLE``
-
-* ``SF_APPEND``
-
-* ``SF_NOUNLINK``
-
-* ``SF_SNAPSHOT``
+   * ``UF_NODUMP``
+   * ``UF_IMMUTABLE``
+   * ``UF_APPEND``
+   * ``UF_OPAQUE``
+   * ``UF_NOUNLINK``
+   * ``SF_ARCHIVED``
+   * ``SF_IMMUTABLE``
+   * ``SF_APPEND``
+   * ``SF_NOUNLINK``
+   * ``SF_SNAPSHOT``
 
    Availability: Macintosh, Unix.
 
@@ -776,43 +767,25 @@
    following values (as defined in the :mod:`stat` module) or bitwise or-ed
    combinations of them:
 
-* ``stat.S_ISUID``
-
-* ``stat.S_ISGID``
-
-* ``stat.S_ENFMT``
-
-* ``stat.S_ISVTX``
-
-* ``stat.S_IREAD``
-
-* ``stat.S_IWRITE``
-
-* ``stat.S_IEXEC``
-
-* ``stat.S_IRWXU``
-
-* ``stat.S_IRUSR``
-
-* ``stat.S_IWUSR``
-
-* ``stat.S_IXUSR``
-
-* ``stat.S_IRWXG``
-
-* ``stat.S_IRGRP``
-
-* ``stat.S_IWGRP``
-
-* ``stat.S_IXGRP``
-
-* ``stat.S_IRWXO``
-
-* ``stat.S_IROTH``
-
-* ``stat.S_IWOTH``
-
-* ``stat.S_IXOTH``
+   * ``stat.S_ISUID``
+   * ``stat.S_ISGID``
+   * ``stat.S_ENFMT``
+   * ``stat.S_ISVTX``
+   * ``stat.S_IREAD``
+   * ``stat.S_IWRITE``
+   * ``stat.S_IEXEC``
+   * ``stat.S_IRWXU``
+   * ``stat.S_IRUSR``
+   * ``stat.S_IWUSR``
+   * ``stat.S_IXUSR``
+   * ``stat.S_IRWXG``
+   * ``stat.S_IRGRP``
+   * ``stat.S_IWGRP``
+   * ``stat.S_IXGRP``
+   * ``stat.S_IRWXO``
+   * ``stat.S_IROTH``
+   * ``stat.S_IWOTH``
+   * ``stat.S_IXOTH``
 
    Availability: Macintosh, Unix, Windows.
 
@@ -1241,7 +1214,7 @@
    Availability: Macintosh, Unix, Windows.
 
 
-.. function:: walk(top[, topdown\ ``=True`` [, onerror\ ``=None``[, followlinks\ ``=False``]]])
+.. function:: walk(top[, topdown=True [, onerror=None[, followlinks=False]]])
 
    .. index::
       single: directory; walking

Modified: doctools/trunk/Doc-3k/library/ossaudiodev.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/ossaudiodev.rst	(original)
+++ doctools/trunk/Doc-3k/library/ossaudiodev.rst	Sun Aug  5 00:45:13 2007
@@ -78,11 +78,12 @@
    module first looks in the environment variable :envvar:`AUDIODEV` for a device
    to use.  If not found, it falls back to :file:`/dev/dsp`.
 
-   *mode* is one of ``'r'`` for read-only (record) access, ``'w'`` for write-only
-   (playback) access and ``'rw'`` for both. Since many sound cards only allow one
-   process to have the recorder or player open at a time, it is a good idea to open
-   the device only for the activity needed.  Further, some sound cards are half-
-   duplex: they can be opened for reading or writing, but not both at once.
+   *mode* is one of ``'r'`` for read-only (record) access, ``'w'`` for
+   write-only (playback) access and ``'rw'`` for both. Since many sound cards
+   only allow one process to have the recorder or player open at a time, it is a
+   good idea to open the device only for the activity needed.  Further, some
+   sound cards are half-duplex: they can be opened for reading or writing, but
+   not both at once.
 
    Note the unusual calling syntax: the *first* argument is optional, and the
    second is required.  This is a historical artifact for compatibility with the

Modified: doctools/trunk/Doc-3k/library/othergui.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/othergui.rst	(original)
+++ doctools/trunk/Doc-3k/library/othergui.rst	Sun Aug  5 00:45:13 2007
@@ -61,18 +61,18 @@
       Summerfield.
 
    `wxPython <http://www.wxpython.org>`_
-      wxPython is a cross-platform GUI toolkit for Python that is built around the
-      popular `wxWidgets <http://www.wxwidgets.org/>`_ (formerly
-      wxWindows) C++ toolkit.  It provides a
-      native look and feel for applications on Windows, Mac OS X, and Unix systems by
-      using each platform's native widgets where ever possible, (GTK+ on Unix-like
-      systems).  In addition to an extensive set of widgets, wxPython provides classes
-      for online documentation and context sensitive help, printing, HTML viewing,
-      low-level device context drawing, drag and drop, system clipboard access, an
-      XML-based resource format and more, including an ever growing library of user-
-      contributed modules.  wxPython has a book,
-      `wxPython in Action <http://www.amazon.com/exec/obidos/ASIN/1932394621>`_,
-      by Noel Rappin and Robin Dunn.
+      wxPython is a cross-platform GUI toolkit for Python that is built around
+      the popular `wxWidgets <http://www.wxwidgets.org/>`_ (formerly wxWindows)
+      C++ toolkit.  It provides a native look and feel for applications on
+      Windows, Mac OS X, and Unix systems by using each platform's native
+      widgets where ever possible, (GTK+ on Unix-like systems).  In addition to
+      an extensive set of widgets, wxPython provides classes for online
+      documentation and context sensitive help, printing, HTML viewing,
+      low-level device context drawing, drag and drop, system clipboard access,
+      an XML-based resource format and more, including an ever growing library
+      of user-contributed modules.  wxPython has a book, `wxPython in Action
+      <http://www.amazon.com/exec/obidos/ASIN/1932394621>`_, by Noel Rappin and
+      Robin Dunn.
 
 PyGTK, PyQt, and wxPython, all have a modern look and feel and far more
 widgets and better documentation than Tkinter. In addition,

Modified: doctools/trunk/Doc-3k/library/parser.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/parser.rst	(original)
+++ doctools/trunk/Doc-3k/library/parser.rst	Sun Aug  5 00:45:13 2007
@@ -189,7 +189,7 @@
    information is omitted if the flag is false or omitted.
 
 
-.. function:: compileast(ast[, filename\ ``= '<ast>'``])
+.. function:: compileast(ast[, filename='<ast>'])
 
    .. index::
       builtin: exec

Modified: doctools/trunk/Doc-3k/library/pickle.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/pickle.rst	(original)
+++ doctools/trunk/Doc-3k/library/pickle.rst	Sun Aug  5 00:45:13 2007
@@ -91,8 +91,8 @@
 with the same internal structure.  Perhaps the most obvious thing to do with
 these byte streams is to write them onto a file, but it is also conceivable to
 send them across a network or store them in a database.  The module
-:mod:`shelve` provides a simple interface to pickle and unpickle objects on DBM-
-style database files.
+:mod:`shelve` provides a simple interface to pickle and unpickle objects on
+DBM-style database files.
 
 
 Data stream format
@@ -689,9 +689,9 @@
 
    output.close()
 
-The following example reads the resulting pickled data.  When reading a pickle-
-containing file, you should open the file in binary mode because you can't be
-sure if the ASCII or binary format was used. ::
+The following example reads the resulting pickled data.  When reading a
+pickle-containing file, you should open the file in binary mode because you
+can't be sure if the ASCII or binary format was used. ::
 
    import pprint, pickle
 

Modified: doctools/trunk/Doc-3k/library/profile.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/profile.rst	(original)
+++ doctools/trunk/Doc-3k/library/profile.rst	Sun Aug  5 00:45:13 2007
@@ -298,10 +298,10 @@
    This function takes a single argument that can be passed to the :func:`exec`
    function, and an optional file name.  In all cases this routine attempts to
    :func:`exec` its first argument, and gather profiling statistics from the
-   execution. If no file name is present, then this function automatically prints a
-   simple profiling report, sorted by the standard name string (file/line/function-
-   name) that is presented in each line.  The following is a typical output from
-   such a call::
+   execution. If no file name is present, then this function automatically
+   prints a simple profiling report, sorted by the standard name string
+   (file/line/function-name) that is presented in each line.  The following is a
+   typical output from such a call::
 
             2706 function calls (2004 primitive calls) in 4.504 CPU seconds
 
@@ -527,12 +527,12 @@
    argument is also identical.  Each caller is reported on its own line.  The
    format differs slightly depending on the profiler that produced the stats:
 
-* With :mod:`profile`, a number is shown in parentheses after each caller to
-     show how many times this specific call was made.  For convenience, a second non-
-     parenthesized number repeats the cumulative time spent in the function at the
-     right.
+   * With :mod:`profile`, a number is shown in parentheses after each caller to
+     show how many times this specific call was made.  For convenience, a second
+     non-parenthesized number repeats the cumulative time spent in the function
+     at the right.
 
-* With :mod:`cProfile`, each caller is preceeded by three numbers: the number of
+   * With :mod:`cProfile`, each caller is preceeded by three numbers: the number of
      times this specific call was made, and the total and cumulative times spent in
      the current function while it was invoked by this specific caller.
 

Modified: doctools/trunk/Doc-3k/library/pyexpat.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/pyexpat.rst	(original)
+++ doctools/trunk/Doc-3k/library/pyexpat.rst	Sun Aug  5 00:45:13 2007
@@ -20,8 +20,8 @@
 
 .. index:: single: Expat
 
-The :mod:`xml.parsers.expat` module is a Python interface to the Expat non-
-validating XML parser. The module provides a single extension type,
+The :mod:`xml.parsers.expat` module is a Python interface to the Expat
+non-validating XML parser. The module provides a single extension type,
 :class:`xmlparser`, that represents the current state of an XML parser.  After
 an :class:`xmlparser` object has been created, various attributes of the object
 can be set to handler functions.  When an XML document is then fed to the

Modified: doctools/trunk/Doc-3k/library/random.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/random.rst	(original)
+++ doctools/trunk/Doc-3k/library/random.rst	Sun Aug  5 00:45:13 2007
@@ -10,8 +10,8 @@
 distributions.
 
 For integers, uniform selection from a range. For sequences, uniform selection
-of a random element, a function to generate a random permutation of a list in-
-place, and a function for random sampling without replacement.
+of a random element, a function to generate a random permutation of a list
+in-place, and a function for random sampling without replacement.
 
 On the real line, there are functions to compute uniform, normal (Gaussian),
 lognormal, negative exponential, gamma, and beta distributions. For generating

Modified: doctools/trunk/Doc-3k/library/re.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/re.rst	(original)
+++ doctools/trunk/Doc-3k/library/re.rst	Sun Aug  5 00:45:13 2007
@@ -134,10 +134,10 @@
 
 ``{m,n}?``
    Causes the resulting RE to match from *m* to *n* repetitions of the preceding
-   RE, attempting to match as *few* repetitions as possible.  This is the non-
-   greedy version of the previous qualifier.  For example, on the 6-character
-   string ``'aaaaaa'``, ``a{3,5}`` will match 5 ``'a'`` characters, while
-   ``a{3,5}?`` will only match 3 characters.
+   RE, attempting to match as *few* repetitions as possible.  This is the
+   non-greedy version of the previous qualifier.  For example, on the
+   6-character string ``'aaaaaa'``, ``a{3,5}`` will match 5 ``'a'`` characters,
+   while ``a{3,5}?`` will only match 3 characters.
 
 ``'\'``
    Either escapes special characters (permitting you to match characters like
@@ -519,7 +519,7 @@
       If you want to locate a match anywhere in *string*, use :meth:`search` instead.
 
 
-.. function:: split(pattern, string[, maxsplit\ ``= 0``])
+.. function:: split(pattern, string[, maxsplit=0])
 
    Split *string* by the occurrences of *pattern*.  If capturing parentheses are
    used in *pattern*, then the text of all groups in the pattern are also returned
@@ -673,7 +673,7 @@
    :meth:`match` method.
 
 
-.. method:: RegexObject.split(string[, maxsplit\ ``= 0``])
+.. method:: RegexObject.split(string[, maxsplit=0])
 
    Identical to the :func:`split` function, using the compiled pattern.
 
@@ -688,12 +688,12 @@
    Identical to the :func:`finditer` function, using the compiled pattern.
 
 
-.. method:: RegexObject.sub(repl, string[, count\ ``= 0``])
+.. method:: RegexObject.sub(repl, string[, count=0])
 
    Identical to the :func:`sub` function, using the compiled pattern.
 
 
-.. method:: RegexObject.subn(repl, string[, count\ ``= 0``])
+.. method:: RegexObject.subn(repl, string[, count=0])
 
    Identical to the :func:`subn` function, using the compiled pattern.
 

Modified: doctools/trunk/Doc-3k/library/repr.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/repr.rst	(original)
+++ doctools/trunk/Doc-3k/library/repr.rst	Sun Aug  5 00:45:13 2007
@@ -65,8 +65,6 @@
    .. versionadded:: 2.4
       :attr:`maxset`, :attr:`maxfrozenset`, and :attr:`set`.
 
-   .
-
 
 .. attribute:: Repr.maxlong
 

Modified: doctools/trunk/Doc-3k/library/rfc822.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/rfc822.rst	(original)
+++ doctools/trunk/Doc-3k/library/rfc822.rst	Sun Aug  5 00:45:13 2007
@@ -256,9 +256,9 @@
 
 :class:`Message` instances also support a limited mapping interface. In
 particular: ``m[name]`` is like ``m.getheader(name)`` but raises :exc:`KeyError`
-if there is no matching header; and ``len(m)``, ``m.get(name[, *default*])``,
+if there is no matching header; and ``len(m)``, ``m.get(name[, default])``,
 ``m.has_key(name)``, ``m.keys()``, ``m.values()`` ``m.items()``, and
-``m.setdefault(name[, *default*])`` act as expected, with the one difference
+``m.setdefault(name[, default])`` act as expected, with the one difference
 that :meth:`setdefault` uses an empty string as the default value.
 :class:`Message` instances also support the mapping writable interface ``m[name]
 = value`` and ``del m[name]``.  :class:`Message` objects do not support the

Modified: doctools/trunk/Doc-3k/library/select.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/select.rst	(original)
+++ doctools/trunk/Doc-3k/library/select.rst	Sun Aug  5 00:45:13 2007
@@ -33,16 +33,16 @@
 .. function:: select(iwtd, owtd, ewtd[, timeout])
 
    This is a straightforward interface to the Unix :cfunc:`select` system call.
-   The first three arguments are sequences of 'waitable objects': either integers
-   representing file descriptors or objects with a parameterless method named
-   :meth:`fileno` returning such an integer.  The three sequences of waitable
-   objects are for input, output and 'exceptional conditions', respectively.  Empty
-   sequences are allowed, but acceptance of three empty sequences is platform-
-   dependent. (It is known to work on Unix but not on Windows.)  The optional
-   *timeout* argument specifies a time-out as a floating point number in seconds.
-   When the *timeout* argument is omitted the function blocks until at least one
-   file descriptor is ready.  A time-out value of zero specifies a poll and never
-   blocks.
+   The first three arguments are sequences of 'waitable objects': either
+   integers representing file descriptors or objects with a parameterless method
+   named :meth:`fileno` returning such an integer.  The three sequences of
+   waitable objects are for input, output and 'exceptional conditions',
+   respectively.  Empty sequences are allowed, but acceptance of three empty
+   sequences is platform-dependent. (It is known to work on Unix but not on
+   Windows.)  The optional *timeout* argument specifies a time-out as a floating
+   point number in seconds.  When the *timeout* argument is omitted the function
+   blocks until at least one file descriptor is ready.  A time-out value of zero
+   specifies a poll and never blocks.
 
    The return value is a triple of lists of objects that are ready: subsets of the
    first three arguments.  When the time-out is reached without a file descriptor

Modified: doctools/trunk/Doc-3k/library/sgmllib.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/sgmllib.rst	(original)
+++ doctools/trunk/Doc-3k/library/sgmllib.rst	Sun Aug  5 00:45:13 2007
@@ -21,14 +21,14 @@
    The :class:`SGMLParser` class is instantiated without arguments. The parser is
    hardcoded to recognize the following constructs:
 
-* Opening and closing tags of the form ``<tag attr="value" ...>`` and
+   * Opening and closing tags of the form ``<tag attr="value" ...>`` and
      ``</tag>``, respectively.
 
-* Numeric character references of the form ``&#name;``.
+   * Numeric character references of the form ``&#name;``.
 
-* Entity references of the form ``&name;``.
+   * Entity references of the form ``&name;``.
 
-* SGML comments of the form ``<!--text-->``.  Note that spaces, tabs, and
+   * SGML comments of the form ``<!--text-->``.  Note that spaces, tabs, and
      newlines are allowed between the trailing ``>`` and the immediately preceding
      ``--``.
 

Modified: doctools/trunk/Doc-3k/library/shelve.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/shelve.rst	(original)
+++ doctools/trunk/Doc-3k/library/shelve.rst	Sun Aug  5 00:45:13 2007
@@ -15,7 +15,7 @@
 lots of shared  sub-objects.  The keys are ordinary strings.
 
 
-.. function:: open(filename[,flag='c'[,protocol=``None``[,writeback=``False``]]])
+.. function:: open(filename[, flag='c'[, protocol=None[, writeback=False]]])
 
    Open a persistent dictionary.  The filename specified is the base filename for
    the underlying database.  As a side-effect, an extension may be added to the

Modified: doctools/trunk/Doc-3k/library/shlex.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/shlex.rst	(original)
+++ doctools/trunk/Doc-3k/library/shlex.rst	Sun Aug  5 00:45:13 2007
@@ -29,8 +29,8 @@
    Split the string *s* using shell-like syntax. If *comments* is :const:`False`
    (the default), the parsing of comments in the given string will be disabled
    (setting the :attr:`commenters` member of the :class:`shlex` instance to the
-   empty string).  This function operates in POSIX mode by default, but uses non-
-   POSIX mode if the *posix* argument is false.
+   empty string).  This function operates in POSIX mode by default, but uses
+   non-POSIX mode if the *posix* argument is false.
 
    .. versionadded:: 2.3
 
@@ -292,7 +292,7 @@
   next character that follows;
 
 * Enclosing characters in quotes which are not part of :attr:`escapedquotes`
-  (e.g. ``'''``) preserve the literal value of all characters within the quotes;
+  (e.g. ``"'"``) preserve the literal value of all characters within the quotes;
 
 * Enclosing characters in quotes which are part of :attr:`escapedquotes` (e.g.
   ``'"'``) preserves the literal value of all characters within the quotes, with

Modified: doctools/trunk/Doc-3k/library/simplehttpserver.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/simplehttpserver.rst	(original)
+++ doctools/trunk/Doc-3k/library/simplehttpserver.rst	Sun Aug  5 00:45:13 2007
@@ -7,9 +7,9 @@
 .. sectionauthor:: Moshe Zadka <moshez at zadka.site.co.il>
 
 
-The :mod:`SimpleHTTPServer` module defines a request-handler class, interface-
-compatible with :class:`BaseHTTPServer.BaseHTTPRequestHandler`, that serves
-files only from a base directory.
+The :mod:`SimpleHTTPServer` module defines a request-handler class,
+interface-compatible with :class:`BaseHTTPServer.BaseHTTPRequestHandler`, that
+serves files only from a base directory.
 
 The :mod:`SimpleHTTPServer` module defines the following class:
 

Modified: doctools/trunk/Doc-3k/library/simplexmlrpcserver.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/simplexmlrpcserver.rst	(original)
+++ doctools/trunk/Doc-3k/library/simplexmlrpcserver.rst	Sun Aug  5 00:45:13 2007
@@ -10,8 +10,8 @@
 
 .. versionadded:: 2.2
 
-The :mod:`SimpleXMLRPCServer` module provides a basic server framework for XML-
-RPC servers written in Python.  Servers can either be free standing, using
+The :mod:`SimpleXMLRPCServer` module provides a basic server framework for
+XML-RPC servers written in Python.  Servers can either be free standing, using
 :class:`SimpleXMLRPCServer`, or embedded in a CGI environment, using
 :class:`CGIXMLRPCRequestHandler`.
 

Modified: doctools/trunk/Doc-3k/library/site.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/site.rst	(original)
+++ doctools/trunk/Doc-3k/library/site.rst	Sun Aug  5 00:45:13 2007
@@ -42,10 +42,10 @@
    triple: path; configuration; file
 
 For example, suppose ``sys.prefix`` and ``sys.exec_prefix`` are set to
-:file:`/usr/local`.  The Python |release| library is then installed in
-:file:`/usr/local/lib/python|version|` (where only the first three characters of
+:file:`/usr/local`.  The Python X.Y library is then installed in
+:file:`/usr/local/lib/python{X.Y}` (where only the first three characters of
 ``sys.version`` are used to form the installation path name).  Suppose this has
-a subdirectory :file:`/usr/local/lib/python|version|/site-packages` with three
+a subdirectory :file:`/usr/local/lib/python{X.Y}/site-packages` with three
 subsubdirectories, :file:`foo`, :file:`bar` and :file:`spam`, and two path
 configuration files, :file:`foo.pth` and :file:`bar.pth`.  Assume
 :file:`foo.pth` contains the following::

Modified: doctools/trunk/Doc-3k/library/socket.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/socket.rst	(original)
+++ doctools/trunk/Doc-3k/library/socket.rst	Sun Aug  5 00:45:13 2007
@@ -686,11 +686,11 @@
 
 Some notes on socket blocking and timeouts: A socket object can be in one of
 three modes: blocking, non-blocking, or timeout.  Sockets are always created in
-blocking mode.  In blocking mode, operations block until complete.  In non-
-blocking mode, operations fail (with an error that is unfortunately system-
-dependent) if they cannot be completed immediately.  In timeout mode, operations
-fail if they cannot be completed within the timeout specified for the socket.
-The :meth:`setblocking` method is simply a shorthand for certain
+blocking mode.  In blocking mode, operations block until complete.  In
+non-blocking mode, operations fail (with an error that is unfortunately
+system-dependent) if they cannot be completed immediately.  In timeout mode,
+operations fail if they cannot be completed within the timeout specified for the
+socket.  The :meth:`setblocking` method is simply a shorthand for certain
 :meth:`settimeout` calls.
 
 Timeout mode internally sets the socket in non-blocking mode.  The blocking and

Modified: doctools/trunk/Doc-3k/library/socketserver.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/socketserver.rst	(original)
+++ doctools/trunk/Doc-3k/library/socketserver.rst	Sun Aug  5 00:45:13 2007
@@ -13,8 +13,9 @@
 server.  :class:`UDPServer` uses datagrams, which are discrete packets of
 information that may arrive out of order or be lost while in transit.  The more
 infrequently used :class:`UnixStreamServer` and :class:`UnixDatagramServer`
-classes are similar, but use Unix domain sockets; they're not available on non-
-Unix platforms.  For more details on network programming, consult a book such as
+classes are similar, but use Unix domain sockets; they're not available on
+non-Unix platforms.  For more details on network programming, consult a book
+such as
 W. Richard Steven's UNIX Network Programming or Ralph Davis's Win32 Network
 Programming.
 

Modified: doctools/trunk/Doc-3k/library/sqlite3.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/sqlite3.rst	(original)
+++ doctools/trunk/Doc-3k/library/sqlite3.rst	Sun Aug  5 00:45:13 2007
@@ -324,9 +324,9 @@
    The first argument to the callback signifies what kind of operation is to be
    authorized. The second and third argument will be arguments or :const:`None`
    depending on the first argument. The 4th argument is the name of the database
-   ("main", "temp", etc.) if applicable. The 5th argument is the name of the inner-
-   most trigger or view that is responsible for the access attempt or :const:`None`
-   if this access attempt is directly from input SQL code.
+   ("main", "temp", etc.) if applicable. The 5th argument is the name of the
+   inner-most trigger or view that is responsible for the access attempt or
+   :const:`None` if this access attempt is directly from input SQL code.
 
    Please consult the SQLite documentation about the possible values for the first
    argument and the meaning of the second and third argument depending on the first
@@ -344,12 +344,12 @@
 
    .. literalinclude:: ../includes/sqlite3/row_factory.py
 
-   If returning a tuple doesn't suffice and you want name-based access to columns,
-   you should consider setting :attr:`row_factory` to the highly-optimized
-   :class:`sqlite3.Row` type. :class:`Row` provides both index-based and case-
-   insensitive name-based access to columns with almost no memory overhead. It will
-   probably be better than your own custom  dictionary-based approach or even a
-   db_row based solution.
+   If returning a tuple doesn't suffice and you want name-based access to
+   columns, you should consider setting :attr:`row_factory` to the
+   highly-optimized :class:`sqlite3.Row` type. :class:`Row` provides both
+   index-based and case-insensitive name-based access to columns with almost no
+   memory overhead. It will probably be better than your own custom
+   dictionary-based approach or even a db_row based solution.
 
    .. % XXX what's a db_row-based solution?
 

Modified: doctools/trunk/Doc-3k/library/stdtypes.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/stdtypes.rst	(original)
+++ doctools/trunk/Doc-3k/library/stdtypes.rst	Sun Aug  5 00:45:13 2007
@@ -432,12 +432,13 @@
 .. method:: container.__iter__()
 
    Return an iterator object.  The object is required to support the iterator
-   protocol described below.  If a container supports different types of iteration,
-   additional methods can be provided to specifically request iterators for those
-   iteration types.  (An example of an object supporting multiple forms of
-   iteration would be a tree structure which supports both breadth-first and depth-
-   first traversal.)  This method corresponds to the :attr:`tp_iter` slot of the
-   type structure for Python objects in the Python/C API.
+   protocol described below.  If a container supports different types of
+   iteration, additional methods can be provided to specifically request
+   iterators for those iteration types.  (An example of an object supporting
+   multiple forms of iteration would be a tree structure which supports both
+   breadth-first and depth-first traversal.)  This method corresponds to the
+   :attr:`tp_iter` slot of the type structure for Python objects in the Python/C
+   API.
 
 The iterator objects themselves are required to support the following two
 methods, which together form the :dfn:`iterator protocol`:
@@ -1177,9 +1178,9 @@
 Notes:
 
 (1)
-   The alternate form causes a leading zero (``'0'``) to be inserted between left-
-   hand padding and the formatting of the number if the leading character of the
-   result is not already a zero.
+   The alternate form causes a leading zero (``'0'``) to be inserted between
+   left-hand padding and the formatting of the number if the leading character
+   of the result is not already a zero.
 
 (2)
    The alternate form causes a leading ``'0x'`` or ``'0X'`` (depending on whether
@@ -1287,13 +1288,13 @@
 | ``s.count(x)``               | return number of *i*'s for     |                     |
 |                              | which ``s[i] == x``            |                     |
 +------------------------------+--------------------------------+---------------------+
-| ``s.index(x[, *i*[, *j*]])`` | return smallest *k* such that  | \(4)                |
+| ``s.index(x[, i[, j]])``     | return smallest *k* such that  | \(4)                |
 |                              | ``s[k] == x`` and ``i <= k <   |                     |
 |                              | j``                            |                     |
 +------------------------------+--------------------------------+---------------------+
 | ``s.insert(i, x)``           | same as ``s[i:i] = [x]``       | \(5)                |
 +------------------------------+--------------------------------+---------------------+
-| ``s.pop([*i*])``             | same as ``x = s[i]; del s[i];  | \(6)                |
+| ``s.pop([i])``               | same as ``x = s[i]; del s[i];  | \(6)                |
 |                              | return x``                     |                     |
 +------------------------------+--------------------------------+---------------------+
 | ``s.remove(x)``              | same as ``del s[s.index(x)]``  | \(4)                |
@@ -1301,8 +1302,8 @@
 | ``s.reverse()``              | reverses the items of *s* in   | \(7)                |
 |                              | place                          |                     |
 +------------------------------+--------------------------------+---------------------+
-| ``s.sort([*cmp*[, *key*[,    | sort the items of *s* in place | (7), (8), (9), (10) |
-| *reverse*]]])``              |                                |                     |
+| ``s.sort([cmp[, key[,        | sort the items of *s* in place | (7), (8), (9), (10) |
+| reverse]]])``                |                                |                     |
 +------------------------------+--------------------------------+---------------------+
 
 .. index::
@@ -1614,23 +1615,23 @@
 +--------------------------------+---------------------------------+-----------+
 | ``a.keys()``                   | a copy of *a*'s list of keys    | \(3)      |
 +--------------------------------+---------------------------------+-----------+
-| ``a.update([*b*])``            | updates *a* with key/value      | \(9)      |
+| ``a.update([b])``              | updates *a* with key/value      | \(9)      |
 |                                | pairs from *b*, overwriting     |           |
 |                                | existing keys, returns ``None`` |           |
 +--------------------------------+---------------------------------+-----------+
-| ``a.fromkeys(seq[, *value*])`` | Creates a new dictionary with   | \(7)      |
+| ``a.fromkeys(seq[, value])``   | Creates a new dictionary with   | \(7)      |
 |                                | keys from *seq* and values set  |           |
 |                                | to *value*                      |           |
 +--------------------------------+---------------------------------+-----------+
 | ``a.values()``                 | a copy of *a*'s list of values  | \(3)      |
 +--------------------------------+---------------------------------+-----------+
-| ``a.get(k[, *x*])``            | ``a[k]`` if ``k in a``, else    | \(4)      |
+| ``a.get(k[, x])``              | ``a[k]`` if ``k in a``, else    | \(4)      |
 |                                | *x*                             |           |
 +--------------------------------+---------------------------------+-----------+
-| ``a.setdefault(k[, *x*])``     | ``a[k]`` if ``k in a``, else    | \(5)      |
+| ``a.setdefault(k[, x])``       | ``a[k]`` if ``k in a``, else    | \(5)      |
 |                                | *x* (also setting it)           |           |
 +--------------------------------+---------------------------------+-----------+
-| ``a.pop(k[, *x*])``            | ``a[k]`` if ``k in a``, else    | \(8)      |
+| ``a.pop(k[, x])``              | ``a[k]`` if ``k in a``, else    | \(8)      |
 |                                | *x* (and remove k)              |           |
 +--------------------------------+---------------------------------+-----------+
 | ``a.popitem()``                | remove and return an arbitrary  | \(6)      |
@@ -1705,13 +1706,13 @@
 
 (10)
    If a subclass of dict defines a method :meth:`__missing__`, if the key *k* is
-   not present, the *a*[*k*] operation calls that method with the key *k* as
-   argument.  The *a*[*k*] operation then returns or raises whatever is returned or
-   raised by the :func:`__missing__`\ (*k*) call if the key is not present. No
-   other operations or methods invoke :meth:`__missing__`\ (). If
-   :meth:`__missing__` is not defined, :exc:`KeyError` is raised.
-   :meth:`__missing__` must be a method; it cannot be an instance variable. For an
-   example, see :mod:`collections`.\ :class:`defaultdict`.
+   not present, the ``a[k]`` operation calls that method with the key *k* as
+   argument.  The ``a[k]`` operation then returns or raises whatever is returned
+   or raised by the ``__missing__(k)`` call if the key is not present. No other
+   operations or methods invoke :meth:`__missing__`. If :meth:`__missing__` is
+   not defined, :exc:`KeyError` is raised.  :meth:`__missing__` must be a
+   method; it cannot be an instance variable. For an example, see
+   :class:`collections.defaultdict`.
 
    .. versionadded:: 2.5
 
@@ -1777,8 +1778,8 @@
 
 .. method:: file.flush()
 
-   Flush the internal buffer, like ``stdio``'s :cfunc:`fflush`.  This may be a no-
-   op on some file-like objects.
+   Flush the internal buffer, like ``stdio``'s :cfunc:`fflush`.  This may be a
+   no-op on some file-like objects.
 
 
 .. method:: file.fileno()
@@ -1857,11 +1858,11 @@
 .. method:: file.readlines([sizehint])
 
    Read until EOF using :meth:`readline` and return a list containing the lines
-   thus read.  If the optional *sizehint* argument is present, instead of reading
-   up to EOF, whole lines totalling approximately *sizehint* bytes (possibly after
-   rounding up to an internal buffer size) are read.  Objects implementing a file-
-   like interface may choose to ignore *sizehint* if it cannot be implemented, or
-   cannot be implemented efficiently.
+   thus read.  If the optional *sizehint* argument is present, instead of
+   reading up to EOF, whole lines totalling approximately *sizehint* bytes
+   (possibly after rounding up to an internal buffer size) are read.  Objects
+   implementing a file-like interface may choose to ignore *sizehint* if it
+   cannot be implemented, or cannot be implemented efficiently.
 
 
 .. method:: file.seek(offset[, whence])
@@ -1880,9 +1881,8 @@
 
    Note that not all file objects are seekable.
 
-   .. versionchanged:: Passing float values as offset has been deprecated
-
-   [2.6]
+   .. versionchanged:: 2.6
+      Passing float values as offset has been deprecated
 
 
 .. method:: file.tell()
@@ -1960,9 +1960,9 @@
 .. attribute:: file.name
 
    If the file object was created using :func:`open`, the name of the file.
-   Otherwise, some string that indicates the source of the file object, of the form
-   ``<...>``.  This is a read-only attribute and may not be present on all file-
-   like objects.
+   Otherwise, some string that indicates the source of the file object, of the
+   form ``<...>``.  This is a read-only attribute and may not be present on all
+   file-like objects.
 
 
 .. attribute:: file.newlines
@@ -2015,7 +2015,7 @@
 to be provided for a context manager object to define a runtime context:
 
 
-.. method:: context manager.__enter__()
+.. method:: contextmanager.__enter__()
 
    Enter the runtime context and return either this object or another object
    related to the runtime context. The value returned by this method is bound to
@@ -2034,7 +2034,7 @@
    :keyword:`with` statement.
 
 
-.. method:: context manager.__exit__(exc_type, exc_val, exc_tb)
+.. method:: contextmanager.__exit__(exc_type, exc_val, exc_tb)
 
    Exit the runtime context and return a Boolean flag indicating if any expection
    that occurred should be suppressed. If an exception occurred while executing the
@@ -2103,7 +2103,7 @@
 
 Modules built into the interpreter are written like this: ``<module 'sys'
 (built-in)>``.  If loaded from a file, they are written as ``<module 'os' from
-'/usr/local/lib/python|version|/os.pyc'>``.
+'/usr/local/lib/pythonX.Y/os.pyc'>``.
 
 
 .. _typesobjects:
@@ -2124,9 +2124,9 @@
 Function objects are created by function definitions.  The only operation on a
 function object is to call it: ``func(argument-list)``.
 
-There are really two flavors of function objects: built-in functions and user-
-defined functions.  Both support the same operation (to call the function), but
-the implementation is different, hence the different object types.
+There are really two flavors of function objects: built-in functions and
+user-defined functions.  Both support the same operation (to call the function),
+but the implementation is different, hence the different object types.
 
 See :ref:`function` for more information.
 

Modified: doctools/trunk/Doc-3k/library/string.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/string.rst	(original)
+++ doctools/trunk/Doc-3k/library/string.rst	Sun Aug  5 00:45:13 2007
@@ -109,13 +109,13 @@
 * ``$$`` is an escape; it is replaced with a single ``$``.
 
 * ``$identifier`` names a substitution placeholder matching a mapping key of
-  "identifier".  By default, "identifier" must spell a Python identifier.  The
-  first non-identifier character after the ``$`` character terminates this
-  placeholder specification.
+  ``"identifier"``.  By default, ``"identifier"`` must spell a Python
+  identifier.  The first non-identifier character after the ``$`` character
+  terminates this placeholder specification.
 
 * ``${identifier}`` is equivalent to ``$identifier``.  It is required when valid
   identifier characters follow the placeholder but are not part of the
-  placeholder, such as "${noun}ification".
+  placeholder, such as ``"${noun}ification"``.
 
 Any other appearance of ``$`` in the string will result in a :exc:`ValueError`
 being raised.
@@ -190,9 +190,10 @@
   expression, as the implementation will call :meth:`re.escape` on this string as
   needed.
 
-* *idpattern* -- This is the regular expression describing the pattern for non-
-  braced placeholders (the braces will be added automatically as appropriate).
-  The default value is the regular expression ``[_a-z][_a-z0-9]*``.
+* *idpattern* -- This is the regular expression describing the pattern for
+  non-braced placeholders (the braces will be added automatically as
+  appropriate).  The default value is the regular expression
+  ``[_a-z][_a-z0-9]*``.
 
 Alternatively, you can provide the entire regular expression pattern by
 overriding the class attribute *pattern*.  If you do this, the value must be a

Modified: doctools/trunk/Doc-3k/library/stringprep.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/stringprep.rst	(original)
+++ doctools/trunk/Doc-3k/library/stringprep.rst	Sun Aug  5 00:45:13 2007
@@ -50,14 +50,14 @@
 
 .. function:: map_table_b2(code)
 
-   Return the mapped value for *code* according to tableB.2  (Mapping for case-
-   folding used with NFKC).
+   Return the mapped value for *code* according to tableB.2 (Mapping for
+   case-folding used with NFKC).
 
 
 .. function:: map_table_b3(code)
 
-   Return the mapped value for *code* according to tableB.3  (Mapping for case-
-   folding used with no normalization).
+   Return the mapped value for *code* according to tableB.3 (Mapping for
+   case-folding used with no normalization).
 
 
 .. function:: in_table_c11(code)

Modified: doctools/trunk/Doc-3k/library/struct.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/struct.rst	(original)
+++ doctools/trunk/Doc-3k/library/struct.rst	Sun Aug  5 00:45:13 2007
@@ -48,7 +48,7 @@
    (``len(string)`` must equal ``calcsize(fmt)``).
 
 
-.. function:: unpack_from(fmt, buffer[,offset ``= 0``])
+.. function:: unpack_from(fmt, buffer[,offset=0])
 
    Unpack the *buffer* according to tthe given format. The result is a tuple even
    if it contains exactly one item. The *buffer* must contain at least the amount
@@ -280,7 +280,7 @@
    (``len(string)`` must equal :attr:`self.size`).
 
 
-.. method:: Struct.unpack_from(buffer[,offset ``= 0``])
+.. method:: Struct.unpack_from(buffer[, offset=0])
 
    Identical to the :func:`unpack_from` function, using the compiled format.
    (``len(buffer[offset:])`` must be at least :attr:`self.size`).

Modified: doctools/trunk/Doc-3k/library/sys.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/sys.rst	(original)
+++ doctools/trunk/Doc-3k/library/sys.rst	Sun Aug  5 00:45:13 2007
@@ -23,8 +23,8 @@
 .. data:: byteorder
 
    An indicator of the native byte order.  This will have the value ``'big'`` on
-   big-endian (most-significant byte first) platforms, and ``'little'`` on little-
-   endian (least-significant byte first) platforms.
+   big-endian (most-significant byte first) platforms, and ``'little'`` on
+   little-endian (least-significant byte first) platforms.
 
    .. versionadded:: 2.0
 
@@ -217,14 +217,14 @@
    file names, or ``None`` if the system default encoding is used. The result value
    depends on the operating system:
 
-* On Windows 9x, the encoding is "mbcs".
+   * On Windows 9x, the encoding is "mbcs".
 
-* On Mac OS X, the encoding is "utf-8".
+   * On Mac OS X, the encoding is "utf-8".
 
-* On Unix, the encoding is the user's preference according to the result of
+   * On Unix, the encoding is the user's preference according to the result of
      nl_langinfo(CODESET), or :const:`None` if the ``nl_langinfo(CODESET)`` failed.
 
-* On Windows NT+, file names are Unicode natively, so no conversion is
+   * On Windows NT+, file names are Unicode natively, so no conversion is
      performed. :func:`getfilesystemencoding` still returns ``'mbcs'``, as this is
      the encoding that applications should use when they explicitly want to convert
      Unicode strings to byte strings that are equivalent when used as file names.
@@ -335,8 +335,9 @@
    more information.)
 
    The meaning of the variables is the same as that of the return values from
-   :func:`exc_info` above.  (Since there is only one interactive thread, thread-
-   safety is not a concern for these variables, unlike for ``exc_type`` etc.)
+   :func:`exc_info` above.  (Since there is only one interactive thread,
+   thread-safety is not a concern for these variables, unlike for ``exc_type``
+   etc.)
 
 
 .. data:: maxint

Modified: doctools/trunk/Doc-3k/library/tempfile.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/tempfile.rst	(original)
+++ doctools/trunk/Doc-3k/library/tempfile.rst	Sun Aug  5 00:45:13 2007
@@ -32,7 +32,7 @@
 The module defines the following user-callable functions:
 
 
-.. function:: TemporaryFile([mode=``'w+b'``[, bufsize=``-1``[, suffix[, prefix[, dir]]]]])
+.. function:: TemporaryFile([mode='w+b'[, bufsize=-1[, suffix[, prefix[, dir]]]]])
 
    Return a file (or file-like) object that can be used as a temporary storage
    area.  The file is created using :func:`mkstemp`. It will be destroyed as soon
@@ -50,7 +50,7 @@
    The *dir*, *prefix* and *suffix* parameters are passed to :func:`mkstemp`.
 
 
-.. function:: NamedTemporaryFile([mode=``'w+b'``[, bufsize=``-1``[, suffix[, prefix[, dir[, delete]]]]]])
+.. function:: NamedTemporaryFile([mode='w+b'[, bufsize=-1[, suffix[, prefix[, dir[, delete]]]]]])
 
    This function operates exactly as :func:`TemporaryFile` does, except that the
    file is guaranteed to have a visible name in the file system (on Unix, the
@@ -66,7 +66,7 @@
       The *delete* parameter.
 
 
-.. function:: SpooledTemporaryFile([max_size=``0``, [mode=``'w+b'``[, bufsize=``-1``[, suffix[, prefix[, dir]]]]]])
+.. function:: SpooledTemporaryFile([max_size=0, [mode='w+b'[, bufsize=-1[, suffix[, prefix[, dir]]]]]])
 
    This function operates exactly as :func:`TemporaryFile` does, except that data
    is spooled in memory until the file size exceeds *max_size*, or until the file's
@@ -98,13 +98,13 @@
    If *prefix* is specified, the file name will begin with that prefix; otherwise,
    a default prefix is used.
 
-   If *dir* is specified, the file will be created in that directory; otherwise, a
-   default directory is used.  The default directory is chosen from a platform-
-   dependent list, but the user of the application can control the directory
-   location by setting the *TMPDIR*, *TEMP* or *TMP* environment variables.  There
-   is thus no guarantee that the generated filename will have any nice properties,
-   such as not requiring quoting when passed to external commands via
-   ``os.popen()``.
+   If *dir* is specified, the file will be created in that directory; otherwise,
+   a default directory is used.  The default directory is chosen from a
+   platform-dependent list, but the user of the application can control the
+   directory location by setting the *TMPDIR*, *TEMP* or *TMP* environment
+   variables.  There is thus no guarantee that the generated filename will have
+   any nice properties, such as not requiring quoting when passed to external
+   commands via ``os.popen()``.
 
    If *text* is specified, it indicates whether to open the file in binary mode
    (the default) or text mode.  On some platforms, this makes no difference.
@@ -162,24 +162,24 @@
    Python searches a standard list of directories and sets *tempdir* to the first
    one which the calling user can create files in.  The list is:
 
-#. The directory named by the :envvar:`TMPDIR` environment variable.
+   #. The directory named by the :envvar:`TMPDIR` environment variable.
 
-#. The directory named by the :envvar:`TEMP` environment variable.
+   #. The directory named by the :envvar:`TEMP` environment variable.
 
-#. The directory named by the :envvar:`TMP` environment variable.
+   #. The directory named by the :envvar:`TMP` environment variable.
 
-#. A platform-specific location:
+   #. A platform-specific location:
 
-* On RiscOS, the directory named by the :envvar:`Wimp$ScrapDir` environment
+      * On RiscOS, the directory named by the :envvar:`Wimp$ScrapDir` environment
         variable.
 
-* On Windows, the directories :file:`C:$\\TEMP`, :file:`C:$\\TMP`,
+      * On Windows, the directories :file:`C:$\\TEMP`, :file:`C:$\\TMP`,
         :file:`\\TEMP`, and :file:`\\TMP`, in that order.
 
-* On all other platforms, the directories :file:`/tmp`, :file:`/var/tmp`, and
+      * On all other platforms, the directories :file:`/tmp`, :file:`/var/tmp`, and
         :file:`/usr/tmp`, in that order.
 
-#. As a last resort, the current working directory.
+   #. As a last resort, the current working directory.
 
 
 .. function:: gettempdir()

Modified: doctools/trunk/Doc-3k/library/termios.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/termios.rst	(original)
+++ doctools/trunk/Doc-3k/library/termios.rst	Sun Aug  5 00:45:13 2007
@@ -31,12 +31,12 @@
 .. function:: tcgetattr(fd)
 
    Return a list containing the tty attributes for file descriptor *fd*, as
-   follows: ``[``*iflag*, *oflag*, *cflag*, *lflag*, *ispeed*, *ospeed*, *cc*``]``
-   where *cc* is a list of the tty special characters (each a string of length 1,
-   except the items with indices :const:`VMIN` and :const:`VTIME`, which are
-   integers when these fields are defined).  The interpretation of the flags and
-   the speeds as well as the indexing in the *cc* array must be done using the
-   symbolic constants defined in the :mod:`termios` module.
+   follows: ``[iflag, oflag, cflag, lflag, ispeed, ospeed, cc]`` where *cc* is a
+   list of the tty special characters (each a string of length 1, except the
+   items with indices :const:`VMIN` and :const:`VTIME`, which are integers when
+   these fields are defined).  The interpretation of the flags and the speeds as
+   well as the indexing in the *cc* array must be done using the symbolic
+   constants defined in the :mod:`termios` module.
 
 
 .. function:: tcsetattr(fd, when, attributes)

Modified: doctools/trunk/Doc-3k/library/textwrap.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/textwrap.rst	(original)
+++ doctools/trunk/Doc-3k/library/textwrap.rst	Sun Aug  5 00:45:13 2007
@@ -147,7 +147,7 @@
    This is generally desired for text in a monospaced font.  However, the sentence
    detection algorithm is imperfect: it assumes that a sentence ending consists of
    a lowercase letter followed by one of ``'.'``, ``'!'``, or ``'?'``, possibly
-   followed by one of ``'"'`` or ``'''``, followed by a space.  One problem with
+   followed by one of ``'"'`` or ``"'"``, followed by a space.  One problem with
    this is algorithm is that it is unable to detect the difference between "Dr." in
    ::
 
@@ -160,9 +160,9 @@
    :attr:`fix_sentence_endings` is false by default.
 
    Since the sentence detection algorithm relies on ``string.lowercase`` for the
-   definition of "lowercase letter," and a convention of using two spaces after a
-   period to separate sentences on the same line, it is specific to English-
-   language texts.
+   definition of "lowercase letter," and a convention of using two spaces after
+   a period to separate sentences on the same line, it is specific to
+   English-language texts.
 
 
 .. attribute:: TextWrapper.break_long_words
@@ -173,8 +173,8 @@
    (Long words will be put on a line by themselves, in order to minimize the amount
    by which :attr:`width` is exceeded.)
 
-:class:`TextWrapper` also provides two public methods, analogous to the module-
-level convenience functions:
+:class:`TextWrapper` also provides two public methods, analogous to the
+module-level convenience functions:
 
 
 .. method:: TextWrapper.wrap(text)

Modified: doctools/trunk/Doc-3k/library/threading.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/threading.rst	(original)
+++ doctools/trunk/Doc-3k/library/threading.rst	Sun Aug  5 00:45:13 2007
@@ -197,7 +197,7 @@
 All methods are executed atomically.
 
 
-.. method:: Lock.acquire([blocking\ ``= 1``])
+.. method:: Lock.acquire([blocking=1])
 
    Acquire a lock, blocking or non-blocking.
 
@@ -244,7 +244,7 @@
 :meth:`acquire` to proceed.
 
 
-.. method:: RLock.acquire([blocking\ ``= 1``])
+.. method:: RLock.acquire([blocking=1])
 
    Acquire a lock, blocking or non-blocking.
 

Modified: doctools/trunk/Doc-3k/library/timeit.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/timeit.rst	(original)
+++ doctools/trunk/Doc-3k/library/timeit.rst	Sun Aug  5 00:45:13 2007
@@ -20,7 +20,7 @@
 The module defines the following public class:
 
 
-.. class:: Timer([stmt=``'pass'`` [, setup=``'pass'`` [, timer=<timer function>]]])
+.. class:: Timer([stmt='pass' [, setup='pass' [, timer=<timer function>]]])
 
    Class for timing execution speed of small code snippets.
 
@@ -40,7 +40,7 @@
       larger in this case because of the extra function calls.
 
 
-.. method:: Timer.print_exc([file=:const:`None`])
+.. method:: Timer.print_exc([file=None])
 
    Helper to print a traceback from the timed code.
 
@@ -57,7 +57,7 @@
    traceback is sent; it defaults to ``sys.stderr``.
 
 
-.. method:: Timer.repeat([repeat\ ``=3`` [, number\ ``=1000000``]])
+.. method:: Timer.repeat([repeat=3 [, number=1000000]])
 
    Call :meth:`timeit` a few times.
 
@@ -78,7 +78,7 @@
       and apply common sense rather than statistics.
 
 
-.. method:: Timer.timeit([number\ ``=1000000``])
+.. method:: Timer.timeit([number=1000000])
 
    Time *number* executions of the main statement. This executes the setup
    statement once, and then returns the time it takes to execute the main statement
@@ -99,7 +99,7 @@
 Starting with version 2.6, the module also defines two convenience functions:
 
 
-.. function:: repeat(stmt[, setup[, timer[, repeat\ ``=3`` [, number\ ``=1000000``]]]])
+.. function:: repeat(stmt[, setup[, timer[, repeat=3 [, number=1000000]]]])
 
    Create a :class:`Timer` instance with the given statement, setup code and timer
    function and run its :meth:`repeat` method with the given repeat count and
@@ -108,7 +108,7 @@
    .. versionadded:: 2.6
 
 
-.. function:: timeit(stmt[, setup[, timer[, number\ ``=1000000``]]])
+.. function:: timeit(stmt[, setup[, timer[, number=1000000]]])
 
    Create a :class:`Timer` instance with the given statement, setup code and timer
    function and run its :meth:`timeit` method with *number* executions.

Modified: doctools/trunk/Doc-3k/library/tix.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/tix.rst	(original)
+++ doctools/trunk/Doc-3k/library/tix.rst	Sun Aug  5 00:45:13 2007
@@ -263,10 +263,10 @@
 
 .. class:: DirSelectBox()
 
-   The :class:`DirSelectBox` is similar to the standard Motif(TM) directory-
-   selection box. It is generally used for the user to choose a directory.
-   DirSelectBox stores the directories mostly recently selected into a ComboBox
-   widget so that they can be quickly selected again.
+   The :class:`DirSelectBox` is similar to the standard Motif(TM)
+   directory-selection box. It is generally used for the user to choose a
+   directory.  DirSelectBox stores the directories mostly recently selected into
+   a ComboBox widget so that they can be quickly selected again.
 
 
 .. class:: ExFileSelectBox()

Modified: doctools/trunk/Doc-3k/library/tkinter.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/tkinter.rst	(original)
+++ doctools/trunk/Doc-3k/library/tkinter.rst	Sun Aug  5 00:45:13 2007
@@ -798,21 +798,21 @@
    Some options and methods for menus manipulate specific menu entries. Anytime a
    menu index is needed for an option or a parameter, you may pass in:
 
-* an integer which refers to the numeric position of the entry in the widget,
+   * an integer which refers to the numeric position of the entry in the widget,
      counted from the top, starting with 0;
 
-* the string ``'active'``, which refers to the menu position that is currently
+   * the string ``'active'``, which refers to the menu position that is currently
      under the cursor;
 
-* the string ``"last"`` which refers to the last menu item;
+   * the string ``"last"`` which refers to the last menu item;
 
-* An integer preceded by ``@``, as in ``@6``, where the integer is interpreted
+   * An integer preceded by ``@``, as in ``@6``, where the integer is interpreted
      as a y pixel coordinate in the menu's coordinate system;
 
-* the string ``"none"``, which indicates no menu entry at all, most often used
+   * the string ``"none"``, which indicates no menu entry at all, most often used
      with menu.activate() to deactivate all entries, and finally,
 
-* a text string that is pattern matched against the label of the menu entry, as
+   * a text string that is pattern matched against the label of the menu entry, as
      scanned from the top of the menu to the bottom.  Note that this index type is
      considered after all the others, which means that matches for menu items
      labelled ``last``, ``active``, or ``none`` may be interpreted as the above

Modified: doctools/trunk/Doc-3k/library/turtle.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/turtle.rst	(original)
+++ doctools/trunk/Doc-3k/library/turtle.rst	Sun Aug  5 00:45:13 2007
@@ -11,9 +11,9 @@
 .. sectionauthor:: Moshe Zadka <moshez at zadka.site.co.il>
 
 
-The :mod:`turtle` module provides turtle graphics primitives, in both an object-
-oriented and procedure-oriented ways. Because it uses :mod:`Tkinter` for the
-underlying graphics, it needs a version of python installed with Tk support.
+The :mod:`turtle` module provides turtle graphics primitives, in both an
+object-oriented and procedure-oriented ways. Because it uses :mod:`Tkinter` for
+the underlying graphics, it needs a version of python installed with Tk support.
 
 The procedural interface uses a pen and a canvas which are automagically created
 when any of the functions are called.
@@ -35,16 +35,16 @@
 
    Sets the size and position of the main window.  Keywords are:
 
-* ``width``: either a size in pixels or a fraction of the screen. The default is
+   * ``width``: either a size in pixels or a fraction of the screen. The default is
      50% of the screen.
 
-* ``height``: either a size in pixels or a fraction of the screen. The default
+   * ``height``: either a size in pixels or a fraction of the screen. The default
      is 50% of the screen.
 
-* ``startx``: starting position in pixels from the left edge of the screen.
+   * ``startx``: starting position in pixels from the left edge of the screen.
      ``None`` is the default value and  centers the window horizontally on screen.
 
-* ``starty``: starting position in pixels from the top edge of the screen.
+   * ``starty``: starting position in pixels from the top edge of the screen.
      ``None`` is the default value and  centers the window vertically on screen.
 
    Examples::

Modified: doctools/trunk/Doc-3k/library/urllib.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/urllib.rst	(original)
+++ doctools/trunk/Doc-3k/library/urllib.rst	Sun Aug  5 00:45:13 2007
@@ -12,10 +12,10 @@
    single: URL
 
 This module provides a high-level interface for fetching data across the World
-Wide Web.  In particular, the :func:`urlopen` function is similar to the built-
-in function :func:`open`, but accepts Universal Resource Locators (URLs) instead
-of filenames.  Some restrictions apply --- it can only open URLs for reading,
-and no seek operations are available.
+Wide Web.  In particular, the :func:`urlopen` function is similar to the
+built-in function :func:`open`, but accepts Universal Resource Locators (URLs)
+instead of filenames.  Some restrictions apply --- it can only open URLs for
+reading, and no seek operations are available.
 
 It defines the following public functions:
 
@@ -42,16 +42,16 @@
    .. index:: module: mimetools
 
    The :meth:`info` method returns an instance of the class
-   :class:`mimetools.Message` containing meta-information associated with the URL.
-   When the method is HTTP, these headers are those returned by the server at the
-   head of the retrieved HTML page (including Content-Length and Content-Type).
-   When the method is FTP, a Content-Length header will be present if (as is now
-   usual) the server passed back a file length in response to the FTP retrieval
-   request. A Content-Type header will be present if the MIME type can be guessed.
-   When the method is local-file, returned headers will include a Date representing
-   the file's last-modified time, a Content-Length giving file size, and a Content-
-   Type containing a guess at the file's type. See also the description of the
-   :mod:`mimetools` module.
+   :class:`mimetools.Message` containing meta-information associated with the
+   URL.  When the method is HTTP, these headers are those returned by the server
+   at the head of the retrieved HTML page (including Content-Length and
+   Content-Type).  When the method is FTP, a Content-Length header will be
+   present if (as is now usual) the server passed back a file length in response
+   to the FTP retrieval request. A Content-Type header will be present if the
+   MIME type can be guessed.  When the method is local-file, returned headers
+   will include a Date representing the file's last-modified time, a
+   Content-Length giving file size, and a Content-Type containing a guess at the
+   file's type. See also the description of the :mod:`mimetools` module.
 
    The :meth:`geturl` method returns the real URL of the page.  In some cases, the
    HTTP server redirects a client to another URL.  The :func:`urlopen` function

Modified: doctools/trunk/Doc-3k/library/urllib2.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/urllib2.rst	(original)
+++ doctools/trunk/Doc-3k/library/urllib2.rst	Sun Aug  5 00:45:13 2007
@@ -33,9 +33,9 @@
 
    This function returns a file-like object with two additional methods:
 
-* :meth:`geturl` --- return the URL of the resource retrieved
+   * :meth:`geturl` --- return the URL of the resource retrieved
 
-* :meth:`info` --- return the meta-information of the page, as a dictionary-like
+   * :meth:`info` --- return the meta-information of the page, as a dictionary-like
      object
 
    Raises :exc:`URLError` on errors.
@@ -87,9 +87,10 @@
 
 .. exception:: HTTPError
 
-   A subclass of :exc:`URLError`, it can also function as a  non-exceptional file-
-   like return value (the same thing that :func:`urlopen` returns).  This is useful
-   when handling exotic HTTP errors, such as requests for authentication.
+   A subclass of :exc:`URLError`, it can also function as a non-exceptional
+   file-like return value (the same thing that :func:`urlopen` returns).  This
+   is useful when handling exotic HTTP errors, such as requests for
+   authentication.
 
 The following classes are provided:
 
@@ -365,20 +366,20 @@
    are searched, and added to the possible chains (note that HTTP errors are a
    special case).
 
-* :meth:`protocol_open` --- signal that the handler knows how to open *protocol*
+   * :meth:`protocol_open` --- signal that the handler knows how to open *protocol*
      URLs.
 
-* :meth:`http_error_type` --- signal that the handler knows how to handle HTTP
+   * :meth:`http_error_type` --- signal that the handler knows how to handle HTTP
      errors with HTTP error code *type*.
 
-* :meth:`protocol_error` --- signal that the handler knows how to handle errors
+   * :meth:`protocol_error` --- signal that the handler knows how to handle errors
      from (non-\ ``http``) *protocol*.
 
-* :meth:`protocol_request` --- signal that the handler knows how to pre-process
+   * :meth:`protocol_request` --- signal that the handler knows how to pre-process
      *protocol* requests.
 
-* :meth:`protocol_response` --- signal that the handler knows how to post-
-     process *protocol* responses.
+   * :meth:`protocol_response` --- signal that the handler knows how to
+     post-process *protocol* responses.
 
 
 .. method:: OpenerDirector.open(url[, data][, timeout])

Modified: doctools/trunk/Doc-3k/library/user.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/user.rst	(original)
+++ doctools/trunk/Doc-3k/library/user.rst	Sun Aug  5 00:45:13 2007
@@ -51,8 +51,8 @@
 (The three-argument form of :func:`getattr` is used in case the user has not
 defined ``spam_verbose`` in their :file:`.pythonrc.py` file.)
 
-Programs with extensive customization needs are better off reading a program-
-specific customization file.
+Programs with extensive customization needs are better off reading a
+program-specific customization file.
 
 Programs with security or privacy concerns should *not* import this module; a
 user can easily break into a program by placing arbitrary code in the

Modified: doctools/trunk/Doc-3k/library/winsound.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/winsound.rst	(original)
+++ doctools/trunk/Doc-3k/library/winsound.rst	Sun Aug  5 00:45:13 2007
@@ -41,7 +41,7 @@
    :exc:`RuntimeError` is raised.
 
 
-.. function:: MessageBeep([type=``MB_OK``])
+.. function:: MessageBeep([type=MB_OK])
 
    Call the underlying :cfunc:`MessageBeep` function from the Platform API.  This
    plays a sound as specified in the registry.  The *type* argument specifies which

Modified: doctools/trunk/Doc-3k/library/wsgiref.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/wsgiref.rst	(original)
+++ doctools/trunk/Doc-3k/library/wsgiref.rst	Sun Aug  5 00:45:13 2007
@@ -234,7 +234,7 @@
 :mod:`wsgiref.util`.)
 
 
-.. function:: make_server(host, port, app [, server_class=WSGIServer [, handler_class=:class:`WSGIRequestHandler`]])
+.. function:: make_server(host, port, app [, server_class=WSGIServer [, handler_class=WSGIRequestHandler]])
 
    Create a new WSGI server listening on *host* and *port*, accepting connections
    for *app*.  The return value is an instance of the supplied *server_class*, and

Modified: doctools/trunk/Doc-3k/library/xml.dom.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/xml.dom.rst	(original)
+++ doctools/trunk/Doc-3k/library/xml.dom.rst	Sun Aug  5 00:45:13 2007
@@ -136,8 +136,8 @@
 .. data:: XMLNS_NAMESPACE
 
    The namespace URI for namespace declarations, as defined by `Document Object
-   Model (DOM) Level 2 Core Specification <http://www.w3.org/TR/DOM-
-   Level-2-Core/core.html>`_ (section 1.1.8).
+   Model (DOM) Level 2 Core Specification
+   <http://www.w3.org/TR/DOM-Level-2-Core/core.html>`_ (section 1.1.8).
 
    .. versionadded:: 2.2
 
@@ -281,12 +281,12 @@
 
 .. attribute:: Node.previousSibling
 
-   The node that immediately precedes this one with the same parent.  For instance
-   the element with an end-tag that comes just before the *self* element's start-
-   tag.  Of course, XML documents are made up of more than just elements so the
-   previous sibling could be text, a comment, or something else.  If this node is
-   the first child of the parent, this attribute will be ``None``. This is a read-
-   only attribute.
+   The node that immediately precedes this one with the same parent.  For
+   instance the element with an end-tag that comes just before the *self*
+   element's start-tag.  Of course, XML documents are made up of more than just
+   elements so the previous sibling could be text, a comment, or something else.
+   If this node is the first child of the parent, this attribute will be
+   ``None``. This is a read-only attribute.
 
 
 .. attribute:: Node.nextSibling

Modified: doctools/trunk/Doc-3k/library/xml.etree.elementtree.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/xml.etree.elementtree.rst	(original)
+++ doctools/trunk/Doc-3k/library/xml.etree.elementtree.rst	Sun Aug  5 00:45:13 2007
@@ -354,8 +354,8 @@
 .. method:: ElementTree.write(file[, encoding])
 
    Writes the element tree to a file, as XML. *file* is a file name, or a file
-   object opened for writing. *encoding* is the output encoding (default is US-
-   ASCII).
+   object opened for writing. *encoding* is the output encoding (default is
+   US-ASCII).
 
 
 .. _elementtree-qname-objects:

Modified: doctools/trunk/Doc-3k/library/xml.sax.handler.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/xml.sax.handler.rst	(original)
+++ doctools/trunk/Doc-3k/library/xml.sax.handler.rst	Sun Aug  5 00:45:13 2007
@@ -60,11 +60,11 @@
 
 .. data:: feature_namespace_prefixes
 
-   Value: ``"http://xml.org/sax/features/namespace-prefixes"`` ---  true: Report
-   the original prefixed names and attributes used for Namespace declarations. ---
-   false: Do not report attributes used for Namespace declarations, and optionally
-   do not report original prefixed names (default). ---  access: (parsing) read-
-   only; (not parsing) read/write
+   Value: ``"http://xml.org/sax/features/namespace-prefixes"`` --- true: Report
+   the original prefixed names and attributes used for Namespace
+   declarations. --- false: Do not report attributes used for Namespace
+   declarations, and optionally do not report original prefixed names
+   (default). --- access: (parsing) read-only; (not parsing) read/write
 
 
 .. data:: feature_string_interning
@@ -78,10 +78,10 @@
 
 .. data:: feature_validation
 
-   Value: ``"http://xml.org/sax/features/validation"`` ---  true: Report all
-   validation errors (implies external-general-entities and external-parameter-
-   entities). ---  false: Do not report validation errors. ---  access: (parsing)
-   read-only; (not parsing) read/write
+   Value: ``"http://xml.org/sax/features/validation"`` --- true: Report all
+   validation errors (implies external-general-entities and
+   external-parameter-entities). --- false: Do not report validation errors. ---
+   access: (parsing) read-only; (not parsing) read/write
 
 
 .. data:: feature_external_ges

Modified: doctools/trunk/Doc-3k/library/xml.sax.reader.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/xml.sax.reader.rst	(original)
+++ doctools/trunk/Doc-3k/library/xml.sax.reader.rst	Sun Aug  5 00:45:13 2007
@@ -288,8 +288,8 @@
 
 .. method:: InputSource.setByteStream(bytefile)
 
-   Set the byte stream (a Python file-like object which does not perform byte-to-
-   character conversion) for this input source.
+   Set the byte stream (a Python file-like object which does not perform
+   byte-to-character conversion) for this input source.
 
    The SAX parser will ignore this if there is also a character stream specified,
    but it will use a byte stream in preference to opening a URI connection itself.

Modified: doctools/trunk/Doc-3k/library/xml.sax.utils.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/xml.sax.utils.rst	(original)
+++ doctools/trunk/Doc-3k/library/xml.sax.utils.rst	Sun Aug  5 00:45:13 2007
@@ -37,13 +37,14 @@
 
 .. function:: quoteattr(data[, entities])
 
-   Similar to :func:`escape`, but also prepares *data* to be used as an attribute
-   value.  The return value is a quoted version of *data* with any additional
-   required replacements. :func:`quoteattr` will select a quote character based on
-   the content of *data*, attempting to avoid encoding any quote characters in the
-   string.  If both single- and double-quote characters are already in *data*, the
-   double-quote characters will be encoded and *data* will be wrapped in double-
-   quotes.  The resulting string can be used directly as an attribute value::
+   Similar to :func:`escape`, but also prepares *data* to be used as an
+   attribute value.  The return value is a quoted version of *data* with any
+   additional required replacements. :func:`quoteattr` will select a quote
+   character based on the content of *data*, attempting to avoid encoding any
+   quote characters in the string.  If both single- and double-quote characters
+   are already in *data*, the double-quote characters will be encoded and *data*
+   will be wrapped in double-quotes.  The resulting string can be used directly
+   as an attribute value::
 
       >>> print "<element attr=%s>" % quoteattr("ab ' cd \" ef")
       <element attr="ab ' cd &quot; ef">

Modified: doctools/trunk/Doc-3k/license.rst
==============================================================================
--- doctools/trunk/Doc-3k/license.rst	(original)
+++ doctools/trunk/Doc-3k/license.rst	Sun Aug  5 00:45:13 2007
@@ -105,7 +105,7 @@
 ============================================================
 
 
-.. centered:: **PSF LICENSE AGREEMENT FOR PYTHON |release|**
+.. centered:: **PSF LICENSE AGREEMENT FOR PYTHON** |release|
 
 #. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and
    the Individual or Organization ("Licensee") accessing and otherwise using Python

Modified: doctools/trunk/Doc-3k/maclib/using.rst
==============================================================================
--- doctools/trunk/Doc-3k/maclib/using.rst	(original)
+++ doctools/trunk/Doc-3k/maclib/using.rst	Sun Aug  5 00:45:13 2007
@@ -43,8 +43,8 @@
 
 The Apple-provided build of Python is installed in
 :file:`/System/Library/Frameworks/Python.framework` and :file:`/usr/bin/python`,
-respectively. You should never modify or delete these, as they are Apple-
-controlled and are used by Apple- or third-party software.
+respectively. You should never modify or delete these, as they are
+Apple-controlled and are used by Apple- or third-party software.
 
 IDLE includes a help menu that allows you to access Python documentation. If you
 are completely new to Python you should start reading the tutorial introduction

Modified: doctools/trunk/Doc-3k/reference/datamodel.rst
==============================================================================
--- doctools/trunk/Doc-3k/reference/datamodel.rst	(original)
+++ doctools/trunk/Doc-3k/reference/datamodel.rst	Sun Aug  5 00:45:13 2007
@@ -250,10 +250,10 @@
       single: item selection
       single: subscription
 
-   These represent finite ordered sets indexed by non-negative numbers. The built-
-   in function :func:`len` returns the number of items of a sequence. When the
-   length of a sequence is *n*, the index set contains the numbers 0, 1, ...,
-   *n*-1.  Item *i* of sequence *a* is selected by ``a[i]``.
+   These represent finite ordered sets indexed by non-negative numbers. The
+   built-in function :func:`len` returns the number of items of a sequence. When
+   the length of a sequence is *n*, the index set contains the numbers 0, 1,
+   ..., *n*-1.  Item *i* of sequence *a* is selected by ``a[i]``.
 
    .. index:: single: slicing
 
@@ -595,13 +595,13 @@
          single: im_self (method attribute)
 
       When a user-defined method object is created by retrieving a user-defined
-      function object from a class, its :attr:`im_self` attribute is ``None`` and the
-      method object is said to be unbound. When one is created by retrieving a user-
-      defined function object from a class via one of its instances, its
-      :attr:`im_self` attribute is the instance, and the method object is said to be
-      bound. In either case, the new method's :attr:`im_class` attribute is the class
-      from which the retrieval takes place, and its :attr:`im_func` attribute is the
-      original function object.
+      function object from a class, its :attr:`im_self` attribute is ``None``
+      and the method object is said to be unbound. When one is created by
+      retrieving a user-defined function object from a class via one of its
+      instances, its :attr:`im_self` attribute is the instance, and the method
+      object is said to be bound. In either case, the new method's
+      :attr:`im_class` attribute is the class from which the retrieval takes
+      place, and its :attr:`im_func` attribute is the original function object.
 
       .. index:: single: im_func (method attribute)
 
@@ -667,14 +667,14 @@
          object: function
          pair: C; language
 
-      A built-in function object is a wrapper around a C function.  Examples of built-
-      in functions are :func:`len` and :func:`math.sin` (:mod:`math` is a standard
-      built-in module). The number and type of the arguments are determined by the C
-      function. Special read-only attributes: :attr:`__doc__` is the function's
-      documentation string, or ``None`` if unavailable; :attr:`__name__` is the
-      function's name; :attr:`__self__` is set to ``None`` (but see the next item);
-      :attr:`__module__` is the name of the module the function was defined in or
-      ``None`` if unavailable.
+      A built-in function object is a wrapper around a C function.  Examples of
+      built-in functions are :func:`len` and :func:`math.sin` (:mod:`math` is a
+      standard built-in module). The number and type of the arguments are
+      determined by the C function. Special read-only attributes:
+      :attr:`__doc__` is the function's documentation string, or ``None`` if
+      unavailable; :attr:`__name__` is the function's name; :attr:`__self__` is
+      set to ``None`` (but see the next item); :attr:`__module__` is the name of
+      the module the function was defined in or ``None`` if unavailable.
 
    Built-in methods
       .. index::
@@ -753,12 +753,12 @@
    of the shared library file.
 
 Classes
-   Class objects are created by class definitions (see section :ref:`class`).
-   A class has a namespace implemented by a dictionary object. Class
-   attribute references are translated to lookups in this dictionary, e.g., ``C.x``
-   is translated to ``C.__dict__["x"]``. When the attribute name is not found
-   there, the attribute search continues in the base classes.  The search is depth-
-   first, left-to-right in the order of occurrence in the base class list.
+   Class objects are created by class definitions (see section :ref:`class`).  A
+   class has a namespace implemented by a dictionary object. Class attribute
+   references are translated to lookups in this dictionary, e.g., ``C.x`` is
+   translated to ``C.__dict__["x"]``. When the attribute name is not found
+   there, the attribute search continues in the base classes.  The search is
+   depth-first, left-to-right in the order of occurrence in the base class list.
 
    .. index::
       object: class
@@ -769,17 +769,17 @@
       object: dictionary
       pair: class; attribute
 
-   When a class attribute reference (for class :class:`C`, say) would yield a user-
-   defined function object or an unbound user-defined method object whose
+   When a class attribute reference (for class :class:`C`, say) would yield a
+   user-defined function object or an unbound user-defined method object whose
    associated class is either :class:`C` or one of its base classes, it is
    transformed into an unbound user-defined method object whose :attr:`im_class`
    attribute is :class:`C`. When it would yield a class method object, it is
-   transformed into a bound user-defined method object whose :attr:`im_class` and
-   :attr:`im_self` attributes are both :class:`C`.  When it would yield a static
-   method object, it is transformed into the object wrapped by the static method
-   object. See section :ref:`descriptors` for another way in which attributes
-   retrieved from a class may differ from those actually contained in its
-   :attr:`__dict__`.
+   transformed into a bound user-defined method object whose :attr:`im_class`
+   and :attr:`im_self` attributes are both :class:`C`.  When it would yield a
+   static method object, it is transformed into the object wrapped by the static
+   method object. See section :ref:`descriptors` for another way in which
+   attributes retrieved from a class may differ from those actually contained in
+   its :attr:`__dict__`.
 
    .. index:: triple: class; attribute; assignment
 
@@ -2036,14 +2036,14 @@
 
    These methods are called to implement the augmented arithmetic operations
    (``+=``, ``-=``, ``*=``, ``/=``, ``//=``, ``%=``, ``**=``, ``<<=``, ``>>=``,
-   ``&=``, ``^=``, ``|=``).  These methods should attempt to do the operation in-
-   place (modifying *self*) and return the result (which could be, but does not
-   have to be, *self*).  If a specific method is not defined, the augmented
+   ``&=``, ``^=``, ``|=``).  These methods should attempt to do the operation
+   in-place (modifying *self*) and return the result (which could be, but does
+   not have to be, *self*).  If a specific method is not defined, the augmented
    operation falls back to the normal methods.  For instance, to evaluate the
    expression *x*``+=``*y*, where *x* is an instance of a class that has an
-   :meth:`__iadd__` method, ``x.__iadd__(y)`` is called.  If *x* is an instance of
-   a class that does not define a :meth:`__iadd__` method, ``x.__add__(y)`` and
-   ``y.__radd__(x)`` are considered, as with the evaluation of *x*``+``*y*.
+   :meth:`__iadd__` method, ``x.__iadd__(y)`` is called.  If *x* is an instance
+   of a class that does not define a :meth:`__iadd__` method, ``x.__add__(y)``
+   and ``y.__radd__(x)`` are considered, as with the evaluation of *x*``+``*y*.
 
 
 .. method:: numeric object.__neg__(self)

Modified: doctools/trunk/Doc-3k/reference/executionmodel.rst
==============================================================================
--- doctools/trunk/Doc-3k/reference/executionmodel.rst	(original)
+++ doctools/trunk/Doc-3k/reference/executionmodel.rst	Sun Aug  5 00:45:13 2007
@@ -199,8 +199,8 @@
 
 Python uses the "termination" model of error handling: an exception handler can
 find out what happened and continue execution at an outer level, but it cannot
-repair the cause of the error and retry the failing operation (except by re-
-entering the offending piece of code from the top).
+repair the cause of the error and retry the failing operation (except by
+re-entering the offending piece of code from the top).
 
 .. index:: single: SystemExit (built-in exception)
 

Modified: doctools/trunk/Doc-3k/reference/expressions.rst
==============================================================================
--- doctools/trunk/Doc-3k/reference/expressions.rst	(original)
+++ doctools/trunk/Doc-3k/reference/expressions.rst	Sun Aug  5 00:45:13 2007
@@ -198,9 +198,9 @@
    pair: empty; list
 
 A list display yields a new list object.  Its contents are specified by
-providing either a list of expressions or a list comprehension.  When a comma-
-separated list of expressions is supplied, its elements are evaluated from left
-to right and placed into the list object in that order.  When a list
+providing either a list of expressions or a list comprehension.  When a
+comma-separated list of expressions is supplied, its elements are evaluated from
+left to right and placed into the list object in that order.  When a list
 comprehension is supplied, it consists of a single expression followed by at
 least one :keyword:`for` clause and zero or more :keyword:`for` or :keyword:`if`
 clauses.  In this case, the elements of the new list are those that would be

Modified: doctools/trunk/Doc-3k/reference/lexical_analysis.rst
==============================================================================
--- doctools/trunk/Doc-3k/reference/lexical_analysis.rst	(original)
+++ doctools/trunk/Doc-3k/reference/lexical_analysis.rst	Sun Aug  5 00:45:13 2007
@@ -456,14 +456,14 @@
 
 In plain English: String literals can be enclosed in matching single quotes
 (``'``) or double quotes (``"``).  They can also be enclosed in matching groups
-of three single or double quotes (these are generally referred to as *triple-
-quoted strings*).  The backslash (``\``) character is used to escape characters
-that otherwise have a special meaning, such as newline, backslash itself, or the
-quote character.  String literals may optionally be prefixed with a letter
-``'r'`` or ``'R'``; such strings are called :dfn:`raw strings` and use different
-rules for interpreting backslash escape sequences.  A prefix of ``'u'`` or
-``'U'`` makes the string a Unicode string.  Unicode strings use the Unicode
-character set as defined by the Unicode Consortium and ISO 10646.  Some
+of three single or double quotes (these are generally referred to as
+*triple-quoted strings*).  The backslash (``\``) character is used to escape
+characters that otherwise have a special meaning, such as newline, backslash
+itself, or the quote character.  String literals may optionally be prefixed with
+a letter ``'r'`` or ``'R'``; such strings are called :dfn:`raw strings` and use
+different rules for interpreting backslash escape sequences.  A prefix of
+``'u'`` or ``'U'`` makes the string a Unicode string.  Unicode strings use the
+Unicode character set as defined by the Unicode Consortium and ISO 10646.  Some
 additional escape sequences, described below, are available in Unicode strings.
 The two prefix characters may be combined; in this case, ``'u'`` must appear
 before ``'r'``.

Modified: doctools/trunk/Doc-3k/reference/simple_stmts.rst
==============================================================================
--- doctools/trunk/Doc-3k/reference/simple_stmts.rst	(original)
+++ doctools/trunk/Doc-3k/reference/simple_stmts.rst	Sun Aug  5 00:45:13 2007
@@ -727,11 +727,8 @@
 can appear before a future statement are:
 
 * the module docstring (if any),
-
 * comments,
-
 * blank lines, and
-
 * other future statements.
 
 The features recognized by Python 2.5 are ``absolute_import``, ``division``,

Modified: doctools/trunk/Doc-3k/tutorial/appetite.rst
==============================================================================
--- doctools/trunk/Doc-3k/tutorial/appetite.rst	(original)
+++ doctools/trunk/Doc-3k/tutorial/appetite.rst	Sun Aug  5 00:45:13 2007
@@ -5,10 +5,10 @@
 **********************
 
 If you do much work on computers, eventually you find that there's some task
-you'd like to automate.  For example, you may wish to perform a search-and-
-replace over a large number of text files, or rename and rearrange a bunch of
-photo files in a complicated way. Perhaps you'd like to write a small custom
-database, or a specialized GUI application, or a simple game.
+you'd like to automate.  For example, you may wish to perform a
+search-and-replace over a large number of text files, or rename and rearrange a
+bunch of photo files in a complicated way. Perhaps you'd like to write a small
+custom database, or a specialized GUI application, or a simple game.
 
 If you're a professional software developer, you may have to work with several
 C/C++/Java libraries but find the usual write/compile/test/re-compile cycle is

Modified: doctools/trunk/Doc-3k/tutorial/datastructures.rst
==============================================================================
--- doctools/trunk/Doc-3k/tutorial/datastructures.rst	(original)
+++ doctools/trunk/Doc-3k/tutorial/datastructures.rst	Sun Aug  5 00:45:13 2007
@@ -420,8 +420,8 @@
    >>> 'guido' in tel
    True
 
-The :func:`dict` constructor builds dictionaries directly from lists of key-
-value pairs stored as tuples.  When the pairs form a pattern, list
+The :func:`dict` constructor builds dictionaries directly from lists of
+key-value pairs stored as tuples.  When the pairs form a pattern, list
 comprehensions can compactly specify the key-value list. ::
 
    >>> dict([('sape', 4139), ('guido', 4127), ('jack', 4098)])

Modified: doctools/trunk/Doc-3k/tutorial/errors.rst
==============================================================================
--- doctools/trunk/Doc-3k/tutorial/errors.rst	(original)
+++ doctools/trunk/Doc-3k/tutorial/errors.rst	Sun Aug  5 00:45:13 2007
@@ -234,8 +234,8 @@
 fine, but there seems to be a growing stylistic preference for the latter.
 
 If you need to determine whether an exception was raised but don't intend to
-handle it, a simpler form of the :keyword:`raise` statement allows you to re-
-raise the exception::
+handle it, a simpler form of the :keyword:`raise` statement allows you to
+re-raise the exception::
 
    >>> try:
    ...     raise NameError, 'HiThere'

Modified: doctools/trunk/Doc-3k/tutorial/glossary.rst
==============================================================================
--- doctools/trunk/Doc-3k/tutorial/glossary.rst	(original)
+++ doctools/trunk/Doc-3k/tutorial/glossary.rst	Sun Aug  5 00:45:13 2007
@@ -138,13 +138,14 @@
    .. index:: single: global interpreter lock
 
 global interpreter lock
-   The lock used by Python threads to assure that only one thread can be run at a
-   time.  This simplifies Python by assuring that no two processes can access the
-   same memory at the same time.  Locking the entire interpreter makes it easier
-   for the interpreter to be multi-threaded, at the expense of some parallelism on
-   multi-processor machines.  Efforts have been made in the past to create a "free-
-   threaded" interpreter (one which locks shared data at a much finer granularity),
-   but performance suffered in the common single-processor case.
+   The lock used by Python threads to assure that only one thread can be run at
+   a time.  This simplifies Python by assuring that no two processes can access
+   the same memory at the same time.  Locking the entire interpreter makes it
+   easier for the interpreter to be multi-threaded, at the expense of some
+   parallelism on multi-processor machines.  Efforts have been made in the past
+   to create a "free-threaded" interpreter (one which locks shared data at a
+   much finer granularity), but performance suffered in the common
+   single-processor case.
 
    .. index:: single: IDLE
 

Modified: doctools/trunk/Doc-3k/tutorial/introduction.rst
==============================================================================
--- doctools/trunk/Doc-3k/tutorial/introduction.rst	(original)
+++ doctools/trunk/Doc-3k/tutorial/introduction.rst	Sun Aug  5 00:45:13 2007
@@ -429,9 +429,10 @@
 characters of Latin-1.
 
 For experts, there is also a raw mode just like the one for normal strings. You
-have to prefix the opening quote with 'ur' to have Python use the *Raw-Unicode-
-Escape* encoding. It will only apply the above ``\uXXXX`` conversion if there is
-an uneven number of backslashes in front of the small 'u'. ::
+have to prefix the opening quote with 'ur' to have Python use the
+*Raw-Unicode-Escape* encoding. It will only apply the above ``\uXXXX``
+conversion if there is an uneven number of backslashes in front of the small
+'u'. ::
 
    >>> ur'Hello\u0020World !'
    u'Hello World !'

Modified: doctools/trunk/Doc-3k/tutorial/modules.rst
==============================================================================
--- doctools/trunk/Doc-3k/tutorial/modules.rst	(original)
+++ doctools/trunk/Doc-3k/tutorial/modules.rst	Sun Aug  5 00:45:13 2007
@@ -168,9 +168,9 @@
 
 As an important speed-up of the start-up time for short programs that use a lot
 of standard modules, if a file called :file:`spam.pyc` exists in the directory
-where :file:`spam.py` is found, this is assumed to contain an already-"byte-
-compiled" version of the module :mod:`spam`. The modification time of the
-version of :file:`spam.py` used to create :file:`spam.pyc` is recorded in
+where :file:`spam.py` is found, this is assumed to contain an
+already-"byte-compiled" version of the module :mod:`spam`. The modification time
+of the version of :file:`spam.py` used to create :file:`spam.pyc` is recorded in
 :file:`spam.pyc`, and the :file:`.pyc` file is ignored if these don't match.
 
 Normally, you don't need to do anything to create the :file:`spam.pyc` file.

Modified: doctools/trunk/Doc-3k/tutorial/whatnow.rst
==============================================================================
--- doctools/trunk/Doc-3k/tutorial/whatnow.rst	(original)
+++ doctools/trunk/Doc-3k/tutorial/whatnow.rst	Sun Aug  5 00:45:13 2007
@@ -49,12 +49,12 @@
   Cookbook (O'Reilly & Associates, ISBN 0-596-00797-3.)
 
 For Python-related questions and problem reports, you can post to the newsgroup
-:newsgroup:`comp.lang.python`, or send them to the mailing list at python-
-list at python.org.  The newsgroup and mailing list are gatewayed, so messages
-posted to one will automatically be forwarded to the other.  There are around
-120 postings a day (with peaks up to several hundred), asking (and answering)
-questions, suggesting new features, and announcing new modules.  Before posting,
-be sure to check the list of `Frequently Asked Questions
+:newsgroup:`comp.lang.python`, or send them to the mailing list at
+python-list at python.org.  The newsgroup and mailing list are gatewayed, so
+messages posted to one will automatically be forwarded to the other.  There are
+around 120 postings a day (with peaks up to several hundred), asking (and
+answering) questions, suggesting new features, and announcing new modules.
+Before posting, be sure to check the list of `Frequently Asked Questions
 <http://www.python.org/doc/faq/>`_ (also called the FAQ), or look for it in the
 :file:`Misc/` directory of the Python source distribution.  Mailing list
 archives are available at http://mail.python.org/pipermail/. The FAQ answers

Modified: doctools/trunk/Doc-3k/whatsnew/2.0.rst
==============================================================================
--- doctools/trunk/Doc-3k/whatsnew/2.0.rst	(original)
+++ doctools/trunk/Doc-3k/whatsnew/2.0.rst	Sun Aug  5 00:45:13 2007
@@ -181,7 +181,7 @@
 * ``ord(u)``, where *u* is a 1-character regular or Unicode string, returns the
   number of the character as an integer.
 
-* ``unicode(string [, *encoding*]  [, *errors*] )`` creates a Unicode string
+* ``unicode(string [, encoding]  [, errors] )`` creates a Unicode string
   from an 8-bit string.  ``encoding`` is a string naming the encoding to use. The
   ``errors`` parameter specifies the treatment of characters that are invalid for
   the current encoding; passing ``'strict'`` as the value causes an exception to

Modified: doctools/trunk/Doc-3k/whatsnew/2.1.rst
==============================================================================
--- doctools/trunk/Doc-3k/whatsnew/2.1.rst	(original)
+++ doctools/trunk/Doc-3k/whatsnew/2.1.rst	Sun Aug  5 00:45:13 2007
@@ -755,12 +755,12 @@
   Wolfson, but after some python-dev discussion, a weaker final version was
   checked in.
 
-* Applying :func:`repr` to strings previously used octal escapes for non-
-  printable characters; for example, a newline was ``'\012'``.  This was a
+* Applying :func:`repr` to strings previously used octal escapes for
+  non-printable characters; for example, a newline was ``'\012'``.  This was a
   vestigial trace of Python's C ancestry, but today octal is of very little
   practical use.  Ka-Ping Yee suggested using hex escapes instead of octal ones,
-  and using the ``\n``, ``\t``, ``\r`` escapes for the appropriate characters, and
-  implemented this new formatting.
+  and using the ``\n``, ``\t``, ``\r`` escapes for the appropriate characters,
+  and implemented this new formatting.
 
 * Syntax errors detected at compile-time can now raise exceptions containing the
   filename and line number of the error, a pleasant side effect of the compiler

Modified: doctools/trunk/Doc-3k/whatsnew/2.3.rst
==============================================================================
--- doctools/trunk/Doc-3k/whatsnew/2.3.rst	(original)
+++ doctools/trunk/Doc-3k/whatsnew/2.3.rst	Sun Aug  5 00:45:13 2007
@@ -1660,12 +1660,13 @@
      >{}>{}> u"www.Alliancefrançaise.nu".encode("idna")
      'www.xn--alliancefranaise-npb.nu'
 
-  The :mod:`socket` module has also been extended to transparently convert Unicode
-  hostnames to the ACE version before passing them to the C library.  Modules that
-  deal with hostnames such as :mod:`httplib` and :mod:`ftplib`) also support
-  Unicode host names; :mod:`httplib` also sends HTTP ``Host`` headers using the
-  ACE version of the domain name.  :mod:`urllib` supports Unicode URLs with non-
-  ASCII host names as long as the ``path`` part of the URL is ASCII only.
+  The :mod:`socket` module has also been extended to transparently convert
+  Unicode hostnames to the ACE version before passing them to the C library.
+  Modules that deal with hostnames such as :mod:`httplib` and :mod:`ftplib`)
+  also support Unicode host names; :mod:`httplib` also sends HTTP ``Host``
+  headers using the ACE version of the domain name.  :mod:`urllib` supports
+  Unicode URLs with non-ASCII host names as long as the ``path`` part of the URL
+  is ASCII only.
 
   To implement this change, the :mod:`stringprep` module, the  ``mkstringprep``
   tool and the ``punycode`` encoding have been added.

Modified: doctools/trunk/Doc-3k/whatsnew/2.5.rst
==============================================================================
--- doctools/trunk/Doc-3k/whatsnew/2.5.rst	(original)
+++ doctools/trunk/Doc-3k/whatsnew/2.5.rst	Sun Aug  5 00:45:13 2007
@@ -1037,12 +1037,12 @@
   returned by the iterator evaluate as true. (Suggested by Guido van Rossum, and
   implemented by Raymond Hettinger.)
 
-* The result of a class's :meth:`__hash__` method can now  be either a long
+* The result of a class's :meth:`__hash__` method can now be either a long
   integer or a regular integer.  If a long integer is returned, the hash of that
-  value is taken.  In earlier versions the hash value was required to be a regular
-  integer, but in 2.5 the :func:`id` built-in was changed to always return non-
-  negative numbers, and users often seem to use ``id(self)`` in :meth:`__hash__`
-  methods (though this is discouraged).
+  value is taken.  In earlier versions the hash value was required to be a
+  regular integer, but in 2.5 the :func:`id` built-in was changed to always
+  return non-negative numbers, and users often seem to use ``id(self)`` in
+  :meth:`__hash__` methods (though this is discouraged).
 
   .. % Bug #1536021
 

Modified: doctools/trunk/sphinx/directives.py
==============================================================================
--- doctools/trunk/sphinx/directives.py	(original)
+++ doctools/trunk/sphinx/directives.py	Sun Aug  5 00:45:13 2007
@@ -154,7 +154,6 @@
     signode += addnodes.desc_parameterlist()
 
     stack = [signode[-1]]
-    arglist = arglist.replace('`', '').replace(r'\ ', '') # remove markup
     for token in py_paramlist_re.split(arglist):
         if token == '[':
             opt = addnodes.desc_optional()
@@ -394,7 +393,7 @@
 def seealso_directive(name, arguments, options, content, lineno,
                       content_offset, block_text, state, state_machine):
     rv = admonitions.make_admonition(
-        addnodes.seealso, name, ['See also:'], options, content,
+        addnodes.seealso, name, ['See also'], options, content,
         lineno, content_offset, block_text, state, state_machine)
     return rv
 
