--- /dev/null
+Return-Path: <jani@nikula.org>\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 CB31B431FC2\r
+ for <notmuch@notmuchmail.org>; Sun, 16 Dec 2012 14:05:33 -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: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 nXPT6FQjmSIh for <notmuch@notmuchmail.org>;\r
+ Sun, 16 Dec 2012 14:05:33 -0800 (PST)\r
+Received: from mail-la0-f53.google.com (mail-la0-f53.google.com\r
+ [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id C34F9431FC0\r
+ for <notmuch@notmuchmail.org>; Sun, 16 Dec 2012 14:05:32 -0800 (PST)\r
+Received: by mail-la0-f53.google.com with SMTP id w12so4065444lag.26\r
+ for <notmuch@notmuchmail.org>; Sun, 16 Dec 2012 14:05:31 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=google.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references\r
+ :in-reply-to:references:x-gm-message-state;\r
+ bh=EMeEDCAmawtoVWH5+YJNMNVajveT4d+wAd+7F/9vc4g=;\r
+ b=cm2ONuijZAsoWszLKiEe218uZY/5/Y82y8H97/6lzdHxxYA3VyB32eUdo3+qxD24kp\r
+ psnJITkcxqbBjIijyLNgVCAKDz+rbXIk2f1Ccf/s5WSfRsBRe/qkAXLacldU70Fqne7I\r
+ xI/FGjFf09oO+w7aTKmF46LP8dA+Q1d21JhORWwXiaGAY0ZfHrFu2Fjn63rN9d9f0KYK\r
+ 4W3+RkFuRZ2wFxT/IwjTA9cv6vjYwQ4EEpx11YguFYY9ei7fX1Zj11eL0JvuUkSokoxp\r
+ BJID46SDkJblEWC1vT93b0ItF857Cb0aVsKKPzIbAwTiKIBpEzYPu9E0ZVI/PkHUEy5a\r
+ FBgA==\r
+Received: by 10.152.109.139 with SMTP id hs11mr4462187lab.13.1355695531244;\r
+ Sun, 16 Dec 2012 14:05:31 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi.\r
+ [80.223.81.27])\r
+ by mx.google.com with ESMTPS id ne2sm4114694lab.10.2012.12.16.14.05.29\r
+ (version=SSLv3 cipher=OTHER); Sun, 16 Dec 2012 14:05:30 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 5/5] man: document notmuch search --format=text0\r
+Date: Mon, 17 Dec 2012 00:05:13 +0200\r
+Message-Id:\r
+ <7e64522f4416c28a5feee5e4e732fb7fe216b569.1355695036.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <cover.1355695036.git.jani@nikula.org>\r
+References: <cover.1355695036.git.jani@nikula.org>\r
+In-Reply-To: <cover.1355695036.git.jani@nikula.org>\r
+References: <cover.1355695036.git.jani@nikula.org>\r
+X-Gm-Message-State:\r
+ ALoCoQmEgMk1wdwt1Kkc1ZC+7ZsJKPpDGstUBgNa5zDmcrXXwV5wTCLSqoXzj6Zl+h5YnZtX6o8A\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: Sun, 16 Dec 2012 22:05:34 -0000\r
+\r
+---\r
+ man/man1/notmuch-search.1 | 26 ++++++++++++++++----------\r
+ 1 file changed, 16 insertions(+), 10 deletions(-)\r
+\r
+diff --git a/man/man1/notmuch-search.1 b/man/man1/notmuch-search.1\r
+index 5c771fa..12f6719 100644\r
+--- a/man/man1/notmuch-search.1\r
++++ b/man/man1/notmuch-search.1\r
+@@ -25,9 +25,11 @@ Supported options for\r
+ include\r
+ .RS 4\r
+ .TP 4\r
+-.BR \-\-format= ( json | sexp | text )\r
++.BR \-\-format= ( json | sexp | text | text0 )\r
+ \r
+-Presents the results in either JSON, S-Expressions or plain-text (default).\r
++Presents the results in either JSON, S-Expressions, newline character\r
++separated plain-text (default), or null character separated plain-text\r
++(compatible with \fBxargs\fR(1) -0 option where available).\r
+ .RE\r
+ \r
+ .RS 4\r
+@@ -57,32 +59,36 @@ the authors of the thread and the subject.\r
+ .B threads\r
+ \r
+ Output the thread IDs of all threads with any message matching the\r
+-search terms, either one per line (\-\-format=text) or as a JSON array\r
+-(\-\-format=json) or an S-Expression list (\-\-format=sexp).\r
++search terms, either one per line (\-\-format=text), separated by null\r
++characters (\-\-format=text0), as a JSON array (\-\-format=json), or\r
++an S-Expression list (\-\-format=sexp).\r
+ .RE\r
+ .RS 4\r
+ .TP 4\r
+ .B messages\r
+ \r
+ Output the message IDs of all messages matching the search terms,\r
+-either one per line (\-\-format=text) or as a JSON array\r
+-(\-\-format=json) or as an S-Expression list (\-\-format=sexp).\r
++either one per line (\-\-format=text), separated by null characters\r
++(\-\-format=text0), as a JSON array (\-\-format=json), or as an\r
++S-Expression list (\-\-format=sexp).\r
+ .RE\r
+ .RS 4\r
+ .TP 4\r
+ .B files\r
+ \r
+ Output the filenames of all messages matching the search terms, either\r
+-one per line (\-\-format=text) or as a JSON array (\-\-format=json) or\r
+-as an S-Expression list (\-\-format=sexp).\r
++one per line (\-\-format=text), separated by null characters\r
++(\-\-format=text0), as a JSON array (\-\-format=json), or as an\r
++S-Expression list (\-\-format=sexp).\r
+ .RE\r
+ .RS 4\r
+ .TP 4\r
+ .B tags\r
+ \r
+ Output all tags that appear on any message matching the search terms,\r
+-either one per line (\-\-format=text) or as a JSON array (\-\-format=json)\r
+-or as an S-Expression list (\-\-format=sexp).\r
++either one per line (\-\-format=text), separated by null characters\r
++(\-\-format=text0), as a JSON array (\-\-format=json), or as an\r
++S-Expression list (\-\-format=sexp).\r
+ .RE\r
+ .RE\r
+ \r
+-- \r
+1.7.10.4\r
+\r