diff options
| author | Georg Brandl <georg@python.org> | 2013-10-12 20:01:14 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2013-10-12 20:01:14 +0200 |
| commit | 7c11e52f7e17de5ffd8a0b745bd20c32141bdf33 (patch) | |
| tree | 0a1c47b0664b55aad383b20f2c0446b4fda63138 /Doc/conf.py | |
| parent | b9e8712a54bcb83d858eb1cccc3d04a32d4312df (diff) | |
| parent | 5c01d99c12876263d8cc700a11cce9ad88994096 (diff) | |
| download | cpython-git-7c11e52f7e17de5ffd8a0b745bd20c32141bdf33.tar.gz | |
merge with 3.3
Diffstat (limited to 'Doc/conf.py')
| -rw-r--r-- | Doc/conf.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/conf.py b/Doc/conf.py index 6b085e0489..5b63cad028 100644 --- a/Doc/conf.py +++ b/Doc/conf.py @@ -12,8 +12,8 @@ sys.path.append(os.path.abspath('tools/sphinxext')) # General configuration # --------------------- -extensions = ['sphinx.ext.refcounting', 'sphinx.ext.coverage', - 'sphinx.ext.doctest', 'pyspecific'] +extensions = ['sphinx.ext.coverage', 'sphinx.ext.doctest', + 'pyspecific', 'c_annotations'] templates_path = ['tools/sphinxext'] # General substitutions. |