Issue #26638: Merge option warning fixes from 3.5 into 3.6

This commit is contained in:
Martin Panter 2016-10-30 04:21:23 +00:00
commit 9440787867
23 changed files with 132 additions and 129 deletions

View file

@ -886,7 +886,7 @@ The :mod:`gc` module exposes a way to run the detector (the
:func:`~gc.collect` function), as well as configuration
interfaces and the ability to disable the detector at runtime. The cycle
detector is considered an optional component; though it is included by default,
it can be disabled at build time using the :option:`--without-cycle-gc` option
it can be disabled at build time using the :option:`!--without-cycle-gc` option
to the :program:`configure` script on Unix platforms (including Mac OS X). If
the cycle detector is disabled in this way, the :mod:`gc` module will not be
available.