X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=doc%2Fconf.py;h=fb49f6eb97ecc2962c08f3bff813ab721fe758f5;hp=6c2806d717b078e252c6e190842559ff99ddfd02;hb=3d991261a458b1f844d3e7ac502be1fe8c3e5096;hpb=d736260385a689b5c77d8121f48e29440e3adfa4

diff --git a/doc/conf.py b/doc/conf.py
index 6c2806d7..fb49f6eb 100644
--- 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'
@@ -52,6 +58,10 @@ man_pages = [
         u'thread-based email index, search, and tagging',
         [u'Carl Worth and many others'], 1),
 
+('man1/notmuch-address','notmuch-address',
+        u'output addresses from matching messages',
+        [u'Carl Worth and many others'], 1),
+
 ('man1/notmuch-compact','notmuch-compact',
         u'compact the notmuch database',
         [u'Carl Worth and many others'], 1),
@@ -124,6 +134,9 @@ texinfo_documents = [
 ('man1/notmuch','notmuch',u'notmuch Documentation',
       u'Carl Worth and many others', 'notmuch',
       'thread-based email index, search, and tagging','Miscellaneous'),
+('man1/notmuch-address','notmuch-address',u'notmuch Documentation',
+      u'Carl Worth and many others', 'notmuch-address',
+      'output addresses from matching messages','Miscellaneous'),
 ('man1/notmuch-compact','notmuch-compact',u'notmuch Documentation',
       u'Carl Worth and many others', 'notmuch-compact',
       'compact the notmuch database','Miscellaneous'),