--- /dev/null
+Return-Path: <david@tethera.net>\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 47878431FBF\r
+ for <notmuch@notmuchmail.org>; Tue, 28 Jan 2014 18:27:08 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+ 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 c5AEh2esiUlL for <notmuch@notmuchmail.org>;\r
+ Tue, 28 Jan 2014 18:27:03 -0800 (PST)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+ (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 8896A431FBD\r
+ for <notmuch@notmuchmail.org>; Tue, 28 Jan 2014 18:27:03 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+ (envelope-from <david@tethera.net>)\r
+ id 1W8Krk-000588-6t; Tue, 28 Jan 2014 22:27:00 -0400\r
+Received: (nullmailer pid 32308 invoked by uid 1000); Wed, 29 Jan 2014\r
+ 02:26:56 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re:\r
+In-Reply-To: <87fvo7btu8.fsf@qmul.ac.uk>\r
+References: <87vbxfkdex.fsf@zancas.localnet>\r
+ <1390925558-15873-1-git-send-email-david@tethera.net>\r
+ <87fvo7btu8.fsf@qmul.ac.uk>\r
+User-Agent: Notmuch/0.17+53~g3e1d7f6 (http://notmuchmail.org) Emacs/24.3.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Tue, 28 Jan 2014 22:26:56 -0400\r
+Message-ID: <87txcnjzf3.fsf@zancas.localnet>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Wed, 29 Jan 2014 02:27:08 -0000\r
+\r
+Mark Walters <markwalters1009@gmail.com> writes:\r
+\r
+>\r
+> The particular thing is the indentation for options (eg options in the\r
+> notmuch.1 page) In the original pages it looks like\r
+>\r
+> OPTIONS\r
+> Supported global options for notmuch include\r
+>\r
+> --help\r
+>\r
+> Print a synopsis of available commands and exit.\r
+>\r
+> and in the new ones\r
+>\r
+> OPTIONS\r
+> Supported global options for notmuch include\r
+>\r
+> --help\r
+>\r
+> Print a synopsis of available commands and exit.\r
+>\r
+> I find this makes it more difficult to scan the man page quickly.\r
+\r
+This rst is mainly autogenerated, and hence a bit ugly.\r
+\r
+This particular example doesn't seem too hard to fix; try replacing the\r
+relevant bit of notmuch.rst with\r
+\r
+\r
+Supported global options for \ **notmuch**\ include\r
+\r
+ \ --help\r
+ Print a synopsis of available commands and exit.\r
+\r
+ \ --version\r
+ Print the installed version of notmuch, and exit.\r
+\r
+ \ --config=FILE\r
+ Specify the configuration file to use. This overrides any\r
+ configuration file specified by ${NOTMUCH_CONFIG}.\r
+\r
+or\r
+\r
+Supported global options for \ **notmuch**\ include\r
+\r
+--help Print a synopsis of available commands and exit.\r
+\r
+--version Print the installed version of notmuch, and exit.\r
+\r
+--config=FILE Specify the configuration file to use. This overrides any\r
+ configuration file specified by ${NOTMUCH_CONFIG}.\r
+\r
+--help Print a synopsis of available commands and exit.\r
+\r
+\r
+The latter is an "option list" [1], so I guess is the most official way\r
+to do it.\r
+\r
+The former is a more generic "definition list" \r
+\r
+\r
+[1]\r
+http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#option-lists\r
+\r