[Python-checkins] cpython (merge 3.4 -> default): merge with 3.4

[georg.brandl]

https://hg.python.org/cpython/rev/5ed6a2c4ecda
changeset:   93274:5ed6a2c4ecda
parent:      93272:4686aca7501e
parent:      93273:1132f25c3f43
user:        Georg Brandl <georg at python.org>
date:        Thu Oct 30 22:35:59 2014 +0100
summary:
  merge with 3.4

files:
  Doc/tools/rstlint.py |  11 ++++++-----
  1 files changed, 6 insertions(+), 5 deletions(-)


diff --git a/Doc/tools/rstlint.py b/Doc/tools/rstlint.py
--- a/Doc/tools/rstlint.py
+++ b/Doc/tools/rstlint.py
@@ -27,15 +27,16 @@
     'parsed-literal', 'pull-quote', 'raw', 'replace',
     'restructuredtext-test-directive', 'role', 'rubric', 'sectnum', 'sidebar',
     'table', 'target-notes', 'tip', 'title', 'topic', 'unicode', 'warning',
-    # Sphinx custom ones
+    # Sphinx and Python docs custom ones
     'acks', 'attribute', 'autoattribute', 'autoclass', 'autodata',
     'autoexception', 'autofunction', 'automethod', 'automodule', 'centered',
     'cfunction', 'class', 'classmethod', 'cmacro', 'cmdoption', 'cmember',
     'code-block', 'confval', 'cssclass', 'ctype', 'currentmodule', 'cvar',
-    'data', 'deprecated-removed', 'deprecated(?!-removed)', 'describe', 'directive',
-    'doctest', 'envvar', 'event',
-    'exception', 'function', 'glossary', 'highlight', 'highlightlang', 'index',
-    'literalinclude', 'method', 'module', 'moduleauthor', 'productionlist',
+    'data', 'decorator', 'decoratormethod', 'deprecated-removed',
+    'deprecated(?!-removed)', 'describe', 'directive', 'doctest', 'envvar',
+    'event', 'exception', 'function', 'glossary', 'highlight', 'highlightlang',
+    'impl-detail', 'index', 'literalinclude', 'method', 'miscnews', 'module',
+    'moduleauthor', 'opcode', 'pdbcommand', 'productionlist',
     'program', 'role', 'sectionauthor', 'seealso', 'sourcecode', 'staticmethod',
     'tabularcolumns', 'testcode', 'testoutput', 'testsetup', 'toctree', 'todo',
     'todolist', 'versionadded', 'versionchanged'

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