Confirm that the prime example is actually correct.  We get so many complaints about a "buggy example" on docs@python, let us hope this cuts them in half at least.
Issue #12700: fix test_faulthandler for Mac OS X Lion

Read from NULL raises SIGILL, not SIGSEGV, on Mac OS X Lion.
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/jonashaag/cpython
Merge branch 'master' of https://github.com/jonashaag/cpython
unicode_writer_finish() checks string consistency
Improve the grammar of a non-sentence.
Merge: Improve the grammar of a non-sentence.
Issue #14746: Remove redundant paragraphs from skipitem() in Python/getargs.c.
Issue #14761: Fix potential leak on an error case in the import machinery.
Null merge for issue #14761.
Issue #14744: Inline unicode_writer_write_char() and unicode_write_str()

Optimize also PyUnicode_Format(): call unicode_writer_prepare() only once
per argument.
Rename unicode_write_t structure and its methods to "_PyUnicodeWriter"
Closes #14768: os.path.expanduser('~/a') doesn't works correctly when HOME is '/'
MERGE: Closes #14768: os.path.expanduser('~/a') doesn't works correctly when HOME is '/'
#14763: document default maxsplit value for str.split.
#14763: merge with 3.2.
Removed outdated statement about pickle's and marshal's relative performance.
Removed outdated statement about pickle's and marshal's relative performance.
Some nits in the pickle docs.