From: Austin Clements <amdragon@MIT.EDU>
Date: Fri, 18 Apr 2014 22:42:07 +0000 (-0400)
Subject: doc: Clarify charset encoding of JSON output
X-Git-Tag: 0.18_rc0~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a39a69ca0f617b86eae762ea475119653693737a;p=notmuch.git

doc: Clarify charset encoding of JSON output
---

diff --git a/doc/man1/notmuch-show.rst b/doc/man1/notmuch-show.rst
index 14d598ab..78196eea 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