merged conflicts

2010-03-09 15:19:14 -06:00
parent 3b6d8fab47 a19a7b976c
commit 22a6ec7794
4 changed files with 336 additions and 70 deletions
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,7 @@ sys.path.append(os.path.abspath('..'))

 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc']
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo']

 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']