X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=doc%2Fconf.py;h=8afff929071078e4bbf7eeb8508bce6ae4a85a9a;hb=3ec47e1165064d4937044c02e882612a3e3a7671;hp=0e65413d917aec68b71c8314b280e7f729de661a;hpb=43668950626f347f05aad7d49cd9ea4383030443;p=notmuch

diff --git a/doc/conf.py b/doc/conf.py
index 0e65413d..8afff929 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -12,7 +12,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'notmuch'
-copyright = u'2009-2017, Carl Worth and many others'
+copyright = u'2009-2019, Carl Worth and many others'
 
 location = os.path.dirname(__file__)
 
@@ -29,6 +29,12 @@ release = version
 # directories to ignore when looking for source files.
 exclude_patterns = ['_build']
 
+# If we don't have emacs (or the user configured --without-emacs),
+# don't build the notmuch-emacs docs, as they need emacs to generate
+# the docstring include files
+if os.environ.get('HAVE_EMACS') != '1' or os.environ.get('WITH_EMACS') != '1':
+    exclude_patterns.append('notmuch-emacs.rst')
+
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
@@ -99,6 +105,10 @@ man_pages = [
      u'incorporate new mail into the notmuch database',
      [notmuch_authors], 1),
 
+    ('man7/notmuch-properties', 'notmuch-properties',
+     u'notmuch message property conventions and documentation',
+     [notmuch_authors], 7),
+
     ('man1/notmuch-reindex', 'notmuch-reindex',
      u're-index matching messages',
      [notmuch_authors], 1),