1 Return-Path: <jrollins@finestructure.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id A32B9429E25
\r
6 for <notmuch@notmuchmail.org>; Mon, 31 Oct 2011 12:01:29 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id TWDl03jCmXW6 for <notmuch@notmuchmail.org>;
\r
16 Mon, 31 Oct 2011 12:01:29 -0700 (PDT)
\r
17 Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu
\r
19 by olra.theworths.org (Postfix) with ESMTP id 2ED2B431FD0
\r
20 for <notmuch@notmuchmail.org>; Mon, 31 Oct 2011 12:01:29 -0700 (PDT)
\r
21 Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1])
\r
22 by fire-doxen-postvirus (Postfix) with ESMTP id 0598032816C
\r
23 for <notmuch@notmuchmail.org>; Mon, 31 Oct 2011 12:01:28 -0700 (PDT)
\r
24 X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new
\r
25 Received: from finestructure.net (gwave-114.ligo.caltech.edu
\r
26 [131.215.114.114]) (Authenticated sender: jrollins) by fire-doxen-submit
\r
27 (Postfix) with ESMTP id 2C80D328173 for <notmuch@notmuchmail.org>; Mon, 31
\r
28 Oct 2011 12:01:26 -0700 (PDT)
\r
29 Received: by finestructure.net (Postfix, from userid 1000)
\r
30 id 04C204BF; Mon, 31 Oct 2011 12:01:26 -0700 (PDT)
\r
31 From: Jameson Graef Rollins <jrollins@finestructure.net>
\r
32 To: Notmuch Mail <notmuch@notmuchmail.org>
\r
33 Subject: [PATCH] Fix formatting for restore and dump help documentation.
\r
34 Date: Mon, 31 Oct 2011 12:01:25 -0700
\r
35 Message-Id: <1320087685-19782-1-git-send-email-jrollins@finestructure.net>
\r
36 X-Mailer: git-send-email 1.7.7
\r
37 In-Reply-To: <1319921715-23010-1-git-send-email-david@tethera.net>
\r
38 References: <1319921715-23010-1-git-send-email-david@tethera.net>
\r
39 X-BeenThere: notmuch@notmuchmail.org
\r
40 X-Mailman-Version: 2.1.13
\r
42 List-Id: "Use and development of the notmuch mail system."
\r
43 <notmuch.notmuchmail.org>
\r
44 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
45 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
46 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
47 List-Post: <mailto:notmuch@notmuchmail.org>
\r
48 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
49 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
50 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
51 X-List-Received-Date: Mon, 31 Oct 2011 19:01:29 -0000
\r
53 This normalizes the code and output formatting here to look like the
\r
54 rest of the help output.
\r
56 notmuch.c | 22 +++++++++++-----------
\r
57 1 files changed, 11 insertions(+), 11 deletions(-)
\r
59 diff --git a/notmuch.c b/notmuch.c
\r
60 index 3a51fee..14e5ad5 100644
\r
63 @@ -390,8 +390,8 @@ static command_t commands[] = {
\r
64 "\tdatabase will be generated. A \"--\" argument instructs\n"
\r
65 "\tnotmuch that the remaining arguments are search terms.\n"
\r
67 - "\tSee \"notmuch help search-terms\" for the search-term syntax.\n"
\r
69 + "\tSee \"notmuch help search-terms\" for details of the search\n"
\r
70 + "\tterms syntax." },
\r
71 { "restore", notmuch_restore_command,
\r
72 "[--accumulate] [<filename>]",
\r
73 "Restore the tags from the given dump file (see 'dump').",
\r
74 @@ -401,17 +401,17 @@ static command_t commands[] = {
\r
75 "\tSo if you've previously been using sup for mail, then the\n"
\r
76 "\t\"notmuch restore\" command provides you a way to import\n"
\r
77 "\tall of your tags (or labels as sup calls them).\n"
\r
78 - "\tSupported options for restore include\n"
\r
80 - "\t --accumulate\n"
\r
81 - "\t The union of the existing and new tags is applied, instead of\n"
\r
82 - "\t replacing each message's tags as they are read in from the\n"
\r
84 + "\tSupported options for restore include:\n"
\r
86 + "\t--accumulate\n"
\r
87 + "\t\tThe union of the existing and new tags is applied, instead of\n"
\r
88 + "\t\treplacing each message's tags as they are read in from the\n"
\r
89 + "\t\tdump file.\n"
\r
91 - "\t --match=<regex>\n"
\r
92 - "\t Add or delete only tags matching <regex>. Other tags in the\n"
\r
93 - "\t input (or the database) are ignored.\n"
\r
95 + "\t--match=<regex>\n"
\r
96 + "\t\tAdd or delete only tags matching <regex>. Other tags in the\n"
\r
97 + "\t\tinput (or the database) are ignored." },
\r
98 { "config", notmuch_config_command,
\r
99 "[get|set] <section>.<item> [value ...]",
\r
100 "Get or set settings in the notmuch configuration file.",
\r