[Python-checkins] cpython (merge 3.4 -> default): Issue #21920: Merge from 3.4.

[berker.peksag]

http://hg.python.org/cpython/rev/e22d0ff286f9
changeset:   91551:e22d0ff286f9
parent:      91549:bd6515070f9c
parent:      91550:6094aa25b33c
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Sat Jul 05 11:11:09 2014 +0300
summary:
  Issue #21920: Merge from 3.4.

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


diff --git a/Doc/library/__main__.rst b/Doc/library/__main__.rst
--- a/Doc/library/__main__.rst
+++ b/Doc/library/__main__.rst
@@ -12,7 +12,7 @@
 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:
+-m`` but not when it is imported::
 
    if __name__ == "__main__":
        # execute only if run as a script

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