Re: [PATCH] doc: document notmuch-dump header line

diff --git a/e5/ba99c4c581357398dcd63c1d90a57c79e988d2 b/e5/ba99c4c581357398dcd63c1d90a57c79e988d2
new file mode 100644 (file)
index 0000000..15b071b
--- /dev/null
+++ b/e5/ba99c4c581357398dcd63c1d90a57c79e988d2
@@ -0,0 +1,93 @@
+Return-Path: <tomi.ollila@iki.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 39CCE6DE0281\r
+ for <notmuch@notmuchmail.org>; Sun,  5 Jun 2016 23:38:39 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.575\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.575 tagged_above=-999 required=5 tests=[AWL=-0.077,\r
+  SPF_NEUTRAL=0.652] 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 2sm4UxNgXTbb for <notmuch@notmuchmail.org>;\r
+ Sun,  5 Jun 2016 23:38:30 -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 857536DE01C2\r
+ for <notmuch@notmuchmail.org>; Sun,  5 Jun 2016 23:38:29 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+ by guru.guru-group.fi (Postfix) with ESMTP id 2C190100104;\r
+ Mon,  6 Jun 2016 09:38:09 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] doc: document notmuch-dump header line\r
+In-Reply-To: <1465165438-15230-1-git-send-email-david@tethera.net>\r
+References: <1465122258-4940-1-git-send-email-david@tethera.net>\r
+ <1465165438-15230-1-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.22+32~gd4854c5 (http://notmuchmail.org) Emacs/24.5.1\r
+ (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+ $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+ !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Mon, 06 Jun 2016 09:38:08 +0300\r
+Message-ID: <m2twh6n7ov.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Mon, 06 Jun 2016 06:38:39 -0000\r
+\r
+On Mon, Jun 06 2016, David Bremner <david@tethera.net> wrote:\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
+LGTM.\r
+\r
+Tomi\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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> https://notmuchmail.org/mailman/listinfo/notmuch\r