Merge tag 'upstream/7.8.1'

Upstream version 7.8.1

# gpg: Firmado el mar 15 nov 2016 14:18:48 ART
# gpg:                usando RSA clave A6C7B88B9583046A11C5403E0B00FB6CEBE2D002
# gpg: Firma correcta de "Ulises Vitulli <dererk@debian.org>" [absoluta]
# gpg:                 alias "Dererk <dererk@torproject.org>" [absoluta]
# gpg:                 alias "Ulises Vitulli <uvitulli@fi.uba.ar>" [absoluta]
# gpg:                 alias "Ulises Vitulli <dererk@satellogic.com>" [absoluta]

1 files changed, 5 insertions, 8 deletions

diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py
index 3cd48af..40594aa 100644
--- a/docs/sphinx/conf.py
+++ b/docs/sphinx/conf.py
@@ -27,11 +27,8 @@ from __future__ import unicode_literals
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-try:
-    import sphinxcontrib.gist  # NOQA
-    extensions = ['sphinxcontrib.gist']
-except ImportError:
-    extensions = []
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.mathjax']
+# extensions.append('sphinxcontrib.gist')
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -47,16 +44,16 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'Nikola'
-copyright = '2012-2015, The Nikola Contributors'
+copyright = '2012-2016, The Nikola Contributors'
 
 # The version info for the project yo're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '7.6.4'
+version = '7.8.1'
 # The full version, including alpha/beta/rc tags.
-release = '7.6.4'
+release = '7.8.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.