[Python-checkins] Mark -c and -O as command line options in reStructuredText. (GH-10103)

Wed Nov 7 12:53:31 EST 2018

https://github.com/python/cpython/commit/e422de828fba695a49dc7e9cbef30e87d4c4f249
commit: e422de828fba695a49dc7e9cbef30e87d4c4f249
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2018年11月07日T09:53:27-08:00
summary:
Mark -c and -O as command line options in reStructuredText. (GH-10103)
(cherry picked from commit ea6a28c9f7e4baa5fe775cebce697a14a7d7da8b)
Co-authored-by: Andrés Delfino <adelfino at gmail.com>
files:
M Doc/reference/executionmodel.rst
M Doc/reference/import.rst
M Doc/reference/simple_stmts.rst

diff --git a/Doc/reference/executionmodel.rst b/Doc/reference/executionmodel.rst
index 5c83181440bc..1a69e972f2cb 100644
--- a/Doc/reference/executionmodel.rst
+++ b/Doc/reference/executionmodel.rst
@@ -22,7 +22,7 @@ The following are blocks: a module, a function body, and a class definition.
 Each command typed interactively is a block. A script file (a file given as
 standard input to the interpreter or specified as a command line argument to the
 interpreter) is a code block. A script command (a command specified on the
-interpreter command line with the '**-c**' option) is a code block. The string
+interpreter command line with the :option:`-c` option) is a code block. The string
 argument passed to the built-in functions :func:`eval` and :func:`exec` is a
 code block.
 
diff --git a/Doc/reference/import.rst b/Doc/reference/import.rst
index c3a20314f79d..b295eed9d802 100644
--- a/Doc/reference/import.rst
+++ b/Doc/reference/import.rst
@@ -925,7 +925,7 @@ In :ref:`the remaining cases <using-on-interface-options>`
 :mod:`__main__` does not correspond directly with an importable module:
 
 - interactive prompt
-- -c switch
+- :option:`-c` option
 - running from stdin
 - running directly from a source or bytecode file
 
diff --git a/Doc/reference/simple_stmts.rst b/Doc/reference/simple_stmts.rst
index 9246939dbdac..3ab0029698c7 100644
--- a/Doc/reference/simple_stmts.rst
+++ b/Doc/reference/simple_stmts.rst
@@ -402,7 +402,7 @@ The extended form, ``assert expression1, expression2``, is equivalent to ::
 These equivalences assume that :const:`__debug__` and :exc:`AssertionError` refer to
 the built-in variables with those names. In the current implementation, the
 built-in variable :const:`__debug__` is ``True`` under normal circumstances,
-``False`` when optimization is requested (command line option -O). The current
+``False`` when optimization is requested (command line option :option:`-O`). The current
 code generator emits no code for an assert statement when optimization is
 requested at compile time. Note that it is unnecessary to include the source
 code for the expression that failed in the error message; it will be displayed
