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
........

diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py
index 85cd5bc1396369c6ca873d0c582c9b72853e2fd6..143003f6293bc3cfb454083bcddfeec327189b96 100644 (file)
--- a/Doc/tools/sphinxext/pyspecific.py
+++ b/Doc/tools/sphinxext/pyspecific.py
@@ -84,12 +84,12 @@ pydoc_topic_labels = [
     '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