python: Add UNSORTED as Query.SORT option

[notmuch] / notmuch.c

diff --git a/notmuch.c b/notmuch.c
index dcfda32123fbb7c457d9b55cfc107eea4e838153..13e2612d4fad63caa4368e6c7e128b3640e90701 100644 (file)
--- 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"
@@ -474,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;
     }