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

diff --git a/52/6b0f6c9bd5c84034ca6112e5a04385b81e8405 b/52/6b0f6c9bd5c84034ca6112e5a04385b81e8405
new file mode 100644 (file)
index 0000000..198255f
--- /dev/null
+++ b/52/6b0f6c9bd5c84034ca6112e5a04385b81e8405
@@ -0,0 +1,96 @@
+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 CDE80431FAF\r
+       for <notmuch@notmuchmail.org>; Fri, 18 Apr 2014 15:42:47 -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 I7rm36JYmqfe for <notmuch@notmuchmail.org>;\r
+       Fri, 18 Apr 2014 15:42:41 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-1.mit.edu (dmz-mailsec-scanner-1.mit.edu\r
+       [18.9.25.12])\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 59E2D431FBD\r
+       for <notmuch@notmuchmail.org>; Fri, 18 Apr 2014 15:42:16 -0700 (PDT)\r
+X-AuditID: 1209190c-f794a6d000000c27-70-5351aa46b16c\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+       (using TLS with cipher AES256-SHA (256/256 bits))\r
+       (Client did not present a certificate)\r
+       by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id B3.FD.03111.64AA1535; Fri, 18 Apr 2014 18:42:14 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+       by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id s3IMgCl3009367; \r
+       Fri, 18 Apr 2014 18:42:13 -0400\r
+Received: from drake.dyndns.org (26-4-172.dynamic.csail.mit.edu [18.26.4.172])\r
+       (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 s3IMgA0t028750\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Fri, 18 Apr 2014 18:42:12 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1WbHU2-0007bK-SZ; Fri, 18 Apr 2014 18:42:10 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 3/4] doc: Clarify charset encoding of JSON output\r
+Date: Fri, 18 Apr 2014 18:42:07 -0400\r
+Message-Id: <1397860928-29032-4-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.9.1\r
+In-Reply-To: <1397860928-29032-1-git-send-email-amdragon@mit.edu>\r
+References: <1397860928-29032-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrAIsWRmVeSWpSXmKPExsUixCmqreu2KjDYYMVMFYvrN2cyOzB6PFt1\r
+       izmAMYrLJiU1J7MstUjfLoErY9PXRsaCN6wV3buWMDUwLmLpYuTkkBAwkZg1+QojhC0mceHe\r
+       erYuRi4OIYHZTBKnnt5lh3A2Mkp8az/BClIlJHCESeLHk3CIxFxGieWL74Il2AQ0JLbtXw42\r
+       SkRAWmLn3dlAcQ4OZgE1iT9dKiBhYQEXiXmzToKFWQRUJdbOrQIJ8wo4SExZeYQN4gg5iZPH\r
+       JoOVcAo4Slz7JgSx1UGi/+pixgmM/AsYGVYxyqbkVunmJmbmFKcm6xYnJ+blpRbpGurlZpbo\r
+       paaUbmIEB4wkzw7GNweVDjEKcDAq8fBuCAgMFmJNLCuuzD3EKMnBpCTK+2gxUIgvKT+lMiOx\r
+       OCO+qDQntfgQowQHs5II79UuoBxvSmJlVWpRPkxKmoNFSZz3rbVVsJBAemJJanZqakFqEUxW\r
+       hoNDSYJ38UqgRsGi1PTUirTMnBKENBMHJ8hwHqDhT1eADC8uSMwtzkyHyJ9iVJQS560ASQiA\r
+       JDJK8+B6YRH9ilEc6BVh3hKQFTzAZADX/QpoMBPQ4L9nAkAGlyQipKQaGG1fec7ZrVVjuexr\r
+       U4btPc+XG7nPPfzzXXTDRVmB5dd2ee5bvGLv/6aLinv+XktXMTnPq5tmzH3Wf8X2itDAUmf5\r
+       G/kqi+4/e8g896dOSr1hXN4P/vzkdQ9X93hM9DhhYlnT+SGna8bPZrlXb7wXm8vlbfvycL14\r
+       24veRTs2Z39t5eRZYd3y0lOJpTgj0VCLuag4EQCWHHlxwwIAAA==\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 22:42:48 -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 14d598a..78196ee 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