From eb656bd97fe5eaac3bb54e3c3c73cbceddcb87b8 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Thu, 16 Jan 2014 14:43:37 -0600
Subject: Don't require sphinx spelling to be installed, for readthedocs
 benefit

---
 docs/conf.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'docs/conf.py')

diff --git a/docs/conf.py b/docs/conf.py
index a42dcb22..fbd6d57b 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']
 
-- 
cgit v1.2.3


From dd97bfef26c28cd2a91e8fe7ad13cbfbd9535299 Mon Sep 17 00:00:00 2001
From: David Reid <dreid@dreid.org>
Date: Thu, 16 Jan 2014 19:46:22 -0800
Subject: Specify the epub theme to fix the epub build on RTD.

---
 docs/conf.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'docs/conf.py')

diff --git a/docs/conf.py b/docs/conf.py
index fbd6d57b..3486fb38 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -270,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'
-- 
cgit v1.2.3