X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=man%2Finc.man;h=540b378629366ad7c420eb181ec9c69925dc561e;hb=c05210483d82bf5f3786725ff80e12444088a701;hp=a450a93ff898d382e018514d642944155c7fc370;hpb=9892129b33a8da3329f6331078a94a18ff8fe0e2;p=mmh

diff --git a/man/inc.man b/man/inc.man
index a450a93..540b378 100644
--- a/man/inc.man
+++ b/man/inc.man
@@ -1,12 +1,12 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH INC %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
 inc \- incorporate new mail
 .SH SYNOPSIS
 .HP 5
+.na
 .B inc
 .RI [ +folder ]
 .RB [ \-audit
@@ -15,7 +15,7 @@ inc \- incorporate new mail
 .RB [ \-changecur " | " \-nochangecur ]
 .RB [ \-form
 .IR formfile ]
-..RB [ \-format
+.RB [ \-format
 .IR string ]
 .RB [ \-file
 .IR name ]
@@ -31,8 +31,8 @@ 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 ]
@@ -40,6 +40,7 @@ inc \- incorporate new mail
 %nmhendpop%
 .RB [ \-version ]
 .RB [ \-help ]
+.ad
 .SH DESCRIPTION
 .B Inc
 incorporates mail from the user's incoming mail drop into
@@ -84,7 +85,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.>
@@ -229,6 +230,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
@@ -250,42 +261,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,14 +280,14 @@ when viewing the POP transaction with the
 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
+.fi
 
 .SH "PROFILE COMPONENTS"
 .fc ^ ~
@@ -325,11 +300,12 @@ switch.
 ^Folder\-Protect:~^To set mode when creating a new folder
 ^Msg\-Protect:~^To set mode when creating a new message and audit\-file
 ^Unseen\-Sequence:~^To name sequences denoting unseen messages
+.fi
 
 .SH "SEE ALSO"
 mhmail(1), scan(1), mh\-mail(5), post(8)
 
-.SH "DEFAULTS"
+.SH DEFAULTS
 .nf
 .RB ` +folder "' defaulted by \*(lqInbox\*(rq above"
 .RB ` \-noaudit '
@@ -341,6 +317,7 @@ mhmail(1), scan(1), mh\-mail(5), post(8)
 %nmhbeginpop%
 .RB ` \-nopack '
 %nmhendpop%
+.fi
 
 .SH CONTEXT
 The folder into which messages are being incorporated will become the