Don't `else' after goto. Simplify control flow.

[nmh] / man / inc.man

diff --git a/man/inc.man b/man/inc.man
index b8a924546d9baac84c5bbc7939824d7273f3d49c..0d680ea833acb114ea45b152289bd60cc95b39f9 100644 (file)
--- a/man/inc.man
+++ b/man/inc.man
@@ -1,4 +1,4 @@
-.TH INC %manext1% "August 14, 2016" "%nmhversion%"
+.TH INC %manext1% "October 9, 2016" "%nmhversion%"

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


@@ -8,6 +8,8 @@ inc \- incorporate new mail
 .HP 5
 .na
 .B inc
 .HP 5
 .na
 .B inc

+.RB [ \-help ]
+.RB [ \-version ]

 .RI [ +folder ]
 .RB [ \-audit
 .IR audit\-file ]
 .RI [ +folder ]
 .RB [ \-audit
 .IR audit\-file ]


@@ -39,9 +41,9 @@ inc \- incorporate new mail
 .IR mechanism ]
 .RB [ \-authservice
 .IR service ]
 .IR mechanism ]
 .RB [ \-authservice
 .IR service ]

+.RB [ \-initialtls ]
+.RB [ \-notls ]

 .RB [ \-snoop ]
 .RB [ \-snoop ]

-.RB [ \-version ]
-.RB [ \-help ]

 .ad
 .SH DESCRIPTION
 .B Inc
 .ad
 .SH DESCRIPTION
 .B Inc


@@ -226,7 +228,7 @@ If passed the
 switch,
 .B inc
 will use the specified command to establish the connection to the POP
 switch,
 .B inc
 will use the specified command to establish the connection to the POP

-server. The string
+server.  The string

 .IR %h
 in the command will be substituted by the hostname to connect to.
 .PP
 .IR %h
 in the command will be substituted by the hostname to connect to.
 .PP


@@ -235,7 +237,7 @@ If
 uses POP, then the
 .B \-pack
 .I file
 uses POP, then the
 .B \-pack
 .I file

-switch is considered. If given, then
+switch is considered.  If given, then

 .B inc
 simply uses the POP to
 .B packf
 .B inc
 simply uses the POP to
 .B packf


@@ -245,7 +247,7 @@ 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.  If
 .BR \-snoop ,
 which will allow you to watch the POP transaction take place
 between you and the POP server.  If

-.B \-saslmech xoauth2
+.B \-sasl \-saslmech xoauth2

 is used, the HTTP transaction is also shown.
 .PP
 If
 is used, the HTTP transaction is also shown.
 .PP
 If


@@ -276,8 +278,10 @@ for its other features.
 If
 .B nmh
 has been compiled with OAuth support, the
 If
 .B nmh
 has been compiled with OAuth support, the

+.B \-sasl
+and

 .B \-saslmech xoauth2
 .B \-saslmech xoauth2

-switch will enable OAuth authentication.  The
+switches will enable OAuth authentication.  The

 .B \-user
 switch must be used, and the
 .I user-name
 .B \-user
 switch must be used, and the
 .I user-name


@@ -291,10 +295,21 @@ and grant authorization to that account.  See the
 .B mhlogin
 man page for more details.
 .PP
 .B mhlogin
 man page for more details.
 .PP

-Gmail only supports POP3 over TLS, but
-.B inc
-has no TLS support.  To work around this, use something like
-.B -proxy 'openssl s_client -connect %h:995 -CAfile /etc/ssl/certs/ca-certificates.crt -quiet'
+If
+.B nmh
+has been compiled with TLS support, the
+.B \-initialtls
+switch will require the negotiation of TLS when connecting
+to the remote POP server.  The
+.B \-initialtls
+switch will negotiate TLS immediately after the connection has taken place,
+before any POP commands are sent or received.  Data encrypted by TLS is
+labeled `(tls-encrypted)' and `(tls-decrypted)` with viewing the POP
+transaction with the
+.B \-snoop
+switch.  The
+.B \-notls
+switch will disable all attempts to negotiate TLS.

 .SH FILES
 .PD 0
 .TP 20
 .SH FILES
 .PD 0
 .TP 20