--- /dev/null
+Return-Path: <markwalters1009@gmail.com>\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 92448431FD6\r
+ for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 11:25:34 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+ 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 aMnTpELF5RJr for <notmuch@notmuchmail.org>;\r
+ Tue, 24 Jul 2012 11:25:33 -0700 (PDT)\r
+Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com\r
+ [209.85.212.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 9FE7C431FD4\r
+ for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 11:25:32 -0700 (PDT)\r
+Received: by wibhq4 with SMTP id hq4so3314940wib.2\r
+ for <notmuch@notmuchmail.org>; Tue, 24 Jul 2012 11:25:29 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+ bh=XwYxQHrWw//V9o8kVkXF/p5WlovRVE14RJwt6Xamsdw=;\r
+ b=pg0zrz59+W0eNk8MenL5dpdjobYE48T5HG4T/bcIdS537lY2ycxH6SkmU2Ye2yAMMo\r
+ ZyF929/HobR85ZMiFe/CZk4eDpsFytahn9TYxiVwUUXOaWz/+0sEfcOfFm8qr/kvdI/f\r
+ rwph9tFRLYAA2cbg8QRT0vBsXjYAR1z7HMbSBkYfs8dsLfpMs2sifz7V6t2Ei9lAq2aw\r
+ acLOYuljvOK4IGXl5LGx1cbimoQbiHEeObtoxFeUs4i9dcfCkkfaaT8ahfplK608pwo5\r
+ s5nWJO7OnsmtfoiwJQQap3EGfwtnYrZMLxgQ6TaF98V7HFs0flo+8XGOeHRvAkGTD2Ay\r
+ Khvw==\r
+Received: by 10.180.100.133 with SMTP id ey5mr9286919wib.4.1343154329756;\r
+ Tue, 24 Jul 2012 11:25:29 -0700 (PDT)\r
+Received: from localhost (94-192-233-223.zone6.bethere.co.uk.\r
+ [94.192.233.223]) by mx.google.com with ESMTPS id\r
+ ep14sm6038684wid.0.2012.07.24.11.25.28 (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Tue, 24 Jul 2012 11:25:29 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 (rebased) 3/4] man: update man page for the new\r
+ --body=true|false option\r
+Date: Tue, 24 Jul 2012 19:23:29 +0100\r
+Message-Id: <1343154210-26841-4-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1343154210-26841-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1343154210-26841-1-git-send-email-markwalters1009@gmail.com>\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: Tue, 24 Jul 2012 18:25:34 -0000\r
+\r
+---\r
+ man/man1/notmuch-show.1 | 16 ++++++++++++++++\r
+ 1 files changed, 16 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1\r
+index b51a54c..506583a 100644\r
+--- a/man/man1/notmuch-show.1\r
++++ b/man/man1/notmuch-show.1\r
+@@ -152,6 +152,22 @@ The default is\r
+ \r
+ .RE\r
+ \r
++.RS 4\r
++.TP 4\r
++.B \-\-body=(true|false)\r
++\r
++If true (the default)\r
++.B notmuch show\r
++includes the bodies of the messages in the output; if false,\r
++bodies are omitted.\r
++.B --body=false\r
++is only implemented for the json format and it is incompatible with\r
++.B --part > 0.\r
++\r
++This is useful if the caller only needs the headers as body-less\r
++output is much faster and substantially smaller.\r
++.RE\r
++\r
+ A common use of\r
+ .B notmuch show\r
+ is to display a single thread of email messages. For this, use a\r
+-- \r
+1.7.9.1\r
+\r