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