[Python-checkins] r84377 - in python/branches/release31-maint: Doc/tools/sphinxext/pyspecific.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Tue Aug 31 16:32:27 2010
New Revision: 84377

Log:
Merged revisions 84376 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84376 | benjamin.peterson | 2010-08-31 09:31:01 -0500 (Tue, 31 Aug 2010) | 1 line
  
  add nonlocal to pydoc topics #9724
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/tools/sphinxext/pyspecific.py

Modified: python/branches/release31-maint/Doc/tools/sphinxext/pyspecific.py
==============================================================================
--- python/branches/release31-maint/Doc/tools/sphinxext/pyspecific.py	(original)
+++ python/branches/release31-maint/Doc/tools/sphinxext/pyspecific.py	Tue Aug 31 16:32:27 2010
@@ -84,12 +84,12 @@
     'del', 'dict', 'dynamic-features', 'else', 'exceptions', 'execmodel',
     'exprlists', 'floating', 'for', 'formatstrings', 'function', 'global',
     'id-classes', 'identifiers', 'if', 'imaginary', 'import', 'in', 'integers',
-    'lambda', 'lists', 'naming', 'numbers', 'numeric-types', 'objects',
-    'operator-summary', 'pass', 'power', 'raise', 'return', 'sequence-types',
-    'shifting', 'slicings', 'specialattrs', 'specialnames', 'string-methods',
-    'strings', 'subscriptions', 'truth', 'try', 'types', 'typesfunctions',
-    'typesmapping', 'typesmethods', 'typesmodules', 'typesseq',
-    'typesseq-mutable', 'unary', 'while', 'with', 'yield'
+    'lambda', 'lists', 'naming', 'nonlocal', 'numbers', 'numeric-types',
+    'objects', 'operator-summary', 'pass', 'power', 'raise', 'return',
+    'sequence-types', 'shifting', 'slicings', 'specialattrs', 'specialnames',
+    'string-methods', 'strings', 'subscriptions', 'truth', 'try', 'types',
+    'typesfunctions', 'typesmapping', 'typesmethods', 'typesmodules',
+    'typesseq', 'typesseq-mutable', 'unary', 'while', 'with', 'yield'
 ]
 
 from os import path