[Python-checkins] r82440 - in python/branches/py3k: Doc/whatsnew/2.7.rst

[nick.coghlan]

Author: nick.coghlan
Date: Fri Jul  2 17:57:50 2010
New Revision: 82440

Log:
Merged revisions 82439 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r82439 | nick.coghlan | 2010-07-03 01:50:14 +1000 (Sat, 03 Jul 2010) | 1 line
  
  Fix a couple of minor nits in What's New before the release goes out
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/whatsnew/2.7.rst

Modified: python/branches/py3k/Doc/whatsnew/2.7.rst
==============================================================================
--- python/branches/py3k/Doc/whatsnew/2.7.rst	(original)
+++ python/branches/py3k/Doc/whatsnew/2.7.rst	Fri Jul  2 17:57:50 2010
@@ -861,10 +861,10 @@
 
 When running a module using the interpreter's :option:`-m` switch,
 ``sys.argv[0]`` will now be set to the string ``'-m'`` while the
-module is being located, while executing the :file:`__init__.py` files
-for any parent packages of the module to be executed.
-(Suggested by Michael Foord; implemented by Nick Coghlan;
-:issue:`8202`.)
+module is being located.  This change is visible to user code while
+executing the :file:`__init__.py` files for any parent packages of
+the module to be executed.  (Suggested by Michael Foord; implemented
+by Nick Coghlan; :issue:`8202`.)
 
 .. ======================================================================
 
@@ -1420,9 +1420,9 @@
   ``sys.path`` and the module :mod:`__main__` will be imported.  It's
   expected that the directory or zip contains a :file:`__main__.py`;
   if it doesn't, some other :file:`__main__.py` might be imported from
-  a location later in ``sys.path``.  This makes some of the machinery
+  a location later in ``sys.path``.  This makes more of the machinery
   of :mod:`runpy` available to scripts that want to mimic the way
-  Python's :option:`-m` processes an explicit path name.
+  Python's command line processes an explicit path name.
   (Added by Nick Coghlan; :issue:`6816`.)
 
 * New function: in the :mod:`shutil` module, :func:`~shutil.make_archive`