Improve POP SASL error handling

[nmh] / man / inc.man

diff --git a/man/inc.man b/man/inc.man
index ad387e90d39e3fcaf26641eaf3bf9c9156cc4799..eb1b39116388ac130c9f5f2c2256a672b68ecb85 100644 (file)
--- a/man/inc.man
+++ b/man/inc.man
@@ -1,7 +1,7 @@
-.TH INC %manext1% "March 18, 2017" "%nmhversion%"
-.\"
+.TH INC %manext1% 2016-11-02 "%nmhversion%"
+.

 .\" %nmhwarning%
 .\" %nmhwarning%

-.\"
+.

 .SH NAME
 inc \- incorporate new mail to an nmh folder
 .SH SYNOPSIS
 .SH NAME
 inc \- incorporate new mail to an nmh folder
 .SH SYNOPSIS


@@ -12,7 +12,7 @@ inc \- incorporate new mail to an nmh folder
 .RB [ \-version ]
 .RI [ +folder ]
 .RB [ \-audit
 .RB [ \-version ]
 .RI [ +folder ]
 .RB [ \-audit

-.IR audit\-file ]
+.IR audit-file ]

 .RB [ \-noaudit ]
 .RB [ \-changecur " | " \-nochangecur ]
 .RB [ \-form
 .RB [ \-noaudit ]
 .RB [ \-changecur " | " \-nochangecur ]
 .RB [ \-form


@@ -31,9 +31,6 @@ inc \- incorporate new mail to an nmh folder
 .IR portname/number ]
 .RB [ \-user
 .IR username ]
 .IR portname/number ]
 .RB [ \-user
 .IR username ]

-.RB [ \-pack
-.IR file ]
-.RB [ \-nopack ]

 .RB [ \-proxy
 .IR command ]
 .RB [ \-sasl " | " \-nosasl ]
 .RB [ \-proxy
 .IR command ]
 .RB [ \-sasl " | " \-nosasl ]


@@ -41,6 +38,7 @@ inc \- incorporate new mail to an nmh folder
 .IR mechanism ]
 .RB [ \-authservice
 .IR service ]
 .IR mechanism ]
 .RB [ \-authservice
 .IR service ]

+.RB [ \-tls ]

 .RB [ \-initialtls ]
 .RB [ \-notls ]
 .RB [ \-certverify " | " \-nocertverify ]
 .RB [ \-initialtls ]
 .RB [ \-notls ]
 .RB [ \-certverify " | " \-nocertverify ]


@@ -87,7 +85,7 @@ mode will be preserved.
 .PP
 If the switch
 .B \-audit
 .PP
 If the switch
 .B \-audit

-.I audit\-file
+.I audit-file

 is specified (usually as a default switch in the user's profile), then
 .B inc
 will append a header line and a line per message to the specified
 is specified (usually as a default switch in the user's profile), then
 .B inc
 will append a header line and a line per message to the specified


@@ -112,7 +110,7 @@ and
 may also output audit information to this (or another) file, perhaps with
 .RI \*(lq Message\-Id \*(rq
 information to keep an exact correspondence history.
 may also output audit information to this (or another) file, perhaps with
 .RI \*(lq Message\-Id \*(rq
 information to keep an exact correspondence history.

-.RI \*(lq Audit\-file \*(rq
+.RI \*(lq Audit-file \*(rq

 is assumed to be in the user's nmh directory unless a full path is specified.
 .PP
 .B inc
 is assumed to be in the user's nmh directory unless a full path is specified.
 .PP
 .B inc


@@ -153,7 +151,9 @@ By using the
 switch, one can direct
 .B inc
 to incorporate messages from a file other than the user's mail drop.
 switch, one can direct
 .B inc
 to incorporate messages from a file other than the user's mail drop.

-Note that the named file will NOT be zeroed, unless the
+Note that the named file will
+.I not
+be zeroed, unless the

 .B \-truncate
 switch is given.
 .PP
 .B \-truncate
 switch is given.
 .PP


@@ -232,15 +232,6 @@ server.  The string
 .I %h
 in the command will be substituted by the hostname to connect to.
 .PP
 .I %h
 in the command will be substituted by the hostname to connect to.
 .PP

-When using POP, if the
-.B \-pack
-.I file
-switch is given then
-.B inc
-will
-.IR packf (1)
-the user's mail drop from the POP service host to the named file.
-.PP

 For debugging purposes, you may give the switch
 .BR \-snoop ,
 which will allow you to monitor the POP transaction.  If
 For debugging purposes, you may give the switch
 .BR \-snoop ,
 which will allow you to monitor the POP transaction.  If


@@ -267,9 +258,9 @@ 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
 Encrypted traffic is labelled with `(encrypted)' and `(decrypted)'
 when viewing the POP transaction with the
 .B \-snoop

-switch; see the
-.B post
-man page description of
+switch; see
+.IR post (8)'s
+description of

 .B \-snoop
 for its other features.
 .PP
 .B \-snoop
 for its other features.
 .PP


@@ -296,13 +287,22 @@ for more details.
 If
 .B nmh
 has been compiled with TLS support, the
 If
 .B nmh
 has been compiled with TLS support, the

+.B \-tls
+and

 .B \-initialtls
 .B \-initialtls

-switch will require the negotiation of TLS when connecting
-to the remote POP server.
+switches will require the negotiation of TLS when connecting
+to the remote POP server. The
+.B \-tls
+switch will direct

 .B inc
 .B inc

-will negotiate TLS immediately after the connection has taken place,
+to negotiate TLS as part of the normal POP protocol using
+the STLS command.  The
+.B \-initialtls
+switch will direct
+.B inc
+to negotiate TLS immediately after the connection has taken place,

 before any POP commands are sent or received.  Data encrypted by TLS is
 before any POP commands are sent or received.  Data encrypted by TLS is

-labeled `(tls-encrypted)' and `(tls-decrypted)` when viewing the POP
+labeled `(tls-encrypted)' and `(tls-decrypted)' when viewing the POP

 transaction with the
 .B \-snoop
 switch.  The
 transaction with the
 .B \-snoop
 switch.  The


@@ -383,8 +383,6 @@ is given.
 .TP
 \-width
 The width of the terminal.
 .TP
 \-width
 The width of the terminal.

-.TP
-\-nopack

 .PD
 .SH CONTEXT
 The folder into which messages are being incorporated will become the
 .PD
 .SH CONTEXT
 The folder into which messages are being incorporated will become the