--- /dev/null
+Return-Path: <todd@electricoding.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id F27C4431FBC\r
+ for <notmuch@notmuchmail.org>; Thu, 22 Jan 2015 15:44:32 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 2.438\r
+X-Spam-Level: **\r
+X-Spam-Status: No, score=2.438 tagged_above=-999 required=5\r
+ tests=[DNS_FROM_AHBL_RHSBL=2.438] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id b5VZH9PwiA-h for <notmuch@notmuchmail.org>;\r
+ Thu, 22 Jan 2015 15:44:32 -0800 (PST)\r
+Received: from s75.web-hosting.com (s75.web-hosting.com [198.187.31.9])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 126E3431FD4\r
+ for <notmuch@notmuchmail.org>; Thu, 22 Jan 2015 15:44:25 -0800 (PST)\r
+Received: from user-69-73-37-128.knology.net ([69.73.37.128]:32799\r
+ helo=localhost.localdomain)\r
+ by server75.web-hosting.com with esmtpsa (UNKNOWN:AES128-SHA256:128)\r
+ (Exim 4.82) (envelope-from <todd@electricoding.com>)\r
+ id 1YERQG-0036iE-CQ; Thu, 22 Jan 2015 18:44:24 -0500\r
+From: Todd <todd@electricoding.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 5/5] Update documentation\r
+Date: Thu, 22 Jan 2015 17:43:40 -0600\r
+Message-Id: <1421970220-9019-6-git-send-email-todd@electricoding.com>\r
+X-Mailer: git-send-email 1.9.1\r
+In-Reply-To: <1421970220-9019-1-git-send-email-todd@electricoding.com>\r
+References: <1421970220-9019-1-git-send-email-todd@electricoding.com>\r
+In-Reply-To: <1420849787-4401-1-git-send-email-todd@electricoding.com>\r
+References: <1420849787-4401-1-git-send-email-todd@electricoding.com>\r
+X-AntiAbuse: This header was added to track abuse,\r
+ please include it with any abuse report\r
+X-AntiAbuse: Primary Hostname - server75.web-hosting.com\r
+X-AntiAbuse: Original Domain - notmuchmail.org\r
+X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]\r
+X-AntiAbuse: Sender Address Domain - electricoding.com\r
+X-Get-Message-Sender-Via: server75.web-hosting.com: authenticated_id:\r
+ todd@electricoding.com\r
+X-Source: \r
+X-Source-Args: \r
+X-Source-Dir: \r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\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: Thu, 22 Jan 2015 23:44:33 -0000\r
+\r
+Adds new entry to the NEWS file, and updates the search terms section\r
+of the man page. The search terms section needs to be updated again\r
+once the new section in the documentation covering probablistic terms\r
+has been committed.\r
+---\r
+ NEWS | 11 +++++++++++\r
+ doc/man7/notmuch-search-terms.rst | 6 ++++++\r
+ 2 files changed, 17 insertions(+)\r
+\r
+diff --git a/NEWS b/NEWS\r
+index 53e06aa..a4f2a3f 100644\r
+--- a/NEWS\r
++++ b/NEWS\r
+@@ -1,4 +1,5 @@\r
+ Notmuch 0.20 (UNRELEASED)\r
++=========================\r
+ \r
+ Documentation\r
+ -------------\r
+@@ -13,6 +14,16 @@ Contrib\r
+ previously provided by `notmuch-deliver` should now be provided by\r
+ `notmuch insert`, provided by the main notmuch binary.\r
+ \r
++Command-Line Interface\r
++----------------------\r
++\r
++There is a new `mimetype:` search prefix\r
++\r
++ The new `mimetype:` search prefix allows searching for the\r
++ content-type of attachments, which is now indexed by. See the\r
++ `notmuch-search-terms` manual page for details.\r
++\r
++\r
+ Notmuch 0.19 (2014-11-14)\r
+ =========================\r
+ \r
+diff --git a/doc/man7/notmuch-search-terms.rst b/doc/man7/notmuch-search-terms.rst\r
+index 1acdaa0..315e849 100644\r
+--- a/doc/man7/notmuch-search-terms.rst\r
++++ b/doc/man7/notmuch-search-terms.rst\r
+@@ -40,6 +40,8 @@ indicate user-supplied values):\r
+ \r
+ - attachment:<word>\r
+ \r
++- mimetype:<word>\r
++\r
+ - tag:<tag> (or is:<tag>)\r
+ \r
+ - id:<message-id>\r
+@@ -66,6 +68,10 @@ by including quotation marks around the phrase, immediately following\r
+ The **attachment:** prefix can be used to search for specific filenames\r
+ (or extensions) of attachments to email messages.\r
+ \r
++The **mimetype:** prefix will be used to match text from the\r
++content-types of MIME parts within email messages (as specified by the\r
++sender).\r
++\r
+ For **tag:** and **is:** valid tag values include **inbox** and\r
+ **unread** by default for new messages added by **notmuch new** as well\r
+ as any other tag values added manually with **notmuch tag**.\r
+-- \r
+1.9.1\r
+\r