--- /dev/null
+Return-Path: <too@guru-group.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 8706E6DE1352\r
+ for <notmuch@notmuchmail.org>; Wed, 5 Aug 2015 13:05:21 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.293\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.293 tagged_above=-999 required=5 tests=[AWL=0.833, \r
+ RP_MATCHES_RCVD=-0.55, T_HEADER_FROM_DIFFERENT_DOMAINS=0.01]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 31xj0Ro-Jswj for <notmuch@notmuchmail.org>;\r
+ Wed, 5 Aug 2015 13:05:18 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 0FF976DE1271\r
+ for <notmuch@notmuchmail.org>; Wed, 5 Aug 2015 13:05:17 -0700 (PDT)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+ id 1CE5B10009D; Wed, 5 Aug 2015 23:05:04 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] NEWS: emacs: notmuch-{cli,emacs}-version usage\r
+Date: Wed, 5 Aug 2015 23:05:02 +0300\r
+Message-Id: <1438805102-16903-1-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 2.0.0\r
+Cc: tomi.ollila@iki.fi\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 05 Aug 2015 20:05:21 -0000\r
+\r
+News for notmuch-emacs-version usage in User-Agent header and\r
+rename of function notmuch-version to notmuch-cli-version.\r
+\r
+While at it, made some minor (consistency) punctuation changes\r
+to make news to wiki conversion work as expected.\r
+---\r
+ NEWS | 19 +++++++++++++++++--\r
+ 1 file changed, 17 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/NEWS b/NEWS\r
+index e474e53..024359a 100644\r
+--- a/NEWS\r
++++ b/NEWS\r
+@@ -1,10 +1,25 @@\r
+ Notmuch 0.21 (UNRELEASED)\r
+ =========================\r
+ \r
++Emacs Interface\r
++---------------\r
++\r
++`notmuch-emacs-version` is used in `User-Agent` header\r
++\r
++ The value of recently introduced variable `notmuch-emacs-version` is\r
++ now used as a part of `User-Agent` header when sending emails.\r
++\r
++Removed `notmuch-version` function by renaming it to `notmuch-cli-version`\r
++\r
++ With existing variable `notmuch-emacs-version` the accompanied\r
++ function which retrieves the version of `notmuch-command` is\r
++ better named as `notmuch-cli-version`.\r
++\r
+ Library\r
+ -------\r
+ \r
+-The use of absolute paths is now enforced when calling notmuch_database_{open, create}\r
++The use of absolute paths is now enforced when calling\r
++`notmuch_database_{open, create}`.\r
+ \r
+ Notmuch 0.20.2 (2015-06-27)\r
+ ===========================\r
+@@ -20,7 +35,7 @@ Notmuch 0.20.1 (2015-06-01)\r
+ Test Suite\r
+ ----------\r
+ \r
+-Work around apparent gdb bug on arm64\r
++Work around apparent gdb bug on arm64.\r
+ \r
+ Notmuch 0.20 (2015-05-31)\r
+ =========================\r
+-- \r
+2.4.1\r
+\r