Low-level corrections.

svn path=/trunk/; revision=2593

3 files changed, 14 insertions, 14 deletions

diff --git a/NEWS b/NEWS
index 76597fc2..ca718875 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ fetchmail-5.1.1 ():
 * Fix lexer to permit `antispam -1'.
 * John Cigas's delay patch to avoid a timing problem with plugins.
 * During IMAP authentication, canonicalize both name and password.
+* -A has been retired (goes with authenticate -> preauthenticate change).
 
 There are 266 people on fetchmail-friends and 444 on fetchmail-announce.
 
diff --git a/fetchmail.man b/fetchmail.man
index 2f144e2b..b5238d32 100644
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -288,7 +288,7 @@ as a spam-block response from the listener.  A value of -1 disables
 this option.  For the command-line option, the list values should
 be comma-separated.
 .TP
-.B \-m, \--mda <command>
+.B \-m <command>, \--mda <command>
 (Keyword: mda)
 You can force mail to be passed to an MDA directly (rather than
 forwarded to port 25) with the -mda or -m option.  Be aware that this
@@ -313,7 +313,7 @@ port \fImust\fR be explicitly specified (with a slash suffix) on each
 host in the smtphost hunt list) if this option is selected; the
 default port 25 will (in accordance with RFC 2033) not be accepted.
 .TP
-.B \--bsmtp
+.B \--bsmtp <filename>
 (keyword: bsmtp)
 Append fetched mail to a BSMTP file.  This simply contains the SMTP
 commands that would normally be generated by fetchmail when passing
@@ -324,7 +324,7 @@ correct; the caveats discussed under THE USE AND ABUSE OF MULTIDROP
 MAILBOXES below apply.
 .SS Resource Limit Control Options
 .TP
-.B \-l, --limit <maxbytes>
+.B \-l <maxbytes>, --limit <maxbytes>
 (Keyword: limit)
 Takes a maximum octet size argument.  Messages larger than this size
 will not be fetched, not be marked seen, and will be left on the
@@ -336,7 +336,7 @@ phone rates.  In daemon mode, oversize notifications are mailed to the
 calling user (see the --warnings option).  This option does not work
 with ETRN.
 .TP
-.B \-w, --warnings <interval>
+.B \-w <interval>, --warnings <interval>
 (Keyword: warnings)
 Takes an interval in seconds.  When you call
 .I fetchmail
@@ -348,7 +348,7 @@ the oversized message is detected.  Thereafter, renotification is
 suppressed until after the warning interval elapses (it will take
 place at the end of the first following poll).
 .TP
-.B -b, --batchlimit <count>
+.B -b <count>, --batchlimit <count>
 (Keyword: batchlimit)
 Specify the maximum number of messages that will be shipped to an SMTP
 listener before the connection is deliberately torn down and rebuilt
@@ -364,14 +364,14 @@ is processing very large batches.  Setting the batch limit to some
 nonzero size will prevent these delays.
 This option does not work with ETRN.
 .TP
-.B -B, --fetchlimit <number>
+.B -B <number>, --fetchlimit <number>
 (Keyword: fetchlimit)
 Limit the number of messages accepted from a given server in a single
 poll.  By default there is no limit. An explicit --fetchlimit of 0
 overrides any limits set in your run control file.
 This option does not work with ETRN.
 .TP
-.B -e, --expunge <count>
+.B -e <count>, --expunge <count>
 (keyword: expunge) 
 Arrange for deletions to be made final after a given number of
 messages.  Under POP2 or POP3, fetchmail cannot make deletions final
@@ -447,7 +447,7 @@ fetchmail runs with the effective GID set to that of the kmem group
 .I only
 when interface data is being collected.
 .TP
-.B \-A, --preauth <type>
+.B --preauth <type>
 (Keyword: preauth[enticate]) 
 This option permits you to specify a preauthentication type (see USER
 AUTHENTICATION below for details).  The possible values are
@@ -489,7 +489,7 @@ mail headers and want to know they can prevent it, but it is generally
 not a good idea to actually turn off rewrite.)
 When using ETRN, the rewrite option is ineffective.
 .TP
-.B -E, --envelope <line>
+.B -E <line>, --envelope <line>
 (Keyword: envelope)
 This option changes the header 
 .I fetchmail
@@ -501,7 +501,7 @@ Received lines.  This is the default, and it should not be necessary
 unless you have globally disabled Received parsing with `no envelope'
 in the \fI.fetchmailrc\fR file.
 .TP
-.B -Q, --qvirtual <prefix>
+.B -Q <prefix>, --qvirtual <prefix>
 (Keyword: qvirtual)
 The string prefix assigned to this option will be removed from the user
 name found in the header specified with the \fIenvelope\fR option
@@ -726,7 +726,7 @@ effect is to kill any running daemon before doing what the other
 options specify in combination with the rc file.
 .PP
 The
-.B -L
+.B -L <filename>
 or
 .B --logfile <filename>
 option (keyword: set logfile) allows you to redirect status messages
diff --git a/options.c b/options.c
index 3338323f..8db1840f 100644
--- a/options.c
+++ b/options.c
@@ -369,7 +369,6 @@ struct query *ctl;	/* option record to be initialized */
 	    ctl->server.port = xatoi(optarg, &errflag);
 #endif /* INET6 */
 	    break;
-	case 'A':
 	case LA_PREAUTH:
 	    if (strcmp(optarg, "password") == 0)
 		ctl->server.preauthenticate = A_PASSWORD;
@@ -585,7 +584,7 @@ struct query *ctl;	/* option record to be initialized */
 	P(_("  -p, --protocol    specify retrieval protocol (see man page)\n"));
 	P(_("  -U, --uidl        force the use of UIDLs (pop3 only)\n"));
 	P(_("  -P, --port        TCP/IP service port to connect to\n"));
-	P(_("  -A, --preauth     preauthentication type (password or kerberos)\n"));
+	P(_("      --preauth     preauthentication type (password or kerberos)\n"));
 	P(_("  -t, --timeout     server nonresponse timeout\n"));
 	P(_("  -E, --envelope    envelope address header\n"));
 	P(_("  -Q, --qvirtual    prefix to remove from local user id\n"));
@@ -608,7 +607,7 @@ struct query *ctl;	/* option record to be initialized */
 	P(_("  -b, --batchlimit  set batch limit for SMTP connections\n"));
 	P(_("  -B, --fetchlimit  set fetch limit for server connections\n"));
 	P(_("  -e, --expunge     set max deletions between expunges\n"));
-        P(_("      --mda         set MDA to use for forwarding\n"));
+        P(_("  -m, --mda         set MDA to use for forwarding\n"));
         P(_("      --bsmtp       set output BSMTP file\n"));
         P(_("      --lmtp        use LMTP (RFC2033) for delivery\n"));
 	P(_("  -r, --folder      specify remote folder name\n"));