Fix a few man page issues.

- fix unterminated string in .IP macro
- fix .TH date format
- properly break line after .PP
- replace .br in table (unsupported by FreeBSD 12's mandoc)

FreeBSD Bug#241032 reported by Helge Oldach

2 files changed, 33 insertions, 24 deletions

diff --git a/NEWS b/NEWS
index 4e1687db..7672a5fe 100644
--- a/NEWS
+++ b/NEWS
@@ -63,7 +63,15 @@ removed from a 6.5.0 or newer release.)
 
 --------------------------------------------------------------------------------
 
-fetchmail-6.4.1 (released 2019-09-28, 27473 LoC):
+fetchmail 6.4.2 (not yet released):
+
+## BUG FIXES:
+* Fix three bugs in fetchmail.man (one unterminated string to .IP macro, one line
+  that ran into a .PP macro, .TH date format), and remove one .br request from
+  inside the table, which is unsupported by FreeBSD 12's mandoc(1) formatter.
+  FreeBSD Bug#241032, reported by Helge Oldach.
+
+fetchmail 6.4.1 (released 2019-09-28, 27473 LoC):
 
 ## REGRESSION FIXES:
 * The bug fix Debian Bug#941129 was incomplete and caused
diff --git a/fetchmail.man b/fetchmail.man
index d289a0fd..a306fe0b 100644
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -10,7 +10,7 @@
 .\" Load www macros to process .URL requests, this requires groff:
 .mso www.tmac
 .\"
-.TH fetchmail 1 "fetchmail 6.4.1" "fetchmail" "fetchmail reference manual"
+.TH fetchmail 1 2019-10-10 "fetchmail 6.4.1" "fetchmail reference manual"
 
 .SH NAME
 fetchmail \- fetch mail from a POP, IMAP, ETRN, or ODMR-capable server
@@ -61,7 +61,7 @@ env LC_ALL=C fetchmail \-vvv  \-\-nodetach \-\-nosyslog
 .IP
 (This command line actually runs fetchmail with verbose English output.)
 .PP
-Also see 
+Also see
 .URL "http://fetchmail.sourceforge.net/fetchmail-FAQ.html#G3" "item #G3 in fetchmail's FAQ"
 .PP
 You can omit the LC_ALL=C part above if you want output in the local
@@ -405,7 +405,7 @@ POP3, ETRN, or ODMR.
 .B \-\-tracepolls
 (Keyword: tracepolls)
 .br
-Tell fetchmail to poll trace information in the form 'polling 
+Tell fetchmail to poll trace information in the form 'polling
 account %s' and 'folder %s' to the Received line it generates,
 where the %s parts are replaced by the user's remote name, the poll
 label, and the folder (mailbox) where available (the Received header
@@ -498,7 +498,7 @@ and pretend that '\fBauto\fP' had been used instead.
 (default). Since v6.4.0. Require TLS. Auto-negotiate TLSv1 or newer, disable SSLv3 downgrade.
 (fetchmail 6.3.26 and older have auto-negotiated all protocols that
 their OpenSSL library supported, including the broken SSLv3).
-.IP "\&'\fBSSL23\fP'
+.IP \&'\fBSSL23\fP'
 see '\fBauto\fP'.
 .IP \&'\fBSSL3\fP'
 Require SSLv3 exactly. SSLv3 is broken, not supported on all systems, avoid it
@@ -732,18 +732,18 @@ addresses will be inserted into the MDA command wherever you place a
 an %F.
 
 \fBDo NOT enclose the %F or %T string in single quotes!\fP
-For both %T and %F, fetchmail encloses the addresses in single quotes 
-('), after removing any single quotes they may contain, before the MDA 
+For both %T and %F, fetchmail encloses the addresses in single quotes
+('), after removing any single quotes they may contain, before the MDA
 command is passed to the shell.
 
-\fBDo NOT use an MDA invocation that dispatches on the contents of 
-To/Cc/Bcc,\fP like "sendmail \-i \-t" or "qmail-inject", it will create 
-mail loops and bring the just wrath of many postmasters down upon your 
+\fBDo NOT use an MDA invocation that dispatches on the contents of
+To/Cc/Bcc,\fP like "sendmail \-i \-t" or "qmail-inject", it will create
+mail loops and bring the just wrath of many postmasters down upon your
 head.  This is one of the most frequent configuration errors!
 
-Also, do \fInot\fP try to combine multidrop mode with an MDA such 
-as maildrop that can only accept one address, unless your upstream 
-stores one copy of the message per recipient and transports the envelope 
+Also, do \fInot\fP try to combine multidrop mode with an MDA such
+as maildrop that can only accept one address, unless your upstream
+stores one copy of the message per recipient and transports the envelope
 recipient in a header; you will lose mail.
 
 The well-known
@@ -994,7 +994,7 @@ TLS with client authentication and specify \fBgssapi\fP or
 GSSAPI or K4.  Choosing KPOP protocol automatically selects Kerberos
 authentication.  This option does not work with ETRN.  GSSAPI service names are
 in line with RFC-2743 and IANA registrations, see
-.URL http://www.iana.org/assignments/gssapi-service-names/ "Generic Security Service Application Program Interface (GSSAPI)/Kerberos/Simple Authentication and Security Layer (SASL) Service Names" . 
+.URL http://www.iana.org/assignments/gssapi-service-names/ "Generic Security Service Application Program Interface (GSSAPI)/Kerberos/Simple Authentication and Security Layer (SASL) Service Names" .
 .SS Miscellaneous Options
 .TP
 .B \-f <pathname> | \-\-fetchmailrc <pathname>
@@ -1264,7 +1264,8 @@ capability response. Specify a user option value that looks like
 username and the part to the right as the NTLM domain.
 
 .SS Secure Socket Layers (SSL) and Transport Layer Security (TLS)
-.PP All retrieval protocols can use SSL or TLS wrapping for the
+.PP
+All retrieval protocols can use SSL or TLS wrapping for the
 transport. Additionally, POP3 and IMAP retrival can also negotiate
 SSL/TLS by means of STARTTLS (or STLS).
 .PP
@@ -1349,8 +1350,8 @@ polling interval.
 There are several ways to make fetchmail work in daemon mode. On the
 command line, \fB\-\-daemon\ <interval>\fP or \fB\-d\ <interval>\fP
 option runs \fBfetchmail\fP in daemon mode.  You must specify a numeric
-argument which is a polling interval (time to wait after completing a 
-whole poll cycle with the last server and before starting the next poll 
+argument which is a polling interval (time to wait after completing a
+whole poll cycle with the last server and before starting the next poll
 cycle with the first server) in seconds.
 .PP
 Example: simply invoking
@@ -1358,8 +1359,8 @@ Example: simply invoking
 fetchmail \-d 900
 .PP
 will, therefore, poll all the hosts described in your \fI~/.fetchmailrc\fP
-file (except those explicitly excluded with the 'skip' verb) a bit less 
-often than once every 15 minutes (exactly: 15 minutes + time that the 
+file (except those explicitly excluded with the 'skip' verb) a bit less
+often than once every 15 minutes (exactly: 15 minutes + time that the
 poll takes).
 .PP
 It is also possible to set a polling interval
@@ -1502,7 +1503,7 @@ The
 .B \-\-showdots
 option (keyword: set showdots) forces fetchmail to show progress dots
 even if the output goes to a file or fetchmail is not in verbose mode.
-Fetchmail shows the dots by default when run in \-\-verbose mode 
+Fetchmail shows the dots by default when run in \-\-verbose mode
 \fIand\fP output goes to console. This option is ignored in \-\-silent mode.
 .PP
 By specifying the
@@ -1891,7 +1892,7 @@ _
 user[name]	\-u	\&	T{
 This is the user description and must come first after server
 description and after possible server options, and before user options.
-.br
+
 It sets the remote user name if by itself or followed by 'there', or the
 local user name if followed by 'here'.
 T}
@@ -2872,11 +2873,11 @@ multiple names per userid gracefully).
 .IP \fBFETCHMAIL_DISABLE_CBC_IV_COUNTERMEASURE\fP
 (since v6.3.22):
 If this environment variable is set and not empty, fetchmail will disable
-a countermeasure against an SSL CBC IV attack (by setting 
+a countermeasure against an SSL CBC IV attack (by setting
 SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS).  This is a security risk, but may be
 necessary for connecting to certain non-standards-conforming servers.
 See fetchmail's NEWS file and fetchmail-SA-2012-01.txt for details.
-Earlier fetchmail versions (v6.3.21 and older) used to disable this 
+Earlier fetchmail versions (v6.3.21 and older) used to disable this
 countermeasure, but v6.3.22 no longer does that as a safety precaution.
 
 .IP \fBFETCHMAIL_POP3_FORCE_RETR\fP
@@ -3110,7 +3111,7 @@ RFC 2033.
 .TP 5
 GSSAPI:
 RFC 1508, RFC 1734,
-.URL http://www.iana.org/assignments/gssapi-service-names/ "Generic Security Service Application Program Interface (GSSAPI)/Kerberos/Simple Authentication and Security Layer (SASL) Service Names" . 
+.URL http://www.iana.org/assignments/gssapi-service-names/ "Generic Security Service Application Program Interface (GSSAPI)/Kerberos/Simple Authentication and Security Layer (SASL) Service Names" .
 .TP 5
 TLS:
 RFC 2595.