[PATCH] Fix formatting for restore and dump help documentation.

diff --git a/43/45010d3b00d765cc2ef2a5d1d517a00abc021b b/43/45010d3b00d765cc2ef2a5d1d517a00abc021b
new file mode 100644 (file)
index 0000000..cef31da
--- /dev/null
+++ b/43/45010d3b00d765cc2ef2a5d1d517a00abc021b
@@ -0,0 +1,103 @@
+Return-Path: <jrollins@finestructure.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 A32B9429E25\r
+       for <notmuch@notmuchmail.org>; Mon, 31 Oct 2011 12:01:29 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] 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 TWDl03jCmXW6 for <notmuch@notmuchmail.org>;\r
+       Mon, 31 Oct 2011 12:01:29 -0700 (PDT)\r
+Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu\r
+       [131.215.239.19])\r
+       by olra.theworths.org (Postfix) with ESMTP id 2ED2B431FD0\r
+       for <notmuch@notmuchmail.org>; Mon, 31 Oct 2011 12:01:29 -0700 (PDT)\r
+Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1])\r
+       by fire-doxen-postvirus (Postfix) with ESMTP id 0598032816C\r
+       for <notmuch@notmuchmail.org>; Mon, 31 Oct 2011 12:01:28 -0700 (PDT)\r
+X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new\r
+Received: from finestructure.net (gwave-114.ligo.caltech.edu\r
+ [131.215.114.114])    (Authenticated sender: jrollins)        by fire-doxen-submit\r
+ (Postfix) with ESMTP id 2C80D328173   for <notmuch@notmuchmail.org>; Mon, 31\r
+ Oct 2011 12:01:26 -0700 (PDT)\r
+Received: by finestructure.net (Postfix, from userid 1000)\r
+       id 04C204BF; Mon, 31 Oct 2011 12:01:26 -0700 (PDT)\r
+From: Jameson Graef Rollins <jrollins@finestructure.net>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH] Fix formatting for restore and dump help documentation.\r
+Date: Mon, 31 Oct 2011 12:01:25 -0700\r
+Message-Id: <1320087685-19782-1-git-send-email-jrollins@finestructure.net>\r
+X-Mailer: git-send-email 1.7.7\r
+In-Reply-To: <1319921715-23010-1-git-send-email-david@tethera.net>\r
+References: <1319921715-23010-1-git-send-email-david@tethera.net>\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: Mon, 31 Oct 2011 19:01:29 -0000\r
+\r
+This normalizes the code and output formatting here to look like the\r
+rest of the help output.\r
+---\r
+ notmuch.c |   22 +++++++++++-----------\r
+ 1 files changed, 11 insertions(+), 11 deletions(-)\r
+\r
+diff --git a/notmuch.c b/notmuch.c\r
+index 3a51fee..14e5ad5 100644\r
+--- a/notmuch.c\r
++++ b/notmuch.c\r
+@@ -390,8 +390,8 @@ static command_t commands[] = {\r
+       "\tdatabase will be generated. A \"--\" argument instructs\n"\r
+       "\tnotmuch that the remaining arguments are search terms.\n"\r
+       "\n"\r
+-      "\tSee \"notmuch help search-terms\" for the search-term syntax.\n"      \r
+- },\r
++      "\tSee \"notmuch help search-terms\" for details of the search\n"\r
++      "\tterms syntax." },\r
+     { "restore", notmuch_restore_command,\r
+       "[--accumulate] [<filename>]",\r
+       "Restore the tags from the given dump file (see 'dump').",\r
+@@ -401,17 +401,17 @@ static command_t commands[] = {\r
+       "\tSo if you've previously been using sup for mail, then the\n"\r
+       "\t\"notmuch restore\" command provides you a way to import\n"\r
+       "\tall of your tags (or labels as sup calls them).\n"\r
+-      "\tSupported options for restore include\n"\r
+       "\n"\r
+-      "\t    --accumulate\n"\r
+-      "\t      The union of the existing and new tags is applied, instead of\n"\r
+-      "\t      replacing each message's tags as they are read  in  from  the\n"\r
+-      "\t      dump file.\n"\r
++      "\tSupported options for restore include:\n"\r
++      "\n"\r
++      "\t--accumulate\n"\r
++      "\t\tThe union of the existing and new tags is applied, instead of\n"\r
++      "\t\treplacing each message's tags as they are read  in  from  the\n"\r
++      "\t\tdump file.\n"\r
+       "\n"\r
+-      "\t    --match=<regex>\n"\r
+-      "\t      Add or delete only tags matching <regex>.  Other tags in the\n"\r
+-      "\t      input (or the database) are ignored.\n"\r
+-    },\r
++      "\t--match=<regex>\n"\r
++      "\t\tAdd or delete only tags matching <regex>.  Other tags in the\n"\r
++      "\t\tinput (or the database) are ignored." },\r
+     { "config", notmuch_config_command,\r
+       "[get|set] <section>.<item> [value ...]",\r
+       "Get or set settings in the notmuch configuration file.",\r
+-- \r
+1.7.7\r
+\r