[PATCH 3/4] doc: Clarify charset encoding of JSON output

diff --git a/af/8d5b888101b37108bcc971c551bbe09a062c6d b/af/8d5b888101b37108bcc971c551bbe09a062c6d
new file mode 100644 (file)
index 0000000..e0d1623
--- /dev/null
+++ b/af/8d5b888101b37108bcc971c551bbe09a062c6d
@@ -0,0 +1,97 @@
+Return-Path: <amdragon@mit.edu>\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 A0B69431FC0\r
+       for <notmuch@notmuchmail.org>; Fri, 18 Apr 2014 08:19:15 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\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 n-2H9veqhUFV for <notmuch@notmuchmail.org>;\r
+       Fri, 18 Apr 2014 08:19:10 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-4.mit.edu (dmz-mailsec-scanner-4.mit.edu\r
+       [18.9.25.15])\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 08579431FBD\r
+       for <notmuch@notmuchmail.org>; Fri, 18 Apr 2014 08:19:04 -0700 (PDT)\r
+X-AuditID: 1209190f-f790b6d000000c3a-42-535142655755\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+       (using TLS with cipher AES256-SHA (256/256 bits))\r
+       (Client did not present a certificate)\r
+       by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id CB.8C.03130.56241535; Fri, 18 Apr 2014 11:19:01 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+       by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id s3IFIxmD020798; \r
+       Fri, 18 Apr 2014 11:18:59 -0400\r
+Received: from drake.dyndns.org\r
+       (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [216.15.114.40]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s3IFIvYd027511\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Fri, 18 Apr 2014 11:18:58 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1WbAZ7-0006b8-2f; Fri, 18 Apr 2014 11:18:57 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/4] doc: Clarify charset encoding of JSON output\r
+Date: Fri, 18 Apr 2014 11:18:51 -0400\r
+Message-Id: <1397834332-25175-4-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.9.1\r
+In-Reply-To: <1397834332-25175-1-git-send-email-amdragon@mit.edu>\r
+References: <1397834332-25175-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixG6nopvqFBhscOY0t8X1mzOZHRg9nq26\r
+       xRzAGMVlk5Kak1mWWqRvl8CVMf/cBqaCN6wVe/edZ25gXMTSxcjJISFgIjG/5zQrhC0mceHe\r
+       erYuRi4OIYHZTBLnPs1gh3A2Mkpc+HeJGcK5wyRxZNsTsHYhgbmMEq1H9UFsNgENiW37lzOC\r
+       2CIC0hI7784GGsvBwSygJvGnSwUkLCzgKHHz9hJ2EJtFQFVi50+IK3gFHCSa+huhrpCTOHls\r
+       MpjNCVT/cnkL1CoHieevzjJNYORfwMiwilE2JbdKNzcxM6c4NVm3ODkxLy+1SNdELzezRC81\r
+       pXQTIyhoOCX5dzB+O6h0iFGAg1GJh/fiV/9gIdbEsuLK3EOMkhxMSqK8FTaBwUJ8SfkplRmJ\r
+       xRnxRaU5qcWHGCU4mJVEeHf/DQgW4k1JrKxKLcqHSUlzsCiJ8761tgoWEkhPLEnNTk0tSC2C\r
+       ycpwcChJ8FY7Ag0VLEpNT61Iy8wpQUgzcXCCDOcBGp4AUsNbXJCYW5yZDpE/xagoJc6b5wCU\r
+       EABJZJTmwfXCovoVozjQK8K800HaeYAJAa77FdBgJqDBf8+AXF1ckoiQkmpgZPU52nDKYvG+\r
+       5TON12v/2qvdWy+/unDZlxs/Td9v4X6Tf8HAVyTFLIVTSlOiWdgz1imzqY1pz5p9ClkHOv9d\r
+       vDChbo3XPqvbb3WcDwttEJoZtlSpQpRRL6z8+IEp7V0SAZkFXMm/H/y5JmP7bntB510d6ca5\r
+       AisFK42+RC43/fBq26vdt4p8lFiKMxINtZiLihMBTNk+U8UCAAA=\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: Fri, 18 Apr 2014 15:19:15 -0000\r
+\r
+---\r
+ doc/man1/notmuch-show.rst | 3 +++\r
+ 1 file changed, 3 insertions(+)\r
+\r
+diff --git a/doc/man1/notmuch-show.rst b/doc/man1/notmuch-show.rst\r
+index fdfb36d..b8b10b9 100644\r
+--- a/doc/man1/notmuch-show.rst\r
++++ b/doc/man1/notmuch-show.rst\r
+@@ -52,6 +52,9 @@ Supported options for **show** include\r
+             by default,\r
+             ``--format=json`` sets ``--entire-thread``. The caller can\r
+             disable this behaviour by setting ``--entire-thread=false``.\r
++            The JSON output is always encoded as UTF-8 and any message\r
++            content included in the output will be charset-converted to\r
++            UTF-8.\r
+ \r
+         **sexp**\r
+             The output is formatted as an S-Expression (sexp). This\r
+-- \r
+1.9.1\r
+\r