Merge.

Author: larryhastings

Doc/Makefile

@@ -166,7 +166,7 @@ autobuild-dev:
 -make suspicious
 
 # for quick rebuilds (HTML only)
-autobuild-html:
+autobuild-dev-html:
 make html SPHINXOPTS='-A daily=1 -A versionswitcher=1'
 
 # for stable releases: only build if not in pre-release stage (alpha, beta)
@@ -177,3 +177,10 @@ autobuild-stable:
 exit 1;; \
 esac
 @make autobuild-dev
+
+autobuild-stable-html:
+@case $(DISTVERSION) in *[ab]*) \
+echo "Not building; $(DISTVERSION) is not a release version."; \
+exit 1;; \
+esac
+@make autobuild-dev-html

Doc/c-api/module.rst

@@ -59,10 +59,10 @@ Module Objects
  .. index:: single: __dict__ (module attribute)
 
  Return the dictionary object that implements *module*'s namespace; this object
- is the same as the :attr:`__dict__` attribute of the module object. This
+ is the same as the :attr:`~object.__dict__` attribute of the module object. This
  function never fails. It is recommended extensions use other
  :c:func:`PyModule_\*` and :c:func:`PyObject_\*` functions rather than directly
- manipulate a module's :attr:`__dict__`.
+ manipulate a module's :attr:`~object.__dict__`.
 
 
 .. c:function:: PyObject* PyModule_GetNameObject(PyObject *module)

Doc/c-api/structures.rst

@@ -150,9 +150,8 @@ specific C type of the *self* object.
 The :attr:`ml_flags` field is a bitfield which can include the following flags.
 The individual flags indicate either a calling convention or a binding
 convention. Of the calling convention flags, only :const:`METH_VARARGS` and
-:const:`METH_KEYWORDS` can be combined (but note that :const:`METH_KEYWORDS`
-alone is equivalent to ``METH_VARARGS | METH_KEYWORDS``). Any of the calling
-convention flags can be combined with a binding flag.
+:const:`METH_KEYWORDS` can be combined. Any of the calling convention flags
+can be combined with a binding flag.
 
 
 .. data:: METH_VARARGS

Doc/c-api/typeobj.rst

@@ -111,10 +111,10 @@ type objects) *must* have the :attr:`ob_size` field.
  For statically allocated type objects, the tp_name field should contain a dot.
  Everything before the last dot is made accessible as the :attr:`__module__`
  attribute, and everything after the last dot is made accessible as the
- :attr:`__name__` attribute.
+ :attr:`~definition.__name__` attribute.
 
  If no dot is present, the entire :c:member:`~PyTypeObject.tp_name` field is made accessible as the
- :attr:`__name__` attribute, and the :attr:`__module__` attribute is undefined
+ :attr:`~definition.__name__` attribute, and the :attr:`__module__` attribute is undefined
  (unless explicitly set in the dictionary, as explained above). This means your
  type will be impossible to pickle.
 

Doc/faq/general.rst

@@ -438,7 +438,7 @@ remember the methods for a list, they can do something like this::
  >>> L
  [1]
 
-With the interpreter, documentation is never far from the student as he's
+With the interpreter, documentation is never far from the student as they are
 programming.
 
 There are also good IDEs for Python. IDLE is a cross-platform IDE for Python

Doc/howto/regex.rst

@@ -374,9 +374,7 @@ module. If you have :mod:`tkinter` available, you may also want to look at
 :source:`Tools/demo/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://kodos.sourceforge.net/>`_ is also an interactive tool for developing and
-testing RE patterns.
+trying to debug a complicated RE.
 
 This HOWTO uses the standard Python interpreter for its examples. First, run the
 Python interpreter, import the :mod:`re` module, and compile a RE::

Doc/library/builtins.rst

@@ -37,6 +37,6 @@ that wants to implement an :func:`open` function that wraps the built-in
 
 As an implementation detail, most modules have the name ``__builtins__`` made
 available as part of their globals. The value of ``__builtins__`` is normally
-either this module or the value of this module's :attr:`__dict__` attribute.
+either this module or the value of this module's :attr:`~object.__dict__` attribute.
 Since this is an implementation detail, it may not be used by alternate
 implementations of Python.

Doc/library/curses.ascii.rst

@@ -115,12 +115,12 @@ C library:
 
 .. function:: isblank(c)
 
- Checks for an ASCII whitespace character.
+ Checks for an ASCII whitespace character; space or horizontal tab.
 
 
 .. function:: iscntrl(c)
 
- Checks for an ASCII control character (in the range 0x00 to 0x1f).
+ Checks for an ASCII control character (in the range 0x00 to 0x1f or 0x7f).
 
 
 .. function:: isdigit(c)

Doc/library/dbm.rst

@@ -128,6 +128,9 @@ The individual submodules are described in the following sections.
  :platform: Unix
  :synopsis: GNU's reinterpretation of dbm.
 
+**Source code:** :source:`Lib/dbm/gnu.py`
+
+--------------
 
 This module is quite similar to the :mod:`dbm` module, but uses the GNU library
 ``gdbm`` instead to provide some additional functionality. Please note that the
@@ -237,6 +240,9 @@ supported.
  :platform: Unix
  :synopsis: The standard "database" interface, based on ndbm.
 
+**Source code:** :source:`Lib/dbm/ndbm.py`
+
+--------------
 
 The :mod:`dbm.ndbm` module provides an interface to the Unix "(n)dbm" library.
 Dbm objects behave like mappings (dictionaries), except that keys and values are
@@ -299,6 +305,8 @@ to locate the appropriate header file to simplify building this module.
 .. module:: dbm.dumb
  :synopsis: Portable implementation of the simple DBM interface.
 
+**Source code:** :source:`Lib/dbm/dumb.py`
+
 .. index:: single: databases
 
 .. note::
@@ -308,6 +316,8 @@ to locate the appropriate header file to simplify building this module.
  module is not written for speed and is not nearly as heavily used as the other
  database modules.
 
+--------------
+
 The :mod:`dbm.dumb` module provides a persistent dictionary-like interface which
 is written entirely in Python. Unlike other modules such as :mod:`dbm.gnu` no
 external library is required. As with other persistent mappings, the keys and

Doc/library/enum.rst

@@ -431,7 +431,7 @@ The solution is to specify the module name explicitly as follows::
  the source, pickling will be disabled.
 
 The new pickle protocol 4 also, in some circumstances, relies on
-:attr:`__qualname__` being set to the location where pickle will be able
+:attr:`~definition.__qualname__` being set to the location where pickle will be able
 to find the class. For example, if the class was made available in class
 SomeData in the global scope::