Merge branch 'master' into simple-symmetric-encryption
diff --git a/cryptography/__about__.py b/cryptography/__about__.py
index 16d631f..bb9a692 100644
--- a/cryptography/__about__.py
+++ b/cryptography/__about__.py
@@ -24,8 +24,9 @@
__version__ = "0.1.dev1"
-__author__ = ("Alex Gaynor, Donald Stufft, Laurens van Houvten, "
- "Jean-Paul Calderone, Chris Heime, and Indivdual Contributors")
+__author__ = ("Alex Gaynor, Hynek Schlawack, Donald Stufft, "
+ "Laurens Van Houtven, Jean-Paul Calderone, Christian Heimes, "
+ "and individual contributors.")
__email__ = "cryptography-dev@python.org"
__license__ = "Apache License, Version 2.0"
diff --git a/docs/conf.py b/docs/conf.py
index bd8642c..16b1109 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -25,6 +25,7 @@
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = [
'sphinx.ext.autodoc',
+ 'sphinx.ext.doctest',
'sphinx.ext.intersphinx',
'sphinx.ext.viewcode',
]
diff --git a/tox.ini b/tox.ini
index 1b6a45b..4d17ebe 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,8 +10,9 @@
[testenv:docs]
deps = sphinx
basepython = python2.7
-changedir = docs
-commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . _build/html
+commands =
+ sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/_build/html
+ sphinx-build -W -b doctest -d {envtmpdir}/doctrees docs docs/_build/html
[testenv:pep8]
deps = flake8