[Python-checkins] cpython (2.7): revert part of cefe4f38fa0e, as agreed with Éric

[sandro.tosi]

http://hg.python.org/cpython/rev/ef1612a6a4f7
changeset:   74468:ef1612a6a4f7
branch:      2.7
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Tue Jan 17 18:32:02 2012 +0100
summary:
  revert part of cefe4f38fa0e, as agreed with Éric

files:
  Doc/glossary.rst |  9 ++++-----
  1 files changed, 4 insertions(+), 5 deletions(-)


diff --git a/Doc/glossary.rst b/Doc/glossary.rst
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -519,11 +519,10 @@
    nested scope
       The ability to refer to a variable in an enclosing definition.  For
       instance, a function defined inside another function can refer to
-      variables in the outer function.  Note that nested scopes by default work
-      only for reference and not for assignment.  Local variables both read and
-      write in the innermost scope.  Likewise, global variables read and write
-      to the global namespace.  The :keyword:`nonlocal` allows writing to outer
-      scopes.
+      variables in the outer function.  Note that nested scopes work only for
+      reference and not for assignment which will always write to the innermost
+      scope.  In contrast, local variables both read and write in the innermost
+      scope.  Likewise, global variables read and write to the global namespace.
 
    new-style class
       Any class which inherits from :class:`object`.  This includes all built-in

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