summaryrefslogtreecommitdiffstats
path: root/Doc/using
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-10-30 04:21:23 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-10-30 04:21:23 (GMT)
commit944078786797b03b415d76b0b2d7f3fb8570b9a4 (patch)
tree452bee864a07539ea284c04daed949d66821eb7d /Doc/using
parent77d574d4aeae4b7b9b976a68b367783a0932b6c8 (diff)
parentb8c5f54248369ff89575c1416a98e13e718a4aa4 (diff)
downloadcpython-944078786797b03b415d76b0b2d7f3fb8570b9a4.zip
cpython-944078786797b03b415d76b0b2d7f3fb8570b9a4.tar.gz
cpython-944078786797b03b415d76b0b2d7f3fb8570b9a4.tar.bz2
Issue #26638: Merge option warning fixes from 3.5 into 3.6
Diffstat (limited to 'Doc/using')
-rw-r--r--Doc/using/cmdline.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 75cb8ea..81b0823 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -192,7 +192,7 @@ Miscellaneous options
Issue a warning when comparing :class:`bytes` or :class:`bytearray` with
:class:`str` or :class:`bytes` with :class:`int`. Issue an error when the
- option is given twice (:option:`-bb`).
+ option is given twice (:option:`!-bb`).
.. versionchanged:: 3.5
Affects comparisons of :class:`bytes` with :class:`int`.
@@ -308,11 +308,12 @@ Miscellaneous options
Print a message each time a module is initialized, showing the place
(filename or built-in module) from which it is loaded. When given twice
- (:option:`-vv`), print a message for each file that is checked for when
+ (:option:`!-vv`), print a message for each file that is checked for when
searching for a module. Also provides information on module cleanup at exit.
See also :envvar:`PYTHONVERBOSE`.
+.. _using-on-warnings:
.. cmdoption:: -W arg
Warning control. Python's warning machinery by default prints warning