Merge branch 'master' into simple-symmetric-encryption

cryptography/__about__.py

@@ -24,8 +24,9 @@ __uri__ = "https://github.com/alex/cryptography"
 
 __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"

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',
 ]

tox.ini

@@ -10,8 +10,9 @@ commands = py.test --cov=cryptography/ --cov=tests/
 [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