updated ali-flist, with batch edit of others

[mmh] / man / inc.man

diff --git a/man/inc.man b/man/inc.man
index b2e5c7b..7a371cb 100644 (file)
--- a/man/inc.man
+++ b/man/inc.man
@@ -5,7 +5,7 @@
 .\" include the -mh macro file
 .so %etcdir%/tmac.h
 .\"
-.TH INC %manext1% MH.6.8 [%nmhversion%]
+.TH INC %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
 inc \- incorporate new mail
 .SH SYNOPSIS
@@ -32,6 +32,12 @@ inc
 \%[\-user\ username]
 \%[\-pack\ file]
 \%[\-nopack]
+\%[\-apop]
+\%[\-noapop]
+\%[\-kpop]
+\%[\-sasl]
+\%[\-saslmech\ mechanism]
+\%[\-snoop]
 .br
 %nmhendpop%
 \%[\-version]
@@ -113,11 +119,12 @@ and going on to other things.
 %nmhbeginpop%
 
 .Uh "Using POP"
-\fIinc\fR will normally check local mail drops for mail, as given
-above.  But if the option \*(lqpophost:\*(rq is set in the mts
-configuration file \*(lqmts.conf\*(rq, or if the `\-host\ hostname'
-switch is given, then \fIinc\fR will query this POP service host
-for mail to incorporate.
+\fIinc\fR will normally check local mail drops for mail, as covered above.  But
+if the option \*(lqpophost:\*(rq is set in \*(lqmts.conf\*(rq, or if the
+`\-host\ hostname' switch is given, or if the \fB$MAILHOST\fR environment
+variable is set, then \fIinc\fR will query this POP service host for mail to
+incorporate.  If \fB$MAILHOST\fR is set and \-host is specified as well, the
+commandline switch will override the environment variable.
 
 The default is for \fIinc\fR to assume that your account name on
 the POP server is the same as your current username.  To specify
@@ -145,6 +152,33 @@ maildrops.
 For debugging purposes, you may give the switch `\-snoop', which will
 allow you to watch the POP transaction take place between you and the
 POP server.
+
+If nmh has been compiled with APOP #defined, the `\-apop' switch will cause
+\fIinc\fR to use APOP rather than standard POP3 authentication.  Under APOP, a
+unique string (generally of the format
+<\fIpid\fR.\fItimestamp\fR@\fIhostname\fR>) is announced by the POP server.
+Rather than `USER \fIuser\fR', `PASS \fIpassword\fR', inc sends `APOP \fIuser\fR
+\fIdigest\fR', where digest is the MD5 hash of the unique string followed by a
+`secret' shared by client and server, essentially equivalent to the user's
+password (though an APOP-enabled POP3 server could have separate APOP and plain
+POP3 passwords for a single user).  `\-noapop' disables APOP in cases where it'd
+otherwise be used.
+
+If nmh has been compiled with KPOP #defined, the `\-kpop' switch will allow
+\fIinc\fR to use Kerberized POP rather than standard POP3 on a given invocation.
+If POPSERVICE was also #defined to "kpop", \fIinc\fR will be hardwired to always
+use KPOP.
+
+If nmh has been compiled with SASL support, the `\-sasl' switch will enable
+the use of SASL authentication.  Depending on the SASL mechanism used, this
+may require an additional password prompt from the user (but the
+\*(lq.netrc\*(rq file can be used to store this password).  The
+`\-saslmech' switch can be used to select a particular SASL mechanism.
+
+If SASL authentication is successful, \fIinc\fR will attempt to negotiate
+a security layer for session encryption.  Encrypted traffic is labelled
+with `(encrypted)' and `(decrypted)' when viewing the POP transaction
+with the `\-snoop' switch.
 %nmhendpop%
 .Fi
 ^$HOME/\&.mh\(ruprofile~^The user profile