Merge branch 'doc-config-options' into docs-refresh

Conflicts:
	docs/source/config/index.rst
This commit is contained in:
Thomas Kluyver 2013-11-05 10:13:34 -08:00
commit 08ca2f531e

1
.gitignore vendored
View File

@ -4,6 +4,7 @@ dist
_build
docs/man/*.gz
docs/source/api/generated
docs/source/config/options
docs/gh-pages
IPython/html/notebook/static/mathjax
*.py[co]