Fix mutt -h output for -a/-- options

diff --git a/ChangeLog b/ChangeLog
index 2c2b89e56842d0a571c9be996fc6d5c0a7cd42be..cf9cfe0e94346b6f0907fe76c8bb07df6ad3583e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-07-29 13:26 -0700  Brendan Cully  <brendan@kublai.com>  (a2a4286491b4)
+
+       * hcache.c, hcache.h, imap/util.c: Harmonize hcache uidvalidity size
+       to unsigned int (per IMAP RFC). Closes #3296.
+
+2009-07-28 23:16 +0200  Rocco Rutte  <pdmef@gmx.net>  (153eac9e03e7)
+
+       * Makefile.am: Add group.h to distribution
+
+2009-07-28 23:06 +0200  Rocco Rutte  <pdmef@gmx.net>  (aff86191ad02)
+
+       * group.c, group.h, init.c, rfc822.c: Fix some issues with
+       ungroup [...] *
+
 2009-07-27 21:14 -0700  Kees Cook  <kees@outflux.net>  (2fc9348684fe)
 
        * mh.c: Properly propagate mh_read_sequences result. Closes #3308.

diff --git a/main.c b/main.c
index b8a93cceaad1967db5aedbf1873a3068e300cda8..efc7c223cc6286b22b81c36c2ee7a557f2ca42bb 100644 (file)
--- a/main.c
+++ b/main.c
@@ -111,8 +111,8 @@ static void mutt_usage (void)
 
   puts _(
 "usage: mutt [<options>] [-z] [-f <file> | -yZ]\n\
-       mutt [<options>] [-x] [-Hi <file>] [-s <subj>] [-bc <addr>] [-a <file> [...]] [--] <addr> [...]\n\
-       mutt [<options>] [-x] [-s <subj>] [-bc <addr>] [-a <file> [...]] [--] <addr> [...] < message\n\
+       mutt [<options>] [-x] [-Hi <file>] [-s <subj>] [-bc <addr>] [-a <file> [...] --] <addr> [...]\n\
+       mutt [<options>] [-x] [-s <subj>] [-bc <addr>] [-a <file> [...] --] <addr> [...] < message\n\
        mutt [<options>] -p\n\
        mutt [<options>] -A <alias> [...]\n\
        mutt [<options>] -Q <query> [...]\n\
@@ -149,8 +149,8 @@ options:\n\
   -z\t\texit immediately if there are no messages in the mailbox\n\
   -Z\t\topen the first folder with new message, exit immediately if none\n\
   -h\t\tthis help message");
-  puts _("  --\t\ttreat remaining arguments as addr even if starting with a dash\n\
-\t\twhen using -a with multiple filenames using -- is mandatory");
+  puts _("  --\t\tseparate filename(s) and recipients,\n\
+\t\twhen using -a, -- is mandatory");
 
   exit (0);
 }