[PATCH] doc: document notmuch-dump header line

diff --git a/c2/b0c418204cce9f21d4784ddb225d899c5fe7b4 b/c2/b0c418204cce9f21d4784ddb225d899c5fe7b4
new file mode 100644 (file)
index 0000000..f09b7b6
--- /dev/null
+++ b/c2/b0c418204cce9f21d4784ddb225d899c5fe7b4
@@ -0,0 +1,79 @@
+Return-Path: <bremner@tethera.net>\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 3607A6DE0281\r
+ for <notmuch@notmuchmail.org>; Sun,  5 Jun 2016 15:24:15 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.012\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.012 tagged_above=-999 required=5\r
+ tests=[AWL=-0.001, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-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 V8C7SuPWx07b for <notmuch@notmuchmail.org>;\r
+ Sun,  5 Jun 2016 15:24:06 -0700 (PDT)\r
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id B81556DE01C2\r
+ for <notmuch@notmuchmail.org>; Sun,  5 Jun 2016 15:24:06 -0700 (PDT)\r
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1b9gSW-0004nP-6V; Sun, 05 Jun 2016 18:23:52 -0400\r
+Received: (nullmailer pid 15280 invoked by uid 1000);\r
+ Sun, 05 Jun 2016 22:24:00 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: [PATCH] doc: document notmuch-dump header line\r
+Date: Sun,  5 Jun 2016 19:23:58 -0300\r
+Message-Id: <1465165438-15230-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.8.1\r
+In-Reply-To: <1465122258-4940-1-git-send-email-david@tethera.net>\r
+References: <1465122258-4940-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 05 Jun 2016 22:24:15 -0000\r
+\r
+This was introduced with the libconfig changes, but not documented then.\r
+---\r
+\r
+after some IRC discussion with Tomi, this rst is slightly less gross\r
+\r
+ doc/man1/notmuch-dump.rst | 10 +++++++++-\r
+ 1 file changed, 9 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/doc/man1/notmuch-dump.rst b/doc/man1/notmuch-dump.rst\r
+index eda9e07..94986a8 100644\r
+--- a/doc/man1/notmuch-dump.rst\r
++++ b/doc/man1/notmuch-dump.rst\r
+@@ -86,7 +86,15 @@ Supported options for **dump** include\r
+       Output per-message metadata, namely tags. See *format* above\r
+       for description of the output.\r
+ \r
+-      The default is to include both tags and configuration information\r
++      The default is to include both tags and configuration\r
++      information. As of version 2 of the dump format, there is a\r
++      header line of the following form\r
++\r
++      |\r
++      |  #notmuch-dump <*format*>:<*version*> <*included*>\r
++\r
++      where <*included*> is a comma separated list of the above\r
++      options.\r
+ \r
+     ``--output=``\ <filename>\r
+         Write output to given file instead of stdout.\r
+-- \r
+2.8.1\r
+\r