#16559: merge with 3.2.

--HG--
branch : 3.3
#16559: merge with 3.3.
#16556: Fix inconsistency between kwds and kwargs.  Patch by Taavi Burns.

--HG--
branch : 3.2
#16556: Fix inconsistency between kwds and kwargs.  Patch by Taavi Burns.

--HG--
branch : 2.7
#16556: merge with 3.2.

--HG--
branch : 3.3
#16556: merge with 3.3.
Plug a leak in timemodule. The module dictionary is saved during
initialization. If the interpreter is shut down and reinitialized (embedded
CPython), the old module dictionary was not dec-refed during the next import of
the time extension module.

Contributed by Torsten Marek of Google.

--HG--
branch : 3.2
null merge (3.3 is different)

--HG--
branch : 3.3
null merge
Plug a leak in timemodule. The module dictionary is saved during
initialization. If the interpreter is shut down and reinitialized (embedded
CPython), the old module dictionary was not dec-refed during the next import of
the time extension module.

Contributed by Torsten Marek of Google.

--HG--
branch : 2.7
Issue #16464: reset Request's Content-Length header on .data change.
It will be recalculated on sending request to HTTP server.

Patch by Alexey Kachayev
Add a str class entry to the "Text Sequence Type" section (issue #16209).

This commit also moves the documentation for the str built-in function to
the new class entry.  Links to :class:`str` now go to the class entry with
the string methods immediately afterwards.

--HG--
branch : 3.3
Merge from 3.3: Add a str class entry to the string section (issue #16209).

This commit also moves the documentation for the str built-in function to
the new class entry.  Links to :class:`str` now go to the class entry with
the string methods immediately afterwards.
Improve argument/parameter documentation (issue #15990).

This commit adds "parameter" to the glossary, improves and consolidates the
"argument" glossary entry, and adds a question to the FAQ on the difference
between arguments and parameters.

--HG--
branch : 3.2
Issue #16323: Fix wrong C API documentation for locale encoding.

Patch by Berker Peksag.

--HG--
branch : 3.3
Merge issue #16323: Fix wrong C API documentation for locale encoding.

Patch by Berker Peksag.
Merge from 3.2: improve argument/parameter documentation (issue #15990).

--HG--
branch : 3.3
Merge from 3.3: improve argument/parameter documentation (issue #15990).
Merge heads.

--HG--
branch : 3.3
Merge heads.