X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=man%2Finc.man;h=78d499a7c80b702e40f72bb8a2c09c4540fda0bd;hb=809e4cb1458859eac403bf2e23d717c23a9cc892;hp=7e7a787a4c615c2e0a766bd3bd9deace859b5676;hpb=5dd6771b28c257af405d7248639ed0e3bcdce38b;p=mmh

diff --git a/man/inc.man b/man/inc.man
index 7e7a787..78d499a 100644
--- a/man/inc.man
+++ b/man/inc.man
@@ -1,7 +1,7 @@
 .\"
 .\" %nmhwarning%
 .\"
-.TH INC %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
+.TH INC %manext1% "%nmhdate%" MH.6.8 [%nmhversion%] XXX
 .SH NAME
 inc \- incorporate new mail
 .SH SYNOPSIS
@@ -23,7 +23,6 @@ inc \- incorporate new mail
 .RB [ \-truncate " | " \-notruncate ]
 .RB [ \-width
 .IR columns ]
-%nmhbeginpop%
 .RB [ \-host
 .IR hostname ]
 .RB [ \-user
@@ -33,13 +32,10 @@ inc \- incorporate new mail
 .RB [ \-nopack ]
 .RB [ \-proxy
 .IR command ]
-.RB [ \-apop " | " \-noapop ]
-.RB [ \-kpop ]
 .RB [ \-sasl ]
 .RB [ \-saslmech
 .IR mechanism ]
 .RB [ \-snoop ]
-%nmhendpop%
 .RB [ \-version ]
 .RB [ \-help ]
 .ad
@@ -49,6 +45,14 @@ incorporates mail from the user's incoming mail drop into
 an
 .B nmh
 folder.
+If the mail drop is a file, it can be in
+.B mbox
+or
+.B MMDF
+format.
+If the mail drop is a directory it will considered to be a
+.B Maildir
+format mail drop.
 .PP
 You may specify which folder to use with
 .IR +folder .
@@ -174,7 +178,6 @@ switch directs
 to be quiet and not ask any questions at all.  This is useful for putting
 .B inc
 in the background and going on to other things.
-%nmhbeginpop%
 .PP
 .SS "Using POP"
 .B inc
@@ -263,42 +266,6 @@ between you and the POP server.
 .PP
 If
 .B nmh
-has been compiled with APOP support, the
-.B \-apop
-switch will cause
-.B inc
-to use APOP rather than standard POP3 authentication.  Under APOP, a
-unique string (generally of the format
-.RI < pid . timestamp @ hostname >
-) is announced by the POP server.
-Rather than `USER
-.IR user ',
-`PASS
-.IR password ',
-.B inc
-sends `APOP
-.I user
-.IR digest ',
-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).
-.B \-noapop
-disables APOP in cases where it'd otherwise be used.
-.PP
-If
-.B nmh
-has been compiled with KPOP support, the
-.B \-kpop
-switch will allow
-.B inc
-to use Kerberized POP rather than standard POP3 on a given invocation.
-If POPSERVICE was also #defined to "kpop",
-.B inc
-will be hardwired to always use KPOP.
-.PP
-If
-.B nmh
 has been compiled with SASL support, the
 .B \-sasl
 switch will enable
@@ -316,7 +283,6 @@ Encrypted traffic is labelled with `(encrypted)' and `(decrypted)'
 when viewing the POP transaction with the
 .B \-snoop
 switch.
-%nmhendpop%
 
 .SH FILES
 .fc ^ ~
@@ -352,9 +318,7 @@ mhmail(1), scan(1), mh\-mail(5), post(8)
 .RB ` \-nosilent '
 .RB ` \-truncate "' if `" \-file " name' not given, `" \-notruncate "' otherwise"
 .RB ` \-width "' defaulted to the width of the terminal"
-%nmhbeginpop%
 .RB ` \-nopack '
-%nmhendpop%
 .fi
 
 .SH CONTEXT
@@ -373,4 +337,4 @@ switch must be interpreted as a single
 token by the shell that invokes
 .BR inc .
 Therefore, one must usually place the argument to this switch inside
-double\-quotes.
+quotes.