aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/changelog.rst5
-rw-r--r--docs/conf.py11
-rw-r--r--docs/hazmat/bindings/commoncrypto.rst2
3 files changed, 16 insertions, 2 deletions
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 41db635e..289992f4 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,9 +1,12 @@
Changelog
=========
+
0.2 - 2014-XX-XX
~~~~~~~~~~~~~~~~
-* In development.
+**In development**
+
+* Added initial CommonCrypto bindings.
0.1 - 2014-01-08
~~~~~~~~~~~~~~~~
diff --git a/docs/conf.py b/docs/conf.py
index a42dcb22..3486fb38 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -19,6 +19,11 @@ try:
except ImportError:
sphinx_rtd_theme = None
+try:
+ from sphinxcontrib import spelling
+except ImportError:
+ spelling = None
+
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
@@ -38,9 +43,11 @@ extensions = [
'sphinx.ext.intersphinx',
'sphinx.ext.viewcode',
'cryptography-docs',
- 'sphinxcontrib.spelling',
]
+if spelling is not None:
+ extensions.append('sphinxcontrib.spelling')
+
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
@@ -263,3 +270,5 @@ texinfo_documents = [
# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {'http://docs.python.org/': None}
+
+epub_theme = 'epub'
diff --git a/docs/hazmat/bindings/commoncrypto.rst b/docs/hazmat/bindings/commoncrypto.rst
index 25535e02..c4f614c2 100644
--- a/docs/hazmat/bindings/commoncrypto.rst
+++ b/docs/hazmat/bindings/commoncrypto.rst
@@ -5,6 +5,8 @@ CommonCrypto Binding
.. currentmodule:: cryptography.hazmat.bindings.commoncrypto.binding
+.. versionadded:: 0.2
+
These are `CFFI`_ bindings to the `CommonCrypto`_ C library. It is available on
Mac OS X.