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

diff --git a/man/inc.man b/man/inc.man
index c784f1b..78d499a 100644
--- a/man/inc.man
+++ b/man/inc.man
@@ -1,8 +1,7 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
-.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
@@ -24,7 +23,6 @@ inc \- incorporate new mail
 .RB [ \-truncate " | " \-notruncate ]
 .RB [ \-width
 .IR columns ]
-%nmhbeginpop%
 .RB [ \-host
 .IR hostname ]
 .RB [ \-user
@@ -32,13 +30,12 @@ inc \- incorporate new mail
 .RB [ \-pack
 .IR file ]
 .RB [ \-nopack ]
-.RB [ \-apop " | " \-noapop ]
-.RB [ \-kpop ]
+.RB [ \-proxy
+.IR command ]
 .RB [ \-sasl ]
 .RB [ \-saslmech
 .IR mechanism ]
 .RB [ \-snoop ]
-%nmhendpop%
 .RB [ \-version ]
 .RB [ \-help ]
 .ad
@@ -48,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 .
@@ -86,7 +91,7 @@ line per message to the end of the specified audit\-file with the format:
 .PP
 .RS 5
 .nf
-\*(<<inc\*(>> date
+<<inc>> date
 <scan line for first message>
 <scan line for second message>
 <etc.>
@@ -173,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
@@ -231,6 +235,16 @@ This
 .RI \*(lq .netrc \*(rq
 file should be owned and readable only by you.
 .PP
+If passed the
+.B \-proxy
+.I command
+switch,
+.B inc
+will use the specified command to establish the connection to the POP
+server. The string
+.IR %h
+in the command will be substituted by the hostname to connect to.
+.PP
 If
 .B inc
 uses POP, then the
@@ -252,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
@@ -305,12 +283,11 @@ Encrypted traffic is labelled with `(encrypted)' and `(decrypted)'
 when viewing the POP transaction with the
 .B \-snoop
 switch.
-%nmhendpop%
 
 .SH FILES
 .fc ^ ~
 .nf
-.ta \w'/usr/local/nmh/etc/ExtraBigFileName  'u
+.ta \w'%etcdir%/ExtraBigFileName  'u
 ^$HOME/\&.mh\(ruprofile~^The user profile
 ^%etcdir%/mts.conf~^nmh mts configuration file
 ^%mailspool%/$USER~^Location of mail drop
@@ -341,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
@@ -362,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.