X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=man%2Finc.man;h=1dc958909980c52e0f2d035654e4ba1ab2e94f95;hp=7e7a787a4c615c2e0a766bd3bd9deace859b5676;hb=363190329760d38060e89956206583831b0d084d;hpb=5dd6771b28c257af405d7248639ed0e3bcdce38b

diff --git a/man/inc.man b/man/inc.man
index 7e7a787..1dc9589 100644
--- a/man/inc.man
+++ b/man/inc.man
@@ -23,23 +23,6 @@ inc \- incorporate new mail
 .RB [ \-truncate " | " \-notruncate ]
 .RB [ \-width
 .IR columns ]
-%nmhbeginpop%
-.RB [ \-host
-.IR hostname ]
-.RB [ \-user
-.IR username ]
-.RB [ \-pack
-.IR file ]
-.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
@@ -106,7 +89,7 @@ may also produce audits to this (or another) file, perhaps with
 information to keep an exact correspondence
 history.
 .RI \*(lq Audit\-file \*(rq
-will be in the user's nmh directory unless a full path is specified.
+will be in the current directory unless a full path is specified.
 .PP
 .B Inc
 will incorporate even improperly formatted messages into the
@@ -174,155 +157,12 @@ 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
-will normally check local mail drops for mail, as covered above.  But
-if the option
-.RI \*(lq pophost \*(rq
-is set in
-.RI \*(lq mts.conf \*(rq,
-or if the
-.B \-host
-.I hostname
-switch is given, or if the
-.B $MAILHOST
-environment variable is set, then
-.B inc
-will query this POP service host for mail to incorporate.  If
-.B $MAILHOST
-is set and
-.B \-host
-is specified as well, the commandline switch will override
-the environment variable.
-.PP
-The default is for
-.B inc
-to assume that your account name on
-the POP server is the same as your current username.  To specify
-a different username, use the
-.B \-user
-.I username
-switch.
-.PP
-When using POP, you will normally need to type the password for
-your account on the POP server, in order to retrieve your messages.
-It is possible to automate this process by creating a
-.RI \*(lq .netrc \*(rq
-file containing your login account information for this POP server.
-For each POP server, this file should have a line of the following
-form.  Replace the words
-.IR mypopserver ,
-.IR mylogin ,
-and
-.I mypassword
-with your own account information.
-.PP
-.RS 5
-.B machine
-.I mypopserver
-.B login
-.I mylogin
-.B password
-.I mypassword
-.RE
-.PP
-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
-.B \-pack
-.I file
-switch is considered. If given, then
-.B inc
-simply uses the POP to
-.B packf
-the user's maildrop from the POP service host to the named file.  This switch
-is provided for those users who prefer to use
-.B msh
-to read their maildrops.
-.PP
-For debugging purposes, you may give the switch
-.BR \-snoop ,
-which will allow you to watch the POP transaction take place
-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
-the use of SASL authentication.  Depending on the SASL mechanism used, this
-may require an additional password prompt from the user (but the
-.RI \*(lq .netrc \*(rq
-file can be used to store this password).  The
-.B \-saslmech
-switch can be used to select a particular SASL mechanism.
-.PP
-If SASL authentication is successful,
-.B inc
-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
-.B \-snoop
-switch.
-%nmhendpop%
 
 .SH FILES
 .fc ^ ~
 .nf
 .ta \w'%etcdir%/ExtraBigFileName  'u
-^$HOME/\&.mh\(ruprofile~^The user profile
+^$HOME/.mmh/profile~^The user profile
 ^%etcdir%/mts.conf~^nmh mts configuration file
 ^%mailspool%/$USER~^Location of mail drop
 .fi
@@ -332,7 +172,7 @@ switch.
 .nf
 .ta 2.4i
 .ta \w'ExtraBigProfileName  'u
-^Path:~^To determine the user's nmh directory
+^Path:~^To determine the user's mail storage
 ^Alternate\-Mailboxes:~^To determine the user's mailboxes
 ^Inbox:~^To determine the inbox, default \*(lqinbox\*(rq
 ^Folder\-Protect:~^To set mode when creating a new folder
@@ -352,9 +192,6 @@ 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