[Python-checkins] cpython (merge 3.4 -> default): Merge: #15104: add backtick code markup.

[r.david.murray]

http://hg.python.org/cpython/rev/14e874736d3a
changeset:   90305:14e874736d3a
parent:      90303:842014ab1c06
parent:      90304:008486e18e90
user:        R David Murray <rdmurray at bitdance.com>
date:        Mon Apr 14 18:54:21 2014 -0400
summary:
  Merge: #15104: add backtick code markup.

files:
  Doc/library/__main__.rst |  14 +++++++-------
  1 files changed, 7 insertions(+), 7 deletions(-)


diff --git a/Doc/library/__main__.rst b/Doc/library/__main__.rst
--- a/Doc/library/__main__.rst
+++ b/Doc/library/__main__.rst
@@ -5,19 +5,19 @@
 .. module:: __main__
    :synopsis: The environment where the top-level script is run.
 
-'__main__' is the name of the scope in which top-level code executes.
-A module's __name__ is set equal to '__main__' when read from
+``'__main__'`` is the name of the scope in which top-level code executes.
+A module's __name__ is set equal to ``'__main__'`` when read from
 standard input, a script, or from an interactive prompt.
 
 A module can discover whether or not it is running in the main scope by
-checking its own __name__, which allows a common idiom for conditionally
-executing code in a module when it is run as a script or with `python
--m` but not when it is imported:
+checking its own ``__name__``, which allows a common idiom for conditionally
+executing code in a module when it is run as a script or with ``python
+-m`` but not when it is imported:
 
    if __name__ == "__main__":
        # execute only if run as a script
        main()
 
 For a package, the same effect can be achieved by including a
-__main__.py module, the contents of which will be executed when the
-module is run with -m.
+``__main__.py`` module, the contents of which will be executed when the
+module is run with ``-m``.

-- 
Repository URL: http://hg.python.org/cpython