Merge branch 'debian' into release

[notmuch] / doc / conf.py

diff --git a/doc/conf.py b/doc/conf.py
index f8da1a422f9a557b258779a8fa1f4cc30b1a141b..a3d8269696a366dca12b1caa4a8d67e6005d993c 100644 (file)
--- 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-2016, Carl Worth and many others'
+copyright = u'2009-2017, Carl Worth and many others'
 
 location = os.path.dirname(__file__)
 
@@ -132,7 +132,7 @@ man_pages = [
 texinfo_no_detailmenu = True
 
 texinfo_documents = [
-    ('notmuch-emacs', 'notmuch-emacs', u'notmuch Documentation',
+    ('notmuch-emacs', 'notmuch-emacs', u'notmuch-emacs documentation',
      notmuch_authors, 'notmuch-emacs',
      'emacs based front-end for notmuch', 'Miscellaneous'),
 ]
@@ -142,7 +142,7 @@ texinfo_documents += [
     (
         x[0],                          # source start file
         x[1],                          # target name
-        u'notmuch Documentation',      # title
+        x[1] + u' documentation',      # title
         x[3][0],                       # author
         x[1],                          # dir menu entry
         x[2],                          # description