Merged revisions 74062 via svnmerge from

svn+ssh://svn.python.org/python/branches/py3k

................
  r74062 | alexandre.vassalotti | 2009-07-17 13:43:26 +0200 (Fr, 17 Jul 2009) | 37 lines

  Merged revisions 73665,73693,73704-73705,73707,73712-73713,73824 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r73665 | alexandre.vassalotti | 2009-06-28 21:01:51 -0400 (Sun, 28 Jun 2009) | 2 lines

    Update docstrings for sys.getdlopenflags() and sys.setdlopenflags().
  ........
    r73693 | jesse.noller | 2009-06-29 14:20:34 -0400 (Mon, 29 Jun 2009) | 1 line

    Bug 5906: add a documentation note for unix daemons vs. multiprocessing daemons
  ........
    r73704 | georg.brandl | 2009-06-30 12:15:43 -0400 (Tue, 30 Jun 2009) | 1 line

    #6376: fix copy-n-paste oversight.
  ........
    r73705 | georg.brandl | 2009-06-30 12:17:28 -0400 (Tue, 30 Jun 2009) | 1 line

    #6374: add a bit of explanation about shell=True on Windows.
  ........
    r73707 | georg.brandl | 2009-06-30 12:35:11 -0400 (Tue, 30 Jun 2009) | 1 line

    #6371: fix link targets.
  ........
    r73712 | ezio.melotti | 2009-06-30 18:51:06 -0400 (Tue, 30 Jun 2009) | 1 line

    Fixed defaultTestCase -> defaultTestResult
  ........
    r73713 | ezio.melotti | 2009-06-30 18:56:16 -0400 (Tue, 30 Jun 2009) | 1 line

    Fixed a backslash that was not supposed to be there
  ........
    r73824 | ezio.melotti | 2009-07-03 21:18:08 -0400 (Fri, 03 Jul 2009) | 1 line

    #6398 typo: versio. -> version.
  ........
................

6 files changed, 26 insertions, 19 deletions

diff --git a/Doc/library/decimal.rst b/Doc/library/decimal.rst
index 6ed38952cb3..c1c8482d499 100644
--- a/Doc/library/decimal.rst
+++ b/Doc/library/decimal.rst
@@ -563,10 +563,9 @@ Decimal objects
       operands* (see :ref:`logical_operands_label`).  The result is the
       digit-wise ``and`` of the two operands.
 
-   .. method:: logical_invert(other[, context])
+   .. method:: logical_invert([context])
 
-      :meth:`logical_invert` is a logical operation.  The argument must
-      be a *logical operand* (see :ref:`logical_operands_label`).  The
+      :meth:`logical_invert` is a logical operation.  The
       result is the digit-wise inversion of the operand.
 
    .. method:: logical_or(other[, context])
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index 43d6eb0ebfb..5cd70d967aa 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -372,7 +372,9 @@ The :mod:`multiprocessing` package mostly replicates the API of the
 
       Note that a daemonic process is not allowed to create child processes.
       Otherwise a daemonic process would leave its children orphaned if it gets
-      terminated when its parent process exits.
+      terminated when its parent process exits. Additionally, these are **not**
+      Unix daemons or services, they are normal processes that will be
+      terminated (and not joined) if non-dameonic processes have exited.
 
    In addition to the  :class:`Threading.Thread` API, :class:`Process` objects
    also support the following attributes and methods:
diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst
index 961331e73b1..6320fa71c5e 100644
--- a/Doc/library/optparse.rst
+++ b/Doc/library/optparse.rst
@@ -637,8 +637,8 @@ option involved in the error; be sure to do the same when calling
 ``parser.error()`` from your application code.
 
 If :mod:`optparse`'s default error-handling behaviour does not suit your needs,
-you'll need to subclass OptionParser and override its :meth:`exit` and/or
-:meth:`error` methods.
+you'll need to subclass OptionParser and override its :meth:`~OptionParser.exit`
+and/or :meth:`~OptionParser.error` methods.
 
 
 .. _optparse-putting-it-all-together:
diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst
index d0e655d1e29..bf4ead7c88a 100644
--- a/Doc/library/subprocess.rst
+++ b/Doc/library/subprocess.rst
@@ -68,7 +68,11 @@ This module defines one class called :class:`Popen`:
    needed: Usually, the program to execute is defined by the *args* argument. If
    ``shell=True``, the *executable* argument specifies which shell to use. On Unix,
    the default shell is :file:`/bin/sh`.  On Windows, the default shell is
-   specified by the :envvar:`COMSPEC` environment variable.
+   specified by the :envvar:`COMSPEC` environment variable. The only reason you
+   would need to specify ``shell=True`` on Windows is where the command you
+   wish to execute is actually built in to the shell, eg ``dir``, ``copy``.
+   You don't need ``shell=True`` to run a batch file, nor to run a console-based
+   executable.
 
    *stdin*, *stdout* and *stderr* specify the executed programs' standard input,
    standard output and standard error file handles, respectively.  Valid values
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 32d095289e3..9a57a0b712f 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -580,8 +580,8 @@ Test cases
 
       Run the test, collecting the result into the test result object passed as
       *result*.  If *result* is omitted or :const:`None`, a temporary result
-      object is created (by calling the :meth:`defaultTestCase` method) and
-      used; this result object is not returned to :meth:`run`'s caller.
+      object is created (by calling the :meth:`defaultTestResult` method) and
+      used. The result object is not returned to :meth:`run`'s caller.
 
       The same effect may be had by simply calling the :class:`TestCase`
       instance.
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 89613ecbc21..fa39480e8cb 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -586,12 +586,14 @@ sys_setdlopenflags(PyObject *self, PyObject *args)
 PyDoc_STRVAR(setdlopenflags_doc,
 "setdlopenflags(n) -> None\n\
 \n\
-Set the flags that will be used for dlopen() calls. Among other\n\
-things, this will enable a lazy resolving of symbols when importing\n\
-a module, if called as sys.setdlopenflags(0)\n\
-To share symbols across extension modules, call as\n\
-sys.setdlopenflags(dl.RTLD_NOW|dl.RTLD_GLOBAL)"
-);
+Set the flags used by the interpreter for dlopen calls, such as when the\n\
+interpreter loads extension modules.  Among other things, this will enable\n\
+a lazy resolving of symbols when importing a module, if called as\n\
+sys.setdlopenflags(0).  To share symbols across extension modules, call as\n\
+sys.setdlopenflags(ctypes.RTLD_GLOBAL).  Symbolic names for the flag modules\n\
+can be either found in the ctypes module, or in the DLFCN module. If DLFCN\n\
+is not available, it can be generated from /usr/include/dlfcn.h using the\n\
+h2py script.");
 
 static PyObject *
 sys_getdlopenflags(PyObject *self, PyObject *args)
@@ -605,10 +607,10 @@ sys_getdlopenflags(PyObject *self, PyObject *args)
 PyDoc_STRVAR(getdlopenflags_doc,
 "getdlopenflags() -> int\n\
 \n\
-Return the current value of the flags that are used for dlopen()\n\
-calls. The flag constants are defined in the dl module."
-);
-#endif
+Return the current value of the flags that are used for dlopen calls.\n\
+The flag constants are defined in the ctypes and DLFCN modules.");
+
+#endif	/* HAVE_DLOPEN */
 
 #ifdef USE_MALLOPT
 /* Link with -lmalloc (or -lmpc) on an SGI */