Merge 3.1

diff --cc Doc/c-api/intro.rst
index 0c4f816ff8a8e008654c4486e3000a1d91efeba3,c008b5c93dd5ca22d0b33cca2ace21f14672561c..83b98f9b4c2e44d5d4448f543fd692c90de1fd2f
--- 1/Doc/c-api/intro.rst
--- 2/Doc/c-api/intro.rst
+++ b/Doc/c-api/intro.rst
@@@ -514,21 -514,20 +514,20 @@@ interpreter can only be used after the 
     triple: module; search; path
     single: path (in module sys)
  
 -The basic initialization function is :cfunc:`Py_Initialize`. This initializes
 +The basic initialization function is :c:func:`Py_Initialize`. This initializes
  the table of loaded modules, and creates the fundamental modules
- :mod:`builtins`, :mod:`__main__`, :mod:`sys`, and :mod:`exceptions`.  It also
+ :mod:`builtins`, :mod:`__main__`, and :mod:`sys`.  It also
  initializes the module search path (``sys.path``).
  
 -.. index:: single: PySys_SetArgv()
 +.. index:: single: PySys_SetArgvEx()
  
 -:cfunc:`Py_Initialize` does not set the "script argument list"  (``sys.argv``).
 -If this variable is needed by Python code that  will be executed later, it must
 -be set explicitly with a call to  ``PySys_SetArgv(argc, argv)`` subsequent to
 -the call to :cfunc:`Py_Initialize`.
 +:c:func:`Py_Initialize` does not set the "script argument list"  (``sys.argv``).
 +If this variable is needed by Python code that will be executed later, it must
 +be set explicitly with a call to  ``PySys_SetArgvEx(argc, argv, updatepath)``
 +after the call to :c:func:`Py_Initialize`.
  
  On most systems (in particular, on Unix and Windows, although the details are
 -slightly different), :cfunc:`Py_Initialize` calculates the module search path
 +slightly different), :c:func:`Py_Initialize` calculates the module search path
  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

diff --cc Doc/documenting/markup.rst
index 277ca9f2fc901cf03c1673071109527fdd0c5943,be7718d82e348eb142985cd5d147a84b5fb214c9..1f5b1e36e78f51dd1bbafae43265e9fc02b10c18
--- 1/Doc/documenting/markup.rst
--- 2/Doc/documenting/markup.rst
+++ b/Doc/documenting/markup.rst
@@@ -223,14 -208,9 +239,15 @@@ The directives are
  
     Describes an object method.  The parameters should not include the ``self``
     parameter.  The description should include similar information to that
-    described for ``function``.
+    described for ``function``.  This method should be nested in a class
+    method, like in the example above.
  
 +.. describe:: decoratormethod
 +
 +   Same as ``decorator``, but for decorators that are methods.
 +
 +   Refer to a decorator method using the ``:meth:`` role.
 +
  .. describe:: opcode
  
     Describes a Python :term:`bytecode` instruction.

diff --cc Doc/library/dbm.rst
Simple merge

diff --cc Lib/dbm/__init__.py
index 6e890f36aac2ee15c07fec259608c26f214d025e,57be17b40818ab103097fbd1c05e80c95e2bf178..76a43c43f38be02a5987b5f19c8c4d119332f82e
--- 1/Lib/dbm/__init__.py
--- 2/Lib/dbm/__init__.py
+++ b/Lib/dbm/__init__.py
@@@ -23,19 -24,11 +23,11 @@@ It has the following interface (key an
          list = d.keys() # return a list of all existing keys (slow!)
  
  Future versions may change the order in which implementations are
- tested for existence, add interfaces to other dbm-like
+ tested for existence, and add interfaces to other dbm-like
  implementations.
- 
- The open function has an optional second argument.  This can be 'r',
- for read-only access, 'w', for read-write access of an existing
- database, 'c' for read-write access to a new or existing database, and
- 'n' for read-write access to a new database.  The default is 'r'.
- 
- Note: 'r' and 'w' fail if the database doesn't exist; 'c' creates it
- only if it doesn't exist; and 'n' always creates a new database.
  """
  
 -__all__ = ['open', 'whichdb', 'error', 'error']
 +__all__ = ['open', 'whichdb', 'error']
  
  import io
  import os

diff --cc Lib/heapq.py
Simple merge