"\tthe given terms/phrases in the body, the subject, or any of\n"
"\tthe sender or recipient headers.\n"
"\n"
+ "\tAs a special case, a search string consisting of exactly a\n"
+ "\tsingle asterisk (\"*\") will match all messages.\n"
+ "\n"
"\tIn addition to free text, the following prefixes can be used\n"
"\tto force terms to match against specific portions of an email,\n"
"\t(where <brackets> indicate user-supplied values):\n"
"\n"
"\t\tFormat output as Javascript Object Notation (JSON).\n"
"\t\tJSON output always includes all messages in a matching,\n"
- "\t\tthread i.e. '--output=json' implies '--entire-thread'\n"
+ "\t\tthread i.e. '--format=json' implies '--entire-thread'\n"
"\n"
"\tA common use of \"notmuch show\" is to display a single\n"
"\tthread of email messages. For this, use a search term of\n"
"Count messages matching the search terms.",
"\tThe number of matching messages is output to stdout.\n"
"\n"
- "\tA common use of \"notmuch count\" is to display the count\n"
- "\tof messages matching both a specific tag and either inbox\n"
- "\tor unread\n"
+ "\tWith no search terms, a count of all messages in the database\n"
+ "\twill be displayed.\n"
"\n"
"\tSee \"notmuch help search-terms\" for details of the search\n"
- "\t\tterms syntax." },
+ "\tterms syntax." },
{ "reply", notmuch_reply_command,
"[options...] <search-terms> [...]",
"Construct a reply template for a set of messages.",
return notmuch_help_command (NULL, 0, NULL);
if (STRNCMP_LITERAL (argv[1], "--version") == 0) {
- printf ("notmuch version " STRINGIFY(NOTMUCH_VERSION) "\n");
+ printf ("notmuch " STRINGIFY(NOTMUCH_VERSION) "\n");
return 0;
}