From: Carl Worth Date: Fri, 2 Apr 2010 22:40:13 +0000 (-0700) Subject: Merge remote branch 'dme/dme-for-cworth' X-Git-Tag: 0.1~15 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=44df403ccd2fa637dfa543f749a949454245b182;p=notmuch.git Merge remote branch 'dme/dme-for-cworth' Conflicts: notmuch.c (Simply the change in documentation indentation level). --- 44df403ccd2fa637dfa543f749a949454245b182 diff --cc notmuch.c index b392c1c2,6ebe36db..f5669fcd --- a/notmuch.c +++ b/notmuch.c @@@ -224,81 -224,92 +224,92 @@@ command_t commands[] = "\t\tterms syntax." }, { "reply", notmuch_reply_command, "[options...] [...]", - "\t\tConstruct a reply template for a set of messages.", - "\t\tConstructs a new message as a reply to a set of existing\n" - "\t\tmessages. The Reply-To: header (if any, otherwise From:) is\n" - "\t\tused for the To: address. The To: and Cc: headers are copied,\n" - "\t\tbut not including any of the user's configured addresses.\n" + "Construct a reply template for a set of messages.", + "\tConstructs a new message as a reply to a set of existing\n" + "\tmessages. The Reply-To: header (if any, otherwise From:) is\n" + "\tused for the To: address. The To: and Cc: headers are copied,\n" + "\tbut not including any of the user's configured addresses.\n" "\n" - "\t\tA suitable subject is constructed. The In-Reply-to: and\n" - "\t\tReferences: headers are set appropriately, and the content\n" - "\t\tof the original messages is quoted and included in the body\n" - "\t\t(unless --format=headers-only is given).\n" + "\tA suitable subject is constructed. The In-Reply-to: and\n" + "\tReferences: headers are set appropriately, and the content\n" + "\tof the original messages is quoted and included in the body\n" + "\t(unless --format=headers-only is given).\n" "\n" - "\t\tThe resulting message template is output to stdout.\n" + "\tThe resulting message template is output to stdout.\n" "\n" - "\t\tSupported options for reply include:\n" + "\tSupported options for reply include:\n" "\n" - "\t\t--format=(default|headers-only)\n" + "\t--format=(default|headers-only)\n" "\n" - "\t\t\tdefault:\n" - "\t\t\t\tIncludes subject and quoted message body.\n" + "\t\tdefault:\n" + "\t\t\tIncludes subject and quoted message body.\n" "\n" - "\t\t\theaders-only:\n" - "\t\t\t\tOnly produces In-Reply-To, References, To\n" - "\t\t\t\tCc, and Bcc headers.\n" + "\t\theaders-only:\n" + "\t\t\tOnly produces In-Reply-To, References, To\n" + "\t\t\tCc, and Bcc headers.\n" "\n" - "\t\tSee \"notmuch help search-terms\" for details of the search\n" - "\t\tterms syntax." }, + "\tSee \"notmuch help search-terms\" for details of the search\n" + "\tterms syntax." }, { "tag", notmuch_tag_command, "+|- [...] [--] [...]", - "\t\tAdd/remove tags for all messages matching the search terms.", - "\t\tThe search terms are handled exactly as in 'search' so one\n" - "\t\tcan use that command first to see what will be modified.\n" - "\n" - "\t\tTags prefixed by '+' are added while those prefixed by\n" - "\t\t'-' are removed. For each message, tag removal is performed\n" - "\t\tbefore tag addition.\n" - "\n" - "\t\tThe beginning of is recognized by the first\n" - "\t\targument that begins with neither '+' nor '-'. Support for\n" - "\t\tan initial search term beginning with '+' or '-' is provided\n" - "\t\tby allowing the user to specify a \"--\" argument to separate\n" - "\t\tthe tags from the search terms.\n" - "\n" - "\t\tSee \"notmuch help search-terms\" for details of the search\n" - "\t\tterms syntax." }, + "Add/remove tags for all messages matching the search terms.", + "\tThe search terms are handled exactly as in 'search' so one\n" + "\tcan use that command first to see what will be modified.\n" + "\n" + "\tTags prefixed by '+' are added while those prefixed by\n" + "\t'-' are removed. For each message, tag removal is performed\n" + "\tbefore tag addition.\n" + "\n" + "\tThe beginning of is recognized by the first\n" + "\targument that begins with neither '+' nor '-'. Support for\n" + "\tan initial search term beginning with '+' or '-' is provided\n" + "\tby allowing the user to specify a \"--\" argument to separate\n" + "\tthe tags from the search terms.\n" + "\n" + "\tSee \"notmuch help search-terms\" for details of the search\n" + "\tterms syntax." }, { "dump", notmuch_dump_command, "[]", - "\t\tCreate a plain-text dump of the tags for each message.", - "\t\tOutput is to the given filename, if any, or to stdout.\n" - "\t\tThese tags are the only data in the notmuch database\n" - "\t\tthat can't be recreated from the messages themselves.\n" - "\t\tThe output of notmuch dump is therefore the only\n" - "\t\tcritical thing to backup (and much more friendly to\n" - "\t\tincremental backup than the native database files.)" }, + "Create a plain-text dump of the tags for each message.", + "\tOutput is to the given filename, if any, or to stdout.\n" + "\tThese tags are the only data in the notmuch database\n" + "\tthat can't be recreated from the messages themselves.\n" + "\tThe output of notmuch dump is therefore the only\n" + "\tcritical thing to backup (and much more friendly to\n" + "\tincremental backup than the native database files.)" }, { "restore", notmuch_restore_command, "", - "\t\tRestore the tags from the given dump file (see 'dump').", - "\t\tNote: The dump file format is specifically chosen to be\n" - "\t\tcompatible with the format of files produced by sup-dump.\n" - "\t\tSo if you've previously been using sup for mail, then the\n" - "\t\t\"notmuch restore\" command provides you a way to import\n" - "\t\tall of your tags (or labels as sup calls them)." }, + "Restore the tags from the given dump file (see 'dump').", + "\tNote: The dump file format is specifically chosen to be\n" + "\tcompatible with the format of files produced by sup-dump.\n" + "\tSo if you've previously been using sup for mail, then the\n" + "\t\"notmuch restore\" command provides you a way to import\n" + "\tall of your tags (or labels as sup calls them)." }, { "search-tags", notmuch_search_tags_command, "[ [...] ]", - "\t\tList all tags found in the database or matching messages.", - "\t\tRun this command without any search-term(s) to obtain a list\n" - "\t\tof all tags found in the database. If you provide one or more\n" - "\t\tsearch-terms as argument(s) then the resulting list will\n" - "\t\tcontain tags only from messages that match the search-term(s).\n" + "List all tags found in the database or matching messages.", + "\tRun this command without any search-term(s) to obtain a list\n" + "\tof all tags found in the database. If you provide one or more\n" + "\tsearch-terms as argument(s) then the resulting list will\n" + "\tcontain tags only from messages that match the search-term(s).\n" "\n" - "\t\tIn both cases the list will be alphabetically sorted." }, + "\tIn both cases the list will be alphabetically sorted." }, + { "part", notmuch_part_command, + "--part= ", - "\t\tOutput a single MIME part of a message.", - "\t\tA single decoded MIME part, with no encoding or framing,\n" - "\t\tis output to stdout. The search terms must match only a single\n" - "\t\tmessage, otherwise this command will fail.\n" - "\n" - "\t\tThe part number should match the part \"id\" field output\n" - "\t\tby the \"--format=json\" option of \"notmuch show\". If the\n" - "\t\tmessage specified by the search terms does not include a\n" - "\t\tpart with the specified \"id\" there will be no output." }, ++ "Output a single MIME part of a message.", ++ "\tA single decoded MIME part, with no encoding or framing,\n" ++ "\tis output to stdout. The search terms must match only a single\n" ++ "\tmessage, otherwise this command will fail.\n" ++ "\n" ++ "\tThe part number should match the part \"id\" field output\n" ++ "\tby the \"--format=json\" option of \"notmuch show\". If the\n" ++ "\tmessage specified by the search terms does not include a\n" ++ "\tpart with the specified \"id\" there will be no output." }, { "help", notmuch_help_command, "[]", - "\t\tThis message, or more detailed help for the named command.", - "\t\tExcept in this case, where there's not much more detailed\n" - "\t\thelp available." } + "This message, or more detailed help for the named command.", + "\tExcept in this case, where there's not much more detailed\n" + "\thelp available." } }; static void