diff options
| author | Michael Merickel <michael@merickel.org> | 2016-12-14 00:25:46 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2016-12-14 00:25:46 -0600 |
| commit | 12a11daa6a29c36488f083ec7323ad1d91f11b8b (patch) | |
| tree | 6967360418b3f8c1ab335598f4e5a6df3b184584 /docs/conf.py | |
| parent | 3c5731a1cac958e05093df56263d52433fc683a9 (diff) | |
| parent | 8dfa640a52d57b630843a65b3b84bc13a8a1ed87 (diff) | |
| download | pyramid-12a11daa6a29c36488f083ec7323ad1d91f11b8b.tar.gz pyramid-12a11daa6a29c36488f083ec7323ad1d91f11b8b.tar.bz2 pyramid-12a11daa6a29c36488f083ec7323ad1d91f11b8b.zip | |
Merge branch 'master' into pr/2853
Diffstat (limited to 'docs/conf.py')
| -rw-r--r-- | docs/conf.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/docs/conf.py b/docs/conf.py index 84fd5cf1b..12dd27722 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -51,9 +51,10 @@ book = os.environ.get('BOOK') extensions = [ 'sphinx.ext.autodoc', 'sphinx.ext.doctest', - 'repoze.sphinx.autointerface', - 'sphinx.ext.viewcode', 'sphinx.ext.intersphinx', + 'sphinx.ext.todo', + 'sphinx.ext.viewcode', + 'repoze.sphinx.autointerface', 'sphinxcontrib.programoutput', # enable pylons_sphinx_latesturl when this branch is no longer "latest" # 'pylons_sphinx_latesturl', @@ -68,6 +69,7 @@ intersphinx_mapping = { 'pylonswebframework': ('http://docs.pylonsproject.org/projects/pylons-webframework/en/latest/', None), 'python': ('https://docs.python.org/3', None), 'pytest': ('http://pytest.org/latest/', None), + 'sphinx': ('http://www.sphinx-doc.org/en/latest', None), 'sqla': ('http://docs.sqlalchemy.org/en/latest', None), 'tm': ('http://docs.pylonsproject.org/projects/pyramid-tm/en/latest/', None), 'toolbar': ('http://docs.pylonsproject.org/projects/pyramid-debugtoolbar/en/latest', None), @@ -119,6 +121,9 @@ exclude_patterns = ['_themes/README.rst', ] # unit titles (such as .. function::). add_module_names = False +# Add support for todo items +todo_include_todos = True + # The name of the Pygments (syntax highlighting) style to use. #pygments_style = book and 'bw' or 'tango' if book: |