Merge tag '0.18.2_rc1'

[notmuch] / doc / conf.py

diff --git a/doc/conf.py b/doc/conf.py
index 6c2806d717b078e252c6e190842559ff99ddfd02..495e5381cd93037edb1e1f9aefb8b93dad8ac5cb 100644 (file)
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -14,14 +14,20 @@ master_doc = 'index'
 project = u'notmuch'
 copyright = u'2014, Carl Worth and many others'
 
-# The short X.Y version.
-version = '0.17'
+location = os.path.dirname(__file__)
+
+for pathdir in ['.', '..']:
+    version_file = os.path.join(location,pathdir,'version')
+    if os.path.exists(version_file):
+        with open(version_file,'r') as infile:
+            version=infile.read().replace('\n','')
+
 # The full version, including alpha/beta/rc tags.
-release = '0.17'
+release = version
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_build', 'notmuch-emacs.rst']
+exclude_patterns = ['_build']
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
@@ -36,7 +42,7 @@ html_theme = 'default'
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = []
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'notmuchdoc'