X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=13e2612d4fad63caa4368e6c7e128b3640e90701;hp=7e595e247e9f41960df94e01f027110b24859a91;hb=af8664689ac66b2ee79c904c6483f1172768da39;hpb=74168777cba27ad0e217399de4332ad576bd9398

diff --git a/notmuch.c b/notmuch.c
index 7e595e24..13e2612d 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -205,7 +205,7 @@ command_t commands[] = {
       "\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"
@@ -219,16 +219,11 @@ command_t commands[] = {
       "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"
-      "\n"
-      "\tIf no parameters are given, or the special search terms '' or\n"
-      "\t'*' are given, it will display the total number of messages in\n"
-      "\tthe database.\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.",
@@ -479,7 +474,7 @@ main (int argc, char *argv[])
 	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;
     }