Package: neomutt
Version: 20250113+dfsg-1
Severity: minor
Tags: patch

   * What led up to the situation?

     Checking for defects with a new version

test-[g|n]roff -mandoc -t -K utf8 -rF0 -rHY=0 -rCHECKSTYLE=10 -ww -z < "man 
page"

  [Use "groff -e ' $' -e '\\~$' <file>" to find obvious trailing spaces.]

  ["test-groff" is a script in the repository for "groff"; is not shipped]
(local copy and "troff" slightly changed by me).

  [The fate of "test-nroff" was decided in groff bug #55941.]

   * What was the outcome of this action?

Output from "test-groff  -mandoc -t -K utf8 -rF0 -rHY=0 -rCHECKSTYLE=10 -ww -z 
":

[Many lines of type:]

troff:<stdin>:219: warning: trailing space in the line
an.tmac:<stdin>:1632: style: use of deprecated macro: .PD

[One line of type:]

<stdin>:946: error: boxed table does not fit on page 9; use .TS H/.TH with a 
supporting macro package

   * What outcome did you expect instead?

     No output (no warnings).

-.-

  General remarks and further material, if a diff-file exist, are in the
attachments.


-- System Information:
Debian Release: trixie/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 6.12.12-amd64 (SMP w/2 CPU threads; PREEMPT)
Locale: LANG=is_IS.iso88591, LC_CTYPE=is_IS.iso88591 (charmap=ISO-8859-1), 
LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: sysvinit (via /sbin/init)

Versions of packages neomutt depends on:
ii  libc6                2.40-6
ii  libgnutls30t64       3.8.9-2
ii  libgpgme11t64        1.24.1-4
ii  libgsasl18           2.2.1-1+b2
ii  libgssapi-krb5-2     1.21.3-4
ii  libidn2-0            2.3.7-2+b1
ii  liblmdb0             0.9.31-1+b2
ii  liblua5.4-0          5.4.7-1+b2
ii  liblz4-1             1.10.0-3
ii  libncursesw6         6.5+20250125-2
ii  libnotmuch5t64       0.38.3-3+b2
ii  libpcre2-8-0         10.44-5
ii  libsqlite3-0         3.46.1-1
ii  libtinfo6            6.5+20250125-2
ii  libtokyocabinet9t64  1.4.48-15.1+b1
ii  libzstd1             1.5.6+dfsg-2
ii  sensible-utils       0.0.24
ii  zlib1g               1:1.3.dfsg+really1.3.1-1+b1

Versions of packages neomutt recommends:
ii  locales  2.40-6
ii  mailcap  3.74

Versions of packages neomutt suggests:
ii  aspell                                     0.60.8.1-3
ii  ca-certificates                            20241223
ii  exim4-daemon-light [mail-transport-agent]  4.98-3+b1
ii  gnupg                                      2.2.46-1
ii  ispell                                     3.4.06-1
ii  openssl                                    3.4.0-2
ii  python3                                    3.13.1-2
pn  urlview                                    <none>

Versions of packages neomutt is related to:
ii  neomutt  20250113+dfsg-1

-- no debconf information
Input file is neomuttrc.5

Output from "mandoc -T lint  neomuttrc.5": (shortened list)


Remove trailing space with: sed -e 's/  *$//'

  Many lines of type
       input text line longer than 80 bytes: "\f[CR]copiousoutput...
 Others:
      1 skipping paragraph macro: IP empty
      3 skipping paragraph macro: PP after SH
      4 skipping paragraph macro: PP after SS
      1 skipping paragraph macro: PP empty
    365 whitespace at end of input line

-.-.

Output from "test-groff -mandoc -t -ww -z neomuttrc.5": (shortened list)


Remove trailing space with: sed -e 's/  *$//'

      1 boxed table does not fit on page 9; use .TS H/.TH with a supporting 
macro package
    417 trailing space in the line

-.-.

Remove space characters (whitespace) at the end of lines.
Use "git apply ... --whitespace=fix" to fix extra space issues, or use
global configuration "core.whitespace".

Number of lines affected is

301

-.-.

Change '-' (\-) to '\(en' (en-dash) for a (numeric) range.
GNU gnulib has recently (2023-06-18) updated its
"build_aux/update-copyright" to recognize "\(en" in man pages.

neomuttrc.5:3090:Levels 1\-3 will usually provide enough information for 
writing a bug report.

-.-.

Use "\e" to print the escape character instead of "\\" (which gets
interpreted in copy mode).

1537:set abort_noattach_regex = "\\\\<attach(|ed|ments?)\\\\>"
1546:Default: "\\<(attach|attached|attachments?)\\>"
1982:Default: "\\n"
3185:using a tool like \f[CR]ansifilter\fP or \f[CR]sed 
's/^\\x1b]9;[0\-9]\\+\\x7//'\fP
3189:\f[CR]color body magenta default '^\\[\-\- .* \-\-\\]$'\fP.
5163:Neomutt supports all non\-alphanumeric values except for `\-`, `.`, `\\`, 
`/`.
5237:Default: "!^\\.[^.]"
6750:Default: "\\n"
6997:set preconnect="ssh \-f \-q \-L 1234:mailhost.net:143 mailhost.net \\
7212:Default: "^([ \\t]*[|>:}#])+"
7364:Default: "^((re|aw|sv)(\\[[0\-9]+\\])*:[ \\t]*)*"
7378:The initial \f[CR]"\\\\["\fP means a literal left\-bracket character.
7381:numbers.  \f[CR]"\\\\]"\fP means a literal right\-bracket.  Finally the
7386:tab.  Note \f[CR]"\\t"\fP is converted to a literal tab inside a
8188:reason for this is because many software packages use "\-\- \\n" to

-.-.

Use the word (in)valid instead of (il)legal,
if not related to legal matters.

See "www.gnu.org/prep/standards".

Think about translations into other languages!

neomuttrc.5:1697:following are legal values:
neomuttrc.5:2026:attribution strings.  Legal values are the strings your system
neomuttrc.5:6490:following are legal values:

-.-.

Change a HYPHEN-MINUS (code 0x2D) to a minus(-dash) (\-),
if it
is in front of a name for an option,
is a symbol for standard input,
is a single character used to indicate an option,
or is in the NAME section (man-pages(7)).
N.B. - (0x2D), processed as a UTF-8 file, is changed to a hyphen
(0x2010, groff \[u2010] or \[hy]) in the output.

171:Disposition is prefixed by either a \fB+\fP symbol or a \fB-\fP symbol. If 
it's
173:to qualify. If it's a \fB-\fP, you're saying that this disposition and MIME
394:and a \fBsave-hook\fP with its arguments, including %-expansion on
413:\fBfolder-hook\fP [\fI-noregex\fP] \fIregex\fP \fIcommand\fP
418:\fIcommand\fP is executed. The \fI-noregex\fP switch controls whether 
\fIregex\fP
551:\fBmailboxes\fP [[\fB-label\fP \fIlabel\fP] | \fB-nolabel\fP]
552:           [[\fB-notify\fP | \fB-nonotify\fP]
553:           [\fB-poll\fP | \fB-nopoll\fP]
563:The \fBnamed-mailboxes\fP is an alternative to \fBmailboxes\fP \fB-label\fP
598:\fBmbox-hook\fP [\fI-noregex\fP] \fIregex\fP \fImailbox\fP
603:that folder when the mail folder is left. The \fI-noregex\fP switch controls
759:and decremented "\fB-=\fP". String list \fIvariable\fPs use "\fB+=\fP" for
760:appending increment to the string list and "\fB-=\fP" for removal decrement 
from
993:\0~d \fIMIN\fP-\fIMAX\fP|T{
1091:\0~m \fIMIN\fP-\fIMAX\fP|T{
1103:\0~n \fIMIN\fP-\fIMAX\fP|T{
1127:\0~r \fIMIN\fP-\fIMAX\fP|T{
1167:\0~X \fIMIN\fP-\fIMAX\fP|T{
1184:\0~z \fIMIN\fP-\fIMAX\fP|T{
1234:The forms \(lq<\fIMAX\fP\(rq, \(lq>\fIMIN\fP\(rq, \(lq\fIMIN\fP-\(rq and
1377:.IR \fB~d\fP\~20 / 1 / 95 - 31 / 10
1389:.RI - dd / mm / YY ,
1392:.IR dd / mm / YY -,
1394:date with no dash (\(lq\fB-\fP\(rq), only messages sent/received on the 
given
1399:(\(lq\fB+\fP\(rq or \(lq\fB-\fP\(rq), followed by a digit, followed by one 
of
1444:.IR \fB~d\fP\~1 / 1 / 2001 \fB-\fP 1 \fBw+\fP 2 \fBw*\fP 3 \fBd\fP

-.-.

Find a repeated word

! 2831 --> an
! 2911 --> an

-.-.

Strings longer than 3/4 of a standard line length (80)
Use "\:" to split the string at the end of an output line, for example a
long URL (web address)

4101 Default: "unread,draft,flagged,passed,replied,attachment,signed,encrypted"
5110 Default: 
"~/.mailcap:/usr/share/neomutt/mailcap:/etc/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap"

-.-.

Add a "\&" after "e.g." and "i.e.", or use English words
(man-pages(7)).
Abbreviation points should be protected against being interpreted as
an end of sentence, if they are not, and that independent of the
current place on the line.

222:\fIkey\fP is the key (or key sequence) you wish to bind, e.g.
602:will be used as the \(lqmbox\(rq folder, i.e. read messages will be moved to
669:\fIregex\fP specifies which folders are taken as compressed (e.g.
830:is considered to be an executable program from which to read input, (e.g.
836:of a configuration file, e.g. from the prompt, then the filename is 
interpreted
891:e.g. \(lq\fBsubscribe-to\fP imaps://mail.example.org/inbox\(rq.
1206:messages in threads containing messages matching \fIPATTERN\fP, e.g. all
1211:messages whose immediate parent matches \fIPATTERN\fP, e.g. replies to your
1216:messages having an immediate child matching \fIPATTERN\fP, e.g. messages 
you
2454:terminals directcolor capability, e.g. "TERM=xterm\-direct".
2838:message is opened, i.e. via the \f[CR]<display\-message>\fP function.
3108:plain string or a regex. i.e. they don't contain a pattern, like 
\f[CR]~f\fP
3272:(e.g. To:, Cc:, Subject:).  Headers added in your editor must
3714:When forwarding inline (i.e. $mime_forward \fIunset\fP or
4177:Note that strings (e.g. commands) starting with a space are never recorded
4182:its immediate predecessor, e.g. executing the same command twice in a row
4341:side of an IMAP "AUTH=xxx" capability string, e.g. "digest\-md5", "gssapi"
4445:and not contain the colon, e.g. "X\-BOGOSITY X\-SPAM\-STATUS" for the
4789:Message tags (e.g. notmuch tags/imap flags)
4792:Individual message tag (e.g. notmuch tags/imap flags)
5101:personal taste. It's only used to customize network mailboxes (e.g. imap).
5147:programs interacting with the folder (e.g. dovecot) are moving new
5573:e.g. \f[CR][[s]news://][username[:password]@]server[:port]\fP
5694:modifying tags. All other NeoMutt commands use standard (e.g. maildir) 
flags.
5823:commands use standard (e.g. maildir) flags.
5835:modifying tags. All other NeoMutt commands use standard (e.g. maildir) 
flags.
5848:SASL mechanism, e.g. "digest\-md5", "gssapi" or "cram\-md5".
6241:(e.g. simply signed and ascii armored text).
6621:to specify your key (e.g. \f[CR]0x00112233\fP).
6795:SASL mechanism, e.g. "digest\-md5", "gssapi" or "cram\-md5".
6840:can also specify an alternative port, username and password, i.e.:
6922:not permissions to posting (e.g. moderated).  \fBNote:\fP if news server
6992:connections, e.g. with \f[CR]ssh(1)\fP. If the command returns a  nonzero
8230:simple_search applies to several functions, e.g. 
\f[CR]<delete\-pattern>\fP,
8693:try them.  Authentication methods are any SASL mechanism, e.g. "plain",

-.-.

Wrong distance between sentences in the input file.

  Separate the sentences and subordinate clauses; each begins on a new
line.  See man-pages(7) ("Conventions for source file layout") and
"info groff" ("Input Conventions").

  The best procedure is to always start a new sentence on a new line,
at least, if you are typing on a computer.

Remember coding: Only one command ("sentence") on each (logical) line.

E-mail: Easier to quote exactly the relevant lines.

Generally: Easier to edit the sentence.

Patches: Less unaffected text.

Search for two adjacent words is easier, when they belong to the same line,
and the same phrase.

  The amount of space between sentences in the output can then be
controlled with the ".ss" request.

Mark a final abbreviation point as such by suffixing it with "\&".

Some sentences (etc.) do not begin on a new line.

N.B.

  The number of lines affected can be too large to be in a patch.

[list of affected lines removed]

-.-

Split lines longer than 80 characters into two or more lines.
Appropriate break points are the end of a sentence and a subordinate
clause; after punctuation marks.

N.B.

  The number of lines affected can be too large to be in a patch.

[list of affected lines removed]

-.-.

Use \(en (en-dash) for a dash at the beginning (en) of a line,
or between space characters,
not a minus (\-) or a hyphen (-), except in the NAME section.

neomuttrc.5:1389:.RI - dd / mm / YY ,
neomuttrc.5:3513:\- 
neomuttrc.5:3950:\- if newsgroup not allowed for direct post (moderated for 
example)
neomuttrc.5:9164:\- 

-.-.

Do not use more than two space characters between sentences or (better)
only a new line character.

8214:outgoing messages.   If the filename ends with a pipe ("|"), it is

-.-.

The name of a man page is typeset in bold and the section in roman
(see man-pages(7)).

Change ...(1|2|3)\fP to ...\fP(1|2|3)

[List of affected lines removed]

-.-

Name of a manual is set in bold, the section in roman.
See man-pages(7).

8958:For OpenSSL, see ciphers(1) for the syntax of the string.
8961:start of the priority string.  See gnutls_priority_init(3) for the

-.-.

Put a parenthetical sentence, phrase on a separate line,
if not part of a code.
See man-pages(7), item "semantic newline".

Not considered in a patch, too many lines.

[list of affected lines removed]

-.-

Change a HYPHEN-MINUS (code 0x55, 2D) to a dash
(\-, minus) if it matches "[[:alph:]]-[[:alpha:]]" in the name of an
option).
Facilitates the copy and paste of
a) an option in UTF-8 text
b) web addresses (URL).

Is not needed in ordinary words like "mother-in-law", that are not
copied and pasted to a command line (which needs ASCII code)

367:\fBindex-format-hook\fP \fIname\fP [\fB!\fP]\fIpattern\fP 
\fIformat-string\fP
372:the injection. Index-format-hooks with the same \fIname\fP are matched
388:\fBfcc-save-hook\fP \fIpattern\fP \fImailbox\fP
393:\fBfcc-save-hook\fP is a shortcut, equivalent to doing both a \fBfcc-hook\fP
482:\f[CR]index-format-hook\fP, \f[CR]tag-transforms\fP Command
585:\fImailto:\fP specification in RFC2368, and the \fBCc\fP, \fBIn-Reply-To\fP,
885:\fBsubscribe-to\fP \fIimap-folder-uri\fP
886:\fBunsubscribe-from\fP \fIimap-folder-uri\fP
890:\fIimap-folder-uri\fP.  The argument must be an IMAP URI,
1173:\(lqIn-Reply-To:\(rq field
3110:The hooks are: fcc-hook, fcc-save-hook, index-format-hook, message-hook,
4901:"index-format-hook" command
4956:"save-hook", "fcc-hook" and "fcc-save-hook", too.
6090:checked with the \f[CR]<check-traditional-pgp>\fP function, NeoMutt will 
automatically

-.-.

Use a hyphen between a number and the unit (name) "bit",
see "man-pages(7)", item "Terms to avoid".

2451:When \fIset\fP, NeoMutt will use and allow 24bit colours (aka truecolor aka
2456:NeoMutt tries to detect whether the terminal supports 24bit colours and
2458:force 24bit colours by setting this variable manually.  You may also try to
6520:If \fIset\fP, use 64 bit PGP key IDs, if \fIunset\fP use the normal 32 bit 
key IDs.

-.-.

FSF office address update.  See
https://lists.gnu.org/archive/html/bug-gnulib/2024-09/msg00004.html

18:.\"     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
02110-1301, USA.

-.-.

Use a character "\(->" instead of plain "->" or "\->".

1755:When \fIset\fP, an arrow ("\->") will be used to indicate the current entry
1766:Default: "\->"

-.-.

No space is needed before a quote (") at the end of a macro line

219:.BR alias ", " attach ", " browser ", " compose ", " editor ", " generic ", 
"
268:.BR attach_\:headers ", "
269:.BR attachment ", "
270:.BR body ", "
271:.BR bold ", "
272:.BR error ", "
273:.BR hdrdefault ", "
274:.BR header ", "
275:.BR index ", "
276:.BR index_\:author ", "
277:.BR index_\:collapsed ", "
278:.BR index_\:date ", "
279:.BR index_\:flags ", "
280:.BR index_\:label ", "
281:.BR index_\:number ", "
282:.BR index_\:size ", "
283:.BR index_\:subject ", "
284:.BR index_\:tag ", "
285:.BR index_\:tags ", "
286:.BR indicator ", "
287:.BR markers ", "
288:.BR message ", "
289:.BR normal ", "
290:.BR progress ", "
291:.BR prompt ", "
292:.BR quoted ", "
293:.BR quoted\fIN\fP ", "
294:.BR search ", "
295:.BR signature ", "
296:.BR status ", "
297:.BR stripe_even ", "
299:.BR tilde ", "
300:.BR tree ", "
304:.BR sidebar_\:background ", "
305:.BR sidebar_\:divider ", "
306:.BR sidebar_\:flagged ", "
307:.BR sidebar_\:highlight ", "
308:.BR sidebar_\:indicator ", "
309:.BR sidebar_\:new ", "
310:.BR sidebar_\:ordinary ", "
327:.BR header ", " security_encrypt ", " security_sign ", "
331:.BR default ", "
332:.BR black ", "
333:.BR red ", "
334:.BR green ", "
335:.BR yellow ", "
336:.BR blue ", "
337:.BR magenta ", "
338:.BR cyan ", "
339:.BR white ", "
340:.BR #\fIRRGGBB\fP ", "
344:.BR none ", " bold ", " underline ", "
1882:Default: "%u%D%I %t%4n %T%d %> [%.7m/%.10M, %.6e%<C?, %C>, %s] "

-.-.

Remove quotes when there is a printable
but no space character between them
and the quotes are not for emphasis (markup),
for example as an argument to a macro.

28:.TH neomuttrc 5 "2025-01-13" Unix "User Manuals"
220:.BR index ", " mix ", " pager ", " pgp ", " postpone ", " query " and " 
smime "."
298:.BR stripe_odd ","
301:.BR underline "."
311:.BR sidebar_\:spool_file "."
341:.BR color\fIN\fP "."
680:.BR append-hook " \(aq" "\(rs.gz$" "\(aq \(dqgzip \-\-stdout \(aq" "%t" 
"\(aq >> \(aq" "%f" "\(aq\(dq"
681:.BR close-hook " \(aq" "\(rs.gz$" "\(aq \(dqgzip \-\-stdout \(aq" "%t" 
"\(aq > \(aq" "%f" "\(aq\(dq"
682:.BR open-hook " \(aq" "\(rs.gz$" "\(aq \(dqgzip \-\-stdout \-\-decompress 
\(aq" "%f" "\(aq > \(aq" "%t" "\(aq\(dq"
9976:.RI "\(bu the full manual, " "/usr/share/doc/neomutt/manual." { html , pdf 
, txt }

-.-.

Add lines to use the CR font for groff instead of CW.

.ie \n(.g .ft CR
.el .ft CW


22:.ft CW

-.-.

Section headings (.SH and .SS) do not need quoting.

86:.SS "\s-1Configuration Commands\s0"
933:.SS "\s-1Pattern Modifier\s0"
1295:.SS "\s-1Nesting and Boolean Operators\s0"
1359:.SS "\s-1Searching by Date\s0"

-.-.

Output from "test-groff  -mandoc -t -K utf8 -rF0 -rHY=0 -rCHECKSTYLE=10 -ww -z 
":

Line(s) of type:

troff:<stdin>:219: warning: trailing space in the line
<stdin>:946: error: boxed table does not fit on page 9; use .TS H/.TH with a 
supporting macro package
an.tmac:<stdin>:1632: style: use of deprecated macro: .PD
--- neomuttrc.5 2025-02-14 21:16:37.455071553 +0000
+++ neomuttrc.5.new     2025-02-15 06:34:59.456624999 +0000
@@ -19,13 +19,14 @@
 .\"
 .de EX
 .nf
-.ft CW
+.ie \\n(.g .ft CR
+..el ft CW
 ..
 .de EE
 .ft
 .fi
 ..
-.TH neomuttrc 5 "2025-01-13" Unix "User Manuals"
+.TH neomuttrc 5 2025-01-13 Unix "User Manuals"
 .\" --------------------------------------------------------------------
 .SH NAME
 .\" --------------------------------------------------------------------
@@ -34,7 +35,6 @@ neomuttrc \- Configuration file for the
 .\" --------------------------------------------------------------------
 .SH DESCRIPTION
 .\" --------------------------------------------------------------------
-.PP
 A NeoMutt configuration file consists of a series of \(lqcommands\(rq. Each
 line of the file may contain one or more commands. When multiple commands are
 used, they must be separated by a semicolon (\(lq\fB;\fP\(rq).
@@ -83,9 +83,8 @@ like sh and Bash: Prepend the name of th
 .\" --------------------------------------------------------------------
 .SH COMMANDS
 .\" --------------------------------------------------------------------
-.SS "\s-1Configuration Commands\s0"
+.SS \s-1Configuration Commands\s0
 .\" --------------------------------------------------------------------
-.PP
 The following are the commands understood by NeoMutt:
 .
 .PP
@@ -168,9 +167,9 @@ configure what kinds of attachments qual
 \fBinline\fP or \fBattachment\fP. You can abbreviate this to \fBI\fP or
 \fBA\fP.
 .IP
-Disposition is prefixed by either a \fB+\fP symbol or a \fB-\fP symbol. If it's
+Disposition is prefixed by either a \fB+\fP symbol or a \fB\-\fP symbol. If 
it's
 a \fB+\fP, you're saying that you want to allow this disposition and MIME type
-to qualify. If it's a \fB-\fP, you're saying that this disposition and MIME
+to qualify. If it's a \fB\-\fP, you're saying that this disposition and MIME
 type is an exception to previous \fB+\fP rules.
 .IP
 \fImime-type\fP is the MIME type of the attachment you want the command to
@@ -216,10 +215,10 @@ This command allows you to change the de
 \fImap\fP specifies in which menu the binding belongs. Multiple \fImap\fPs may
 be specified by separating them with commas (no additional whitespace is
 allowed). The currently defined \fImap\fPs are:
-.BR alias ", " attach ", " browser ", " compose ", " editor ", " generic ", "
-.BR index ", " mix ", " pager ", " pgp ", " postpone ", " query " and " smime 
"."
+.BR alias ", " attach ", " browser ", " compose ", " editor ", " generic ,
+.BR index ", " mix ", " pager ", " pgp ", " postpone ", " query " and " smime .
 .IP
-\fIkey\fP is the key (or key sequence) you wish to bind, e.g.
+\fIkey\fP is the key (or key sequence) you wish to bind, e.g.\&
 \(lq\fB\(rsCa\fP\(rq for control-A. In addition, \fIkey\fP may be specified as
 a three digit octal number prefixed with a \(lq\fB\(rs\fP\(rq or as a symbolic
 name. The \fB<what-key>\fP function can be used to explore keycode and
@@ -265,50 +264,50 @@ configuration file.
 If your terminal supports color, these commands can be used to assign
 \fIforeground\fP/\:\fIbackground\fP combinations to certain \fIobject\fPs. The
 currently defined \fIobject\fPs are:
-.BR attach_\:headers ", "
-.BR attachment ", "
-.BR body ", "
-.BR bold ", "
-.BR error ", "
-.BR hdrdefault ", "
-.BR header ", "
-.BR index ", "
-.BR index_\:author ", "
-.BR index_\:collapsed ", "
-.BR index_\:date ", "
-.BR index_\:flags ", "
-.BR index_\:label ", "
-.BR index_\:number ", "
-.BR index_\:size ", "
-.BR index_\:subject ", "
-.BR index_\:tag ", "
-.BR index_\:tags ", "
-.BR indicator ", "
-.BR markers ", "
-.BR message ", "
-.BR normal ", "
-.BR progress ", "
-.BR prompt ", "
-.BR quoted ", "
-.BR quoted\fIN\fP ", "
-.BR search ", "
-.BR signature ", "
-.BR status ", "
-.BR stripe_even ", "
-.BR stripe_odd ","
-.BR tilde ", "
-.BR tree ", "
-.BR underline "."
+.BR attach_\:headers ,
+.BR attachment ,
+.BR body ,
+.BR bold ,
+.BR error ,
+.BR hdrdefault ,
+.BR header ,
+.BR index ,
+.BR index_\:author ,
+.BR index_\:collapsed ,
+.BR index_\:date ,
+.BR index_\:flags ,
+.BR index_\:label ,
+.BR index_\:number ,
+.BR index_\:size ,
+.BR index_\:subject ,
+.BR index_\:tag ,
+.BR index_\:tags ,
+.BR indicator ,
+.BR markers ,
+.BR message ,
+.BR normal ,
+.BR progress ,
+.BR prompt ,
+.BR quoted ,
+.BR quoted\fIN\fP ,
+.BR search ,
+.BR signature ,
+.BR status ,
+.BR stripe_even ,
+.BR stripe_odd ,
+.BR tilde ,
+.BR tree ,
+.BR underline .
 .IP
 If the sidebar is enabled the following \fIobject\fPs are also valid:
-.BR sidebar_\:background ", "
-.BR sidebar_\:divider ", "
-.BR sidebar_\:flagged ", "
-.BR sidebar_\:highlight ", "
-.BR sidebar_\:indicator ", "
-.BR sidebar_\:new ", "
-.BR sidebar_\:ordinary ", "
-.BR sidebar_\:spool_file "."
+.BR sidebar_\:background ,
+.BR sidebar_\:divider ,
+.BR sidebar_\:flagged ,
+.BR sidebar_\:highlight ,
+.BR sidebar_\:indicator ,
+.BR sidebar_\:new ,
+.BR sidebar_\:ordinary ,
+.BR sidebar_\:spool_file .
 .IP
 The \fBbody\fP and \fBheader\fP objects allow you to restrict the colorization
 to a regular expression. The \fBindex-object\fP permits you to select colored
@@ -324,24 +323,24 @@ regex is given, only the matching parts
 number is given, only that sub-match of the regex is colored.
 .IP
 Valid composeobjects include
-.BR header ", " security_encrypt ", " security_sign ", "
+.BR header ", " security_encrypt ", " security_sign ,
 .BR security_both ", " security_none .
 .IP
 Valid colors include:
-.BR default ", "
-.BR black ", "
-.BR red ", "
-.BR green ", "
-.BR yellow ", "
-.BR blue ", "
-.BR magenta ", "
-.BR cyan ", "
-.BR white ", "
-.BR #\fIRRGGBB\fP ", "
-.BR color\fIN\fP "."
+.BR default ,
+.BR black ,
+.BR red ,
+.BR green ,
+.BR yellow ,
+.BR blue ,
+.BR magenta ,
+.BR cyan ,
+.BR white ,
+.BR #\fIRRGGBB\fP ,
+.BR color\fIN\fP .
 .IP
 Valid attributes include:
-.BR none ", " bold ", " underline ", "
+.BR none ", " bold ", " underline ,
 .BR reverse ", and " standout .
 .IP
 The \fBuncolor\fP command can be applied to the index, header and body objects
@@ -548,9 +547,9 @@ Missing key sequence in \fBunmacro\fP co
 .
 .PP
 .nf
-\fBmailboxes\fP [[\fB-label\fP \fIlabel\fP] | \fB-nolabel\fP]
-           [[\fB-notify\fP | \fB-nonotify\fP]
-           [\fB-poll\fP | \fB-nopoll\fP]
+\fBmailboxes\fP [[\fB\-label\fP \fIlabel\fP] | \fB\-nolabel\fP]
+           [[\fB\-notify\fP | \fB\-nonotify\fP]
+           [\fB\-poll\fP | \fB\-nopoll\fP]
            \fImailbox\fP] [ ... ]
 \fBnamed-mailboxes\fP \fIlabel\fP \fImailbox\fP [\fIlabel\fP \fImailbox\fP ... 
]
 \fBunmailboxes\fP { \fB*\fP | \fImailbox\fP ... }
@@ -560,7 +559,7 @@ The \fBmailboxes\fP specifies folders wh
 checked for new messages. When changing folders, pressing space will cycle
 through folders with new mail.
 .IP
-The \fBnamed-mailboxes\fP is an alternative to \fBmailboxes\fP \fB-label\fP
+The \fBnamed-mailboxes\fP is an alternative to \fBmailboxes\fP \fB\-label\fP
 \fIlabel\fP.  NeoMutt can be configured to display the label instead of the
 mailbox path.
 .IP
@@ -666,7 +665,7 @@ you compose. \fBunmy_hdr\fP will remove
 .fi
 .IP
 These commands provide a way to handle compressed folders. The given
-\fIregex\fP specifies which folders are taken as compressed (e.g.
+\fIregex\fP specifies which folders are taken as compressed (e.g.\&
 \(dq\fB\(rs.gz$\fP\(dq). The commands tell NeoMutt how to uncompress a folder
 (\fBopen-hook\fP), compress a folder (\fBclose-hook\fP) or append a compressed
 mail to a compressed folder (\fBappend-hook\fP). The \fIshell-command\fP is a
@@ -677,9 +676,9 @@ unintended shell expansions. Examples:
 .RS
 .IP
 .EX
-.BR append-hook " \(aq" "\(rs.gz$" "\(aq \(dqgzip \-\-stdout \(aq" "%t" "\(aq 
>> \(aq" "%f" "\(aq\(dq"
-.BR close-hook " \(aq" "\(rs.gz$" "\(aq \(dqgzip \-\-stdout \(aq" "%t" "\(aq > 
\(aq" "%f" "\(aq\(dq"
-.BR open-hook " \(aq" "\(rs.gz$" "\(aq \(dqgzip \-\-stdout \-\-decompress 
\(aq" "%f" "\(aq > \(aq" "%t" "\(aq\(dq"
+.BR append-hook " \(aq" \(rs.gz$ "\(aq \(dqgzip \-\-stdout \(aq" %t "\(aq >> 
\(aq" %f \(aq\(dq
+.BR close-hook " \(aq" \(rs.gz$ "\(aq \(dqgzip \-\-stdout \(aq" %t "\(aq > 
\(aq" %f \(aq\(dq
+.BR open-hook " \(aq" \(rs.gz$ "\(aq \(dqgzip \-\-stdout \-\-decompress \(aq" 
%f "\(aq > \(aq" %t \(aq\(dq
 .EE
 .RE
 .
@@ -756,8 +755,8 @@ NeoMutt knows four basic types of \fIvar
 list and quadoption. Boolean \fIvariable\fPs can be \fBset\fP (true), 
\fBunset\fP
 (false), or \fBtoggle\fPd. Number \fIvariable\fPs can be assigned a positive
 integer \fIvalue\fP. Value of number \fIvariable\fPs can be incremented 
"\fB+=\fP"
-and decremented "\fB-=\fP". String list \fIvariable\fPs use "\fB+=\fP" for
-appending increment to the string list and "\fB-=\fP" for removal decrement 
from
+and decremented "\fB\-=\fP". String list \fIvariable\fPs use "\fB+=\fP" for
+appending increment to the string list and "\fB\-=\fP" for removal decrement 
from
 the string list.
 .IP
 String \fIvariable\fPs consist of any number of printable characters and must
@@ -827,7 +826,7 @@ If the \fIfilename\fP begins with a tild
 the path of your home directory.
 .IP
 If the \fIfilename\fP ends with a vertical bar (\(lq|\(rq), then \fIfilename\fP
-is considered to be an executable program from which to read input, (e.g.
+is considered to be an executable program from which to read input, (e.g.\&
 \(lq\fBsource\fP\~\fI~/\:bin/\:myscript\fP|\(rq).
 .IP
 If the filename is relative and the command \fBsource\fP is executed from the
@@ -930,9 +929,8 @@ like \(lq\fBunhook\fP\~\fIsend-hook\fP\(
 .\" --------------------------------------------------------------------
 .SH PATTERNS
 .\" --------------------------------------------------------------------
-.SS "\s-1Pattern Modifier\s0"
+.SS \s-1Pattern Modifier\s0
 .\" --------------------------------------------------------------------
-.PP
 Many of NeoMutt's commands allow you to specify a pattern to match messages
 .RB ( limit ", " tag-pattern ", " delete-pattern ", the above mentioned " hook
 commands etc.). The table \(lq\fBPattern modifiers\fP\(rq shows several ways to
@@ -990,7 +988,7 @@ _
 deleted messages
 T}
 _
-\0~d \fIMIN\fP-\fIMAX\fP|T{
+\0~d \fIMIN\fP\(en\fIMAX\fP|T{
 messages with \(lqdate-sent\(rq in a date range
 T}
 _
@@ -1088,7 +1086,7 @@ messages with offsets (from selected mes
 \fIMAX\fP \fB*\fP)
 T}
 _
-\0~m \fIMIN\fP-\fIMAX\fP|T{
+\0~m \fIMIN\fP\(en\fIMAX\fP|T{
 message in the range \fIMIN\fP to \fIMAX\fP \fB*\fP)
 T}
 _
@@ -1100,7 +1098,7 @@ _
 new messages
 T}
 _
-\0~n \fIMIN\fP-\fIMAX\fP|T{
+\0~n \fIMIN\fP\(en\fIMAX\fP|T{
 messages with a score in the range \fIMIN\fP to \fIMAX\fP \fB**\fP)
 T}
 _
@@ -1124,7 +1122,7 @@ _
 read messages
 T}
 _
-\0~r \fIMIN\fP-\fIMAX\fP|T{
+\0~r \fIMIN\fP\(en\fIMAX\fP|T{
 messages with \(lqdate-received\(rq in a date range
 T}
 _
@@ -1164,7 +1162,7 @@ _
 newsgroups matching \fIEXPR\fP
 T}
 _
-\0~X \fIMIN\fP-\fIMAX\fP|T{
+\0~X \fIMIN\fP\(en\fIMAX\fP|T{
 messages with \fIMIN\fP to \fIMAX\fP attachments \fB**\fP)
 T}
 _
@@ -1181,7 +1179,7 @@ _
 messages whose tags match \fIEXPR\fP
 T}
 _
-\0~z \fIMIN\fP-\fIMAX\fP|T{
+\0~z \fIMIN\fP\(en\fIMAX\fP|T{
 messages with a size in the range \fIMIN\fP to \fIMAX\fP \fB**\fP) \fB***\fP)
 T}
 _
@@ -1231,18 +1229,16 @@ more general and powerful than the other
 section \(lq\fBMessage Ranges\fP\(rq in manual.
 T}
 \0\fB**\fP)|T{
-The forms \(lq<\fIMAX\fP\(rq, \(lq>\fIMIN\fP\(rq, \(lq\fIMIN\fP-\(rq and
-\(lq-\fIMAX\fP\(rq are allowed, too.
+The forms \(lq<\fIMAX\fP\(rq, \(lq>\fIMIN\fP\(rq, \(lq\fIMIN\fP\(en\(rq and
+\(lq\(en\fIMAX\fP\(rq are allowed, too.
 T}
 \0\fB***\fP)|T{
 The suffixes \(lqK\(rq and \(lqM\(rq are allowed to specify
 kilobyte and megabyte respectively.
 T}
 .TE
-.PP
 .ad
-.
-.PP
+.sp
 Special attention has to be paid when using regular expressions inside of
 patterns. Specifically, NeoMutt's parser for these patterns will strip one
 level of backslash (\(lq\fB\(rs\fP\(rq), which is normally used for quoting. If
@@ -1292,9 +1288,8 @@ string. This example matches messages wh
 Matching any defined alias:
 .BI @~f\~ .
 .
-.SS "\s-1Nesting and Boolean Operators\s0"
+.SS \s-1Nesting and Boolean Operators\s0
 .\" --------------------------------------------------------------------
-.PP
 Logical AND is performed by specifying more than one criterion.
 .IP
 For example:
@@ -1356,9 +1351,8 @@ two OR'd patterns:
 .BI ~f \~user@(home\(rs.org
 .RI "and " work\(rs.com) ". They are never what you want."
 .
-.SS "\s-1Searching by Date\s0"
+.SS \s-1Searching by Date\s0
 .\" --------------------------------------------------------------------
-.PP
 NeoMutt supports two types of dates, \fBabsolute\fP and \fBrelative\fP for
 the \(lq\fB~d\fP\(rq and \(lq\fB~r\fP\(rq pattern.
 .
@@ -1386,17 +1380,17 @@ as lying in the 21st century (i.e., \(lq
 .
 .PP
 If you omit the \fIMIN\fPimum (first) date, and just specify
-.RI - dd / mm / YY ,
+.RI \(en dd / mm / YY ,
 all messages before the given date will be selected. If you omit the
 \fIMAX\fPimum (second) date, and specify
 .IR dd / mm / YY -,
 all messages after the given date will be selected. If you specify a single
-date with no dash (\(lq\fB-\fP\(rq), only messages sent/received on the given
+date with no dash (\(lq\fB\-\fP\(rq), only messages sent/received on the given
 date will be selected.
 .
 .PP
 You can add error margins to absolute dates. An error margin is a sign
-(\(lq\fB+\fP\(rq or \(lq\fB-\fP\(rq), followed by a digit, followed by one of
+(\(lq\fB+\fP\(rq or \(lq\fB\-\fP\(rq), followed by a digit, followed by one of
 the units in table \(lq\fBDate units\fP\(rq below. As a special case, you can
 replace the sign by a \(lq\fB*\fP\(rq character, which is equivalent to giving
 identical plus and minus error margins.
@@ -1441,7 +1435,7 @@ It is possible to give multiple error ma
 .
 .IP
 which cumulate:
-.IR \fB~d\fP\~1 / 1 / 2001 \fB-\fP 1 \fBw+\fP 2 \fBw*\fP 3 \fBd\fP
+.IR \fB~d\fP\~1 / 1 / 2001 \fB\-\fP 1 \fBw+\fP 2 \fBw*\fP 3 \fBd\fP
 .
 .PP
 .nf
@@ -1534,7 +1528,7 @@ Example:
 
 .IP
 .EX
-set abort_noattach_regex = "\\\\<attach(|ed|ments?)\\\\>"
+set abort_noattach_regex = "\e\e<attach(|ed|ments?)\e\e>"
 
 .EE
 
@@ -1543,7 +1537,7 @@ set abort_noattach_regex = "\\\\<attach(
 .B abort_noattach_regex
 .nf
 Type: regular expression
-Default: "\\<(attach|attached|attachments?)\\>"
+Default: "\e<(attach|attached|attachments?)\e>"
 .fi
 .IP
 Specifies a regular expression to match against the body of the message, to
@@ -1627,7 +1621,7 @@ Default: "%3i %f%t %\-15a %\-56A | %C%>
 .fi
 .IP
 Specifies the format of the data displayed for the "alias" menu.  The
-following \f[CR]printf(3)\fP\-style sequences are available:
+following \f[CR]printf\fP(3)\-style sequences are available:
 .RS
 .PD 0
 .TP
@@ -1694,7 +1688,7 @@ Default: alias
 .fi
 .IP
 Specifies how the entries in the "alias" menu are sorted.  The
-following are legal values:
+following are valid values:
 .RS
 .PD 0
 .TP
@@ -1752,7 +1746,7 @@ Type: boolean
 Default: no
 .fi
 .IP
-When \fIset\fP, an arrow ("\->") will be used to indicate the current entry
+When \fIset\fP, an arrow ("\(->") will be used to indicate the current entry
 in menus instead of highlighting the whole line.  On slow network or modem
 links this will make response faster because there is less that has to
 be redrawn on the screen when moving to the next or previous entries
@@ -1763,7 +1757,7 @@ in the menu.
 .B arrow_string
 .nf
 Type: string
-Default: "\->"
+Default: "\(->"
 .fi
 .IP
 Specifies the string of arrow_cursor when arrow_cursor enabled.
@@ -1879,11 +1873,11 @@ of the value as shown above if included.
 .B attach_format
 .nf
 Type: string
-Default: "%u%D%I %t%4n %T%d %> [%.7m/%.10M, %.6e%<C?, %C>, %s] "
+Default: "%u%D%I %t%4n %T%d %> [%.7m/%.10M, %.6e%<C?, %C>, %s]"
 .fi
 .IP
 This variable describes the format of the "attachment" menu.  The
-following \f[CR]printf(3)\fP\-style sequences are understood:
+following \f[CR]printf\fP(3)\-style sequences are understood:
 .RS
 .PD 0
 .TP
@@ -1979,7 +1973,7 @@ the 'attach_save_dir' location without p
 .B attach_sep
 .nf
 Type: string
-Default: "\\n"
+Default: "\en"
 .fi
 .IP
 The separator to add between attachments when operating (saving,
@@ -2011,7 +2005,7 @@ This is the string that will precede a r
 quoted in the main body of the reply (this is the case when $include is
 set).
 .IP
-For a full listing of defined \f[CR]printf(3)\fP\-like sequences see the 
section
+For a full listing of defined \f[CR]printf\fP(3)\-like sequences see the 
section
 on $index_format.  See also $attribution_locale.
 
 
@@ -2022,8 +2016,8 @@ Type: string
 Default: ""
 .fi
 .IP
-The locale used by \f[CR]strftime(3)\fP to format dates in the
-attribution strings.  Legal values are the strings your system
+The locale used by \f[CR]strftime\fP(3) to format dates in the
+attribution strings.  Valid values are the strings your system
 accepts for the locale environment variable \f[CR]$LC_TIME\fP.
 .IP
 This variable is to allow the attribution date format to be
@@ -2046,7 +2040,7 @@ Similar to the $attribution_intro variab
 come after a replied\-to message which is quoted in the main body of the reply
 (this is the case when $include is set).
 .IP
-For a full listing of defined \f[CR]printf(3)\fP\-like sequences see the 
section
+For a full listing of defined \f[CR]printf\fP(3)\-like sequences see the 
section
 on $index_format.  See also $attribution_locale.
 
 
@@ -2118,7 +2112,7 @@ Default: "%4n %\-30a %20p %10s"
 .fi
 .IP
 This variable describes the format of the "autocrypt account" menu.
-The following \f[CR]printf(3)\fP\-style sequences are understood
+The following \f[CR]printf\fP(3)\-style sequences are understood
 .RS
 .PD 0
 .TP
@@ -2252,7 +2246,7 @@ names in the browser mailbox list, using
 shortcuts.
 .IP
 The default \f[CR]"alpha"\fP setting of $browser_sort uses
-locale\-based sorting (using \f[CR]strcoll(3)\fP), which ignores some
+locale\-based sorting (using \f[CR]strcoll\fP(3)), which ignores some
 punctuation.  This can lead to some situations where the order
 doesn't make intuitive sense.  In those cases, it may be
 desirable to \fIunset\fP this variable.
@@ -2448,14 +2442,14 @@ Type: boolean
 Default: no
 .fi
 .IP
-When \fIset\fP, NeoMutt will use and allow 24bit colours (aka truecolor aka
+When \fIset\fP, NeoMutt will use and allow 24-bit colours (aka truecolor aka
 directcolor).  For colours to work properly support from the terminal is
 required as well as a properly set TERM environment variable advertising the
 terminals directcolor capability, e.g. "TERM=xterm\-direct".
 .IP
-NeoMutt tries to detect whether the terminal supports 24bit colours and
+NeoMutt tries to detect whether the terminal supports 24-bit colours and
 enables this variable if it does.  If this fails for some reason, you can
-force 24bit colours by setting this variable manually.  You may also try to
+force 24-bit colours by setting this variable manually.  You may also try to
 force a certain TERM environment variable by starting NeoMutt from
 a terminal as follows (this results in wrong colours if the terminal does
 not implement directcolors):
@@ -2496,7 +2490,7 @@ Default: "\-\- NeoMutt: Compose  [Approx
 .IP
 Controls the format of the status line displayed in the "compose"
 menu.  This string is similar to $status_format, but has its own
-set of \f[CR]printf(3)\fP\-like sequences:
+set of \f[CR]printf\fP(3)\-like sequences:
 .RS
 .PD 0
 .TP
@@ -2828,7 +2822,7 @@ When set, NeoMutt will display protected
 and will update the index and header cache with revised headers.
 .IP
 Protected headers are stored inside the encrypted or signed part of an
-an email, to prevent disclosure or tampering.
+email, to prevent disclosure or tampering.
 For more information see https://github.com/autocrypt/protected\-headers
 Currently NeoMutt only supports the Subject header.
 .IP
@@ -2908,7 +2902,7 @@ When set, NeoMutt will generate protecte
 emails.
 .IP
 Protected headers are stored inside the encrypted or signed part of an
-an email, to prevent disclosure or tampering.
+email, to prevent disclosure or tampering.
 For more information see https://github.com/autocrypt/protected\-headers
 .IP
 Currently NeoMutt only supports the Subject header.
@@ -3040,7 +3034,7 @@ value of $date_format.  This allows for
 of the different menu needs.
 .IP
 This variable controls the format of the date printed by the "%d"
-sequence in $index_format.  This is passed to the \f[CR]strftime(3)\fP
+sequence in $index_format.  This is passed to the \f[CR]strftime\fP(3)
 function to process the date, see the man page for the proper syntax.
 .IP
 Unless the first character in the string is a bang ("!"), the month
@@ -3087,7 +3081,7 @@ Debug logging is controlled by the varia
 .IP
 The debug level controls how much information is saved to the log file.
 If you have a problem with NeoMutt, then enabling logging may help find the 
cause.
-Levels 1\-3 will usually provide enough information for writing a bug report.
+Levels 1\(en3 will usually provide enough information for writing a bug report.
 Levels 4,5 will be extremely verbose.
 .IP
 Warning: Logging at high levels may save private information to the file.
@@ -3182,11 +3176,11 @@ text.  They are of the form: \f[CR]<esc>
 64\-bit number.
 .IP
 If these escape sequences interfere with your filter, they can be removed
-using a tool like \f[CR]ansifilter\fP or \f[CR]sed 
's/^\\x1b]9;[0\-9]\\+\\x7//'\fP
+using a tool like \f[CR]ansifilter\fP or \f[CR]sed 
's/^\ex1b]9;[0\-9]\e+\ex7//'\fP
 .IP
 If they are removed, then PGP and MIME headers will no longer be coloured.
 This can be fixed by adding this to your config:
-\f[CR]color body magenta default '^\\[\-\- .* \-\-\\]$'\fP.
+\f[CR]color body magenta default '^\e[\-\- .* \-\-\e]$'\fP.
 
 
 .TP
@@ -3213,7 +3207,7 @@ set dsn_notify="failure,delay"
 .IP
 \fBNote:\fP when using $sendmail for delivery, you should not enable
 this unless you are either using Sendmail 8.8.x or greater or a MTA
-providing a \f[CR]sendmail(1)\fP\-compatible interface supporting the 
\f[CR]\-N\fP option
+providing a \f[CR]sendmail\fP(1)\-compatible interface supporting the 
\f[CR]\-N\fP option
 for DSN. For SMTP delivery, DSN support is auto\-detected so that it
 depends on the server whether DSN will be used or not.
 
@@ -3239,7 +3233,7 @@ set dsn_return=hdrs
 .IP
 \fBNote:\fP when using $sendmail for delivery, you should not enable
 this unless you are either using Sendmail 8.8.x or greater or a MTA
-providing a \f[CR]sendmail(1)\fP\-compatible interface supporting the 
\f[CR]\-R\fP option
+providing a \f[CR]sendmail\fP(1)\-compatible interface supporting the 
\f[CR]\-R\fP option
 for DSN. For SMTP delivery, DSN support is auto\-detected so that it
 depends on the server whether DSN will be used or not.
 
@@ -3510,7 +3504,7 @@ n
 The mail thread is New (Unread but not seen).
 .TP
 10 
-\- 
+\(en
 The mail is read \- %S expando.
 .TP
 11 
@@ -3553,7 +3547,7 @@ Default: "%2C %t %N %F %2l %\-8.8u %\-8.
 .IP
 This variable allows you to customize the file browser display to your
 personal taste.  This string is similar to $index_format, but has
-its own set of \f[CR]printf(3)\fP\-like sequences:
+its own set of \f[CR]printf\fP(3)\-like sequences:
 .RS
 .PD 0
 .TP
@@ -3626,7 +3620,7 @@ Owner name (or numeric uid, if missing)
 .TP
 %[fmt] 
   
-Date/time folder was last modified using an \f[CR]strftime(3)\fP expression
+Date/time folder was last modified using an \f[CR]strftime\fP(3) expression
 .TP
 %>X 
   
@@ -3727,7 +3721,7 @@ Default: "\-\-\-\-\- Forwarded message f
 .IP
 This is the string that will precede a message which has been forwarded
 in the main body of a message (when $mime_forward is unset).
-For a full listing of defined \f[CR]printf(3)\fP\-like sequences see
+For a full listing of defined \f[CR]printf\fP(3)\-like sequences see
 the section on $index_format.  See also $attribution_locale.
 
 
@@ -3740,7 +3734,7 @@ Default: "\-\-\-\-\- End forwarded messa
 .IP
 This is the string that will follow a message which has been forwarded
 in the main body of a message (when $mime_forward is unset).
-For a full listing of defined \f[CR]printf(3)\fP\-like sequences see
+For a full listing of defined \f[CR]printf\fP(3)\-like sequences see
 the section on $index_format.  See also $attribution_locale.
 
 
@@ -3906,7 +3900,7 @@ greeting phrase to the recipients.
 "Format strings" are similar to the strings used in the "C"
 function printf to format output (see the man page for more detail).
 The following sequences are defined in NeoMutt:
-.IP
+.sp
 .RS
 .PD 0
 .TP
@@ -3947,7 +3941,7 @@ Description of newsgroup (becomes from s
 Newsgroup name
 .TP
 %M  
-\- if newsgroup not allowed for direct post (moderated for example)
+\(en if newsgroup not allowed for direct post (moderated for example)
 .TP
 %N  
 N if newsgroup is new, u if unsubscribed, blank otherwise
@@ -4098,7 +4092,7 @@ when adding the domain part to addresses
 .B hidden_tags
 .nf
 Type: string list
-Default: "unread,draft,flagged,passed,replied,attachment,signed,encrypted"
+Default: 
"unread,\:draft,\:flagged,\:passed,\:replied,\:attachment,\:signed,\:encrypted"
 .fi
 .IP
 This variable specifies a list of comma\-separated private notmuch/imap tags
@@ -4205,7 +4199,7 @@ Default: "%s"
 .IP
 Controls the format of the entries of the history list.
 This string is similar to $index_format, but has its own
-set of \f[CR]printf(3)\fP\-like sequences:
+set of \f[CR]printf\fP(3)\-like sequences:
 .RS
 .PD 0
 .TP
@@ -4721,7 +4715,7 @@ The value of this option is ignored if $
 the quoting mechanism is strictly defined for format=flowed.
 .IP
 This option is a format string, please see the description of
-$index_format for supported \f[CR]printf(3)\fP\-style sequences.
+$index_format for supported \f[CR]printf\fP(3)\-style sequences.
 
 
 .TP
@@ -4735,7 +4729,7 @@ This variable allows you to customize th
 your personal taste.
 .IP
 "Format strings" are similar to the strings used in the C
-function \f[CR]printf(3)\fP to format output (see the man page for more 
details).
+function \f[CR]printf\fP(3) to format output (see the man page for more 
details).
 For an explanation of the %<...> construct, see the status_format description.
 The following sequences are defined in NeoMutt:
 .RS
@@ -4903,7 +4897,7 @@ insert and evaluate format\-string from
 %{fmt} 
 the date and time of the message is converted to sender's
 time zone, and "fmt" is expanded by the library function
-\f[CR]strftime(3)\fP; if the first character inside the braces
+\f[CR]strftime\fP(3); if the first character inside the braces
 is a bang ("!"), the date is formatted ignoring any locale
 settings.  Note that the sender's time zone might only be
 available as a numerical offset, so "%Z" behaves like "%z".
@@ -4913,12 +4907,12 @@ doesn't have a tm_gmtoff member.
 %[fmt] 
 the date and time of the message is converted to the local
 time zone, and "fmt" is expanded by the library function
-\f[CR]strftime(3)\fP; if the first character inside the brackets
+\f[CR]strftime\fP(3); if the first character inside the brackets
 is a bang ("!"), the date is formatted ignoring any locale settings.
 .TP
 %(fmt) 
 the local date and time when the message was received, and
-"fmt" is expanded by the library function \f[CR]strftime(3)\fP;
+"fmt" is expanded by the library function \f[CR]strftime\fP(3);
 if the first character inside the parentheses is a bang ("!"),
 the date is formatted ignoring any locale settings.
 .TP
@@ -5107,7 +5101,7 @@ This string is identical in formatting t
 .B mailcap_path
 .nf
 Type: string list
-Default: 
"~/.mailcap:/usr/share/neomutt/mailcap:/etc/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap"
+Default: 
"~/.mailcap:/usr/share/neomutt/mailcap:\:/etc/mailcap:\:/etc/mailcap:\:/usr/etc/mailcap:\:/usr/local/etc/mailcap"
 .fi
 .IP
 This variable specifies a list of colon\-separated files to consult when
@@ -5144,7 +5138,7 @@ Default: no
 .IP
 If \fIset\fP, NeoMutt will poll both the new and cur directories of
 a maildir folder for new messages.  This might be useful if other
-programs interacting with the folder (e.g. dovecot) are moving new
+programs interacting with the folder (e.g.\& dovecot) are moving new
 messages to the cur directory.  Note that setting this option may
 slow down polling for new messages in large folders, since NeoMutt has
 to scan all cur messages.
@@ -5160,7 +5154,7 @@ Default: ":"
 Use the value as maildir field delimiter. This is a single\-character used to
 accommodate maildir mailboxes on platforms where `:` is not allowed
 in a filename. The recommended alternative on such platforms is `;`.
-Neomutt supports all non\-alphanumeric values except for `\-`, `.`, `\\`, `/`.
+Neomutt supports all non\-alphanumeric values except for `\-`, `.`, `\e`, `/`.
 \fBNote:\fP this only applies to maildir\-style mailboxes. Setting
 it will have no effect on other mailbox types.
 
@@ -5173,7 +5167,7 @@ Default: yes
 .fi
 .IP
 Check for Maildir unaware programs other than NeoMutt having modified maildir
-files when the header cache is in use.  This incurs one \f[CR]stat(2)\fP per
+files when the header cache is in use.  This incurs one \f[CR]stat\fP(2) per
 message every time the folder is opened (which can be very slow for NFS
 folders).
 
@@ -5234,7 +5228,7 @@ Also see the $smart_wrap variable.
 .B mask
 .nf
 Type: regular expression
-Default: "!^\\.[^.]"
+Default: "!^\e.[^.]"
 .fi
 .IP
 A regular expression used in the file browser, optionally preceded by
@@ -5355,7 +5349,7 @@ Default: "%s"
 .IP
 This is the string displayed in the "attachment" menu for
 attachments of type \f[CR]message/rfc822\fP.  For a full listing of defined
-\f[CR]printf(3)\fP\-like sequences see the section on $index_format.
+\f[CR]printf\fP(3)\-like sequences see the section on $index_format.
 
 
 .TP
@@ -5570,7 +5564,7 @@ Default: ""
 This variable specifies domain name or address of NNTP server.
 .IP
 You can also specify username and an alternative port for each news server,
-e.g. \f[CR][[s]news://][username[:password]@]server[:port]\fP
+e.g.\& \f[CR][[s]news://][username[:password]@]server[:port]\fP
 .IP
 This option can also be set using the command line option "\-g", the
 environment variable \f[CR]$NNTPSERVER\fP, or putting the server name in the
@@ -5691,7 +5685,7 @@ Default: "flagged"
 .IP
 This variable specifies notmuch tag which is used for flagged messages. The
 variable is used to count flagged messages in DB and set the flagged flag when
-modifying tags. All other NeoMutt commands use standard (e.g. maildir) flags.
+modifying tags. All other NeoMutt commands use standard (e.g.\& maildir) flags.
 
 
 .TP
@@ -5820,7 +5814,7 @@ Default: "replied"
 .IP
 This variable specifies notmuch tag which is used for replied messages. The
 variable is used to set the replied flag when modifying tags. All other NeoMutt
-commands use standard (e.g. maildir) flags.
+commands use standard (e.g.\& maildir) flags.
 
 
 .TP
@@ -5832,7 +5826,7 @@ Default: "unread"
 .IP
 This variable specifies notmuch tag which is used for unread messages. The
 variable is used to count unread messages in DB and set the unread flag when
-modifying tags. All other NeoMutt commands use standard (e.g. maildir) flags.
+modifying tags. All other NeoMutt commands use standard (e.g.\& maildir) flags.
 
 
 .TP
@@ -5845,7 +5839,7 @@ Default: ""
 This is a colon\-delimited list of authentication methods NeoMutt may
 attempt to use to log in to a news server, in the order NeoMutt should
 try them.  Authentication methods are either "user" or any
-SASL mechanism, e.g. "digest\-md5", "gssapi" or "cram\-md5".
+SASL mechanism, e.g.\& "digest\-md5", "gssapi" or "cram\-md5".
 This option is case\-insensitive.  If it's \fIunset\fP (the default)
 NeoMutt will try all available methods, in order from most\-secure to
 least\-secure.
@@ -6050,7 +6044,7 @@ Default: "%2n %\-15e  %d"
 .fi
 .IP
 This variable describes the format of the "pattern completion" menu. The
-following \f[CR]printf(3)\fP\-style sequences are understood:
+following \f[CR]printf\fP(3)\-style sequences are understood:
 .RS
 .PD 0
 .TP
@@ -6160,7 +6154,7 @@ message.  Note that the use of this form
 \fBdeprecated\fP.
 .IP
 This is a format string, see the $pgp_decode_command command for
-possible \f[CR]printf(3)\fP\-like sequences.
+possible \f[CR]printf\fP(3)\-like sequences.
 Note that in this case, %r expands to the search string, which is a list of
 one or more quoted values such as email address, name, or keyid.
 (PGP only)
@@ -6176,7 +6170,7 @@ Default: ""
 This format strings specifies a command which is used to decode
 application/pgp attachments.
 .IP
-The PGP command formats have their own set of \f[CR]printf(3)\fP\-like 
sequences:
+The PGP command formats have their own set of \f[CR]printf\fP(3)\-like 
sequences:
 .RS
 .PD 0
 .TP
@@ -6213,7 +6207,7 @@ Default: ""
 This command is used to decrypt a PGP encrypted message.
 .IP
 This is a format string, see the $pgp_decode_command command for
-possible \f[CR]printf(3)\fP\-like sequences.
+possible \f[CR]printf\fP(3)\-like sequences.
 (PGP only)
 .IP
 Note: When decrypting messages using \f[CR]gpg\fP, a pinentry program needs to
@@ -6238,7 +6232,7 @@ message is only considered successfully
 from $pgp_decrypt_command contains the text.  This is used to
 protect against a spoofed encrypted message, with multipart/encrypted
 headers but containing a block that is not actually encrypted.
-(e.g. simply signed and ascii armored text).
+(e.g.\& simply signed and ascii armored text).
 .IP
 Note that if $pgp_check_gpg_decrypt_status_fd is set, this variable
 is ignored.
@@ -6272,7 +6266,7 @@ Default: ""
 This command is used to encrypt a body part without signing it.
 .IP
 This is a format string, see the $pgp_decode_command command for
-possible \f[CR]printf(3)\fP\-like sequences.
+possible \f[CR]printf\fP(3)\-like sequences.
 Note that in this case, %r expands to the search string, which is a list of
 one or more quoted values such as email address, name, or keyid.
 (PGP only)
@@ -6288,7 +6282,7 @@ Default: ""
 This command is used to both sign and encrypt a body part.
 .IP
 This is a format string, see the $pgp_decode_command command for
-possible \f[CR]printf(3)\fP\-like sequences.
+possible \f[CR]printf\fP(3)\-like sequences.
 (PGP only)
 
 
@@ -6302,7 +6296,7 @@ Default: "%4n %t%f %4l/0x%k %\-4a %2c %u
 This variable allows you to customize the PGP key selection menu to
 your personal taste. If $crypt_use_gpgme is \fIset\fP, then it applies
 to S/MIME key selection menu also. This string is similar to $index_format,
-but has its own set of \f[CR]printf(3)\fP\-like sequences:
+but has its own set of \f[CR]printf\fP(3)\-like sequences:
 .RS
 .PD 0
 .TP
@@ -6337,7 +6331,7 @@ Trust/validity of the key\-uid associati
 User id
 .TP
 %[<s>] 
-Date of the key where <s> is an \f[CR]strftime(3)\fP expression
+Date of the key where <s> is an \f[CR]strftime\fP(3) expression
 .TP
 %>X    
 Right justify the rest of the string and pad with character "X"
@@ -6368,7 +6362,7 @@ This command is used to export a public
 key ring.
 .IP
 This is a format string, see the $pgp_decode_command command for
-possible \f[CR]printf(3)\fP\-like sequences.
+possible \f[CR]printf\fP(3)\-like sequences.
 (PGP only)
 
 
@@ -6381,7 +6375,7 @@ Default: ""
 .IP
 This command is invoked whenever NeoMutt needs to fetch the public key 
associated with
 an email address.  Of the sequences supported by $pgp_decode_command, %r is
-the only \f[CR]printf(3)\fP\-like sequence used with this format.  Note that
+the only \f[CR]printf\fP(3)\-like sequence used with this format.  Note that
 in this case, %r expands to the email address, not the public key ID (the key 
ID is
 unknown, which is why NeoMutt is invoking this command).
 (PGP only)
@@ -6425,7 +6419,7 @@ This command is used to import a key fro
 the user's public key ring.
 .IP
 This is a format string, see the $pgp_decode_command command for
-possible \f[CR]printf(3)\fP\-like sequences.
+possible \f[CR]printf\fP(3)\-like sequences.
 (PGP only)
 
 
@@ -6450,7 +6444,7 @@ produces a different date format which m
 incorrect key generation dates.
 .IP
 This is a format string, see the $pgp_decode_command command for
-possible \f[CR]printf(3)\fP\-like sequences.
+possible \f[CR]printf\fP(3)\-like sequences.
 (PGP only)
 
 
@@ -6475,7 +6469,7 @@ produces a different date format which m
 incorrect key generation dates.
 .IP
 This is a format string, see the $pgp_decode_command command for
-possible \f[CR]printf(3)\fP\-like sequences.
+possible \f[CR]printf\fP(3)\-like sequences.
 (PGP only)
 
 
@@ -6487,7 +6481,7 @@ Default: address
 .fi
 .IP
 Specifies how the entries in the pgp menu are sorted. The
-following are legal values:
+following are valid values:
 .RS
 .PD 0
 .TP
@@ -6517,7 +6511,7 @@ Type: boolean
 Default: yes
 .fi
 .IP
-If \fIset\fP, use 64 bit PGP key IDs, if \fIunset\fP use the normal 32 bit key 
IDs.
+If \fIset\fP, use 64-bit PGP key IDs, if \fIunset\fP use the normal 32 bit key 
IDs.
 NOTE: Internally, NeoMutt has transitioned to using fingerprints (or long key 
IDs
 as a fallback).  This option now only controls the display of key IDs
 in the key selection menu and a few other places.
@@ -6618,7 +6612,7 @@ Default: ""
 If you have a different key pair to use for signing, you should
 set this to the signing key.  Most people will only need to set
 $pgp_default_key.  It is recommended that you use the keyid form
-to specify your key (e.g. \f[CR]0x00112233\fP).
+to specify your key (e.g.\& \f[CR]0x00112233\fP).
 (PGP only)
 
 
@@ -6633,7 +6627,7 @@ This command is used to create the detac
 \f[CR]multipart/signed\fP PGP/MIME body part.
 .IP
 This is a format string, see the $pgp_decode_command command for
-possible \f[CR]printf(3)\fP\-like sequences.
+possible \f[CR]printf\fP(3)\-like sequences.
 (PGP only)
 
 
@@ -6670,7 +6664,7 @@ Type: boolean
 Default: yes
 .fi
 .IP
-If \fIset\fP, NeoMutt expects a \f[CR]gpg\-agent(1)\fP process will handle
+If \fIset\fP, NeoMutt expects a \f[CR]gpg\-agent\fP(1) process will handle
 private key passphrase prompts.  If \fIunset\fP, NeoMutt will prompt
 for the passphrase and pass it via stdin to the pgp command.
 .IP
@@ -6698,7 +6692,7 @@ Default: ""
 This command is used to verify PGP signatures.
 .IP
 This is a format string, see the $pgp_decode_command command for
-possible \f[CR]printf(3)\fP\-like sequences.
+possible \f[CR]printf\fP(3)\-like sequences.
 (PGP only)
 
 
@@ -6713,7 +6707,7 @@ This command is used to verify key infor
 menu.
 .IP
 This is a format string, see the $pgp_decode_command command for
-possible \f[CR]printf(3)\fP\-like sequences.
+possible \f[CR]printf\fP(3)\-like sequences.
 (PGP only)
 
 
@@ -6747,7 +6741,7 @@ controls whether NeoMutt will weed heade
 .B pipe_sep
 .nf
 Type: string
-Default: "\\n"
+Default: "\en"
 .fi
 .IP
 The separator to add between messages when piping a list of tagged
@@ -6792,7 +6786,7 @@ Default: ""
 This is a colon\-separated list of authentication methods NeoMutt may
 attempt to use to log in to an POP server, in the order NeoMutt should
 try them.  Authentication methods are either "user", "apop" or any
-SASL mechanism, e.g. "digest\-md5", "gssapi" or "cram\-md5".
+SASL mechanism, e.g.\& "digest\-md5", "gssapi" or "cram\-md5".
 This option is case\-insensitive. If this option is \fIunset\fP
 (the default) NeoMutt will try all available methods, in order from
 most\-secure to least\-secure.
@@ -6919,7 +6913,7 @@ Default: ask\-yes
 .fi
 .IP
 If set to \fIyes\fP, NeoMutt will post article to newsgroup that have
-not permissions to posting (e.g. moderated).  \fBNote:\fP if news server
+not permissions to posting (e.g.\& moderated).  \fBNote:\fP if news server
 does not support posting to that newsgroup or totally read\-only, that
 posting will not have an effect.
 
@@ -6989,12 +6983,12 @@ Default: ""
 .IP
 If \fIset\fP, a shell command to be executed if NeoMutt fails to establish
 a connection to the server. This is useful for setting up secure
-connections, e.g. with \f[CR]ssh(1)\fP. If the command returns a  nonzero
+connections, e.g.\& with \f[CR]ssh\fP(1). If the command returns a  nonzero
 status, NeoMutt gives up opening the server. Example:
 
 .IP
 .EX
-set preconnect="ssh \-f \-q \-L 1234:mailhost.net:143 mailhost.net \\
+set preconnect="ssh \-f \-q \-L 1234:mailhost.net:143 mailhost.net \e
 sleep 20 < /dev/null > /dev/null"
 
 .EE
@@ -7132,7 +7126,7 @@ Default: "%3i %t %\-25N %\-25E | %C%> %Y
 .fi
 .IP
 This variable describes the format of the "query" menu. The
-following \f[CR]printf(3)\fP\-style sequences are understood:
+following \f[CR]printf\fP(3)\-style sequences are understood:
 .RS
 .PD 0
 .TP
@@ -7209,7 +7203,7 @@ CTRL\-C in the terminal.
 .B quote_regex
 .nf
 Type: regular expression
-Default: "^([ \\t]*[|>:}#])+"
+Default: "^([ \et]*[|>:}#])+"
 .fi
 .IP
 A regular expression used in the internal pager to determine quoted
@@ -7361,7 +7355,7 @@ Also see $wrap.
 .B reply_regex
 .nf
 Type: regular expression
-Default: "^((re|aw|sv)(\\[[0\-9]+\\])*:[ \\t]*)*"
+Default: "^((re|aw|sv)(\e[[0\-9]+\e])*:[ \et]*)*"
 .fi
 .IP
 A regular expression used to recognize reply messages when
@@ -7375,15 +7369,15 @@ example: \f[CR]"^(re|sv)"\fP or \f[CR]"^
 .IP
 The second parenthesized expression matches zero or more
 bracketed numbers following the prefix, such as \f[CR]"Re[1]: "\fP.
-The initial \f[CR]"\\\\["\fP means a literal left\-bracket character.
+The initial \f[CR]"\e\e["\fP means a literal left\-bracket character.
 Note the backslash must be doubled when used inside a double
 quoted string in the neomuttrc.  \f[CR]"[0\-9]+"\fP means one or more
-numbers.  \f[CR]"\\\\]"\fP means a literal right\-bracket.  Finally the
+numbers.  \f[CR]"\e\e]"\fP means a literal right\-bracket.  Finally the
 whole parenthesized expression has a \f[CR]"*"\fP suffix, meaning it
 can occur zero or more times.
 .IP
 The last part matches a colon followed by an optional space or
-tab.  Note \f[CR]"\\t"\fP is converted to a literal tab inside a
+tab.  Note \f[CR]"\et"\fP is converted to a literal tab inside a
 double quoted string.  If you use a single quoted string, you
 would have to type an actual tab character, and would need to
 convert the double\-backslashes to single backslashes.
@@ -7757,7 +7751,7 @@ $dsn_notify, or $dsn_return will be adde
 .IP
 \fBNote:\fP This command is invoked differently from most other
 commands in NeoMutt.  It is tokenized by space, and invoked directly
-via \f[CR]execvp(3)\fP with an array of arguments \- so commands or
+via \f[CR]execvp\fP(3) with an array of arguments \- so commands or
 arguments with spaces in them are not supported.  The shell is
 not used to run the command, so shell quoting is also not
 supported.
@@ -7926,7 +7920,7 @@ Default: "%D%*  %n"
 .fi
 .IP
 This variable allows you to customize the sidebar display. This string is
-similar to $index_format, but has its own set of \f[CR]printf(3)\fP\-like
+similar to $index_format, but has its own set of \f[CR]printf\fP(3)\-like
 sequences:
 .RS
 .PD 0
@@ -8185,7 +8179,7 @@ Default: yes
 If \fIset\fP, a line containing "\-\- " (note the trailing space) will be 
inserted before your
 $signature.  It is \fBstrongly\fP recommended that you not \fIunset\fP
 this variable unless your signature contains just your name.  The
-reason for this is because many software packages use "\-\- \\n" to
+reason for this is because many software packages use "\-\- \en" to
 detect your signature.  For example, NeoMutt has the ability to highlight
 the signature in a different color in the built\-in pager.
 
@@ -8211,7 +8205,8 @@ Default: "~/.signature"
 .fi
 .IP
 Specifies the filename of your signature, which is appended to all
-outgoing messages.   If the filename ends with a pipe ("|"), it is
+outgoing messages.
+If the filename ends with a pipe ("|"), it is
 assumed that filename is a shell command and input should be read from
 its standard output.
 
@@ -8227,7 +8222,7 @@ Specifies how NeoMutt should expand a si
 pattern.  A simple search is one that does not contain any of the "~" pattern
 operators.  See "patterns" for more information on search patterns.
 .IP
-simple_search applies to several functions, e.g. \f[CR]<delete\-pattern>\fP,
+simple_search applies to several functions, e.g.\& \f[CR]<delete\-pattern>\fP,
 \f[CR]<limit>\fP, searching in the index, and all of the index colors.
 .IP
 For example, if you simply type "joe" at a search or limit prompt, NeoMutt
@@ -8372,7 +8367,7 @@ Default: ""
 This format string specifies a command which is used to decrypt
 \f[CR]application/pkcs7\-mime\fP attachments.
 .IP
-The OpenSSL command formats have their own set of \f[CR]printf(3)\fP\-like 
sequences
+The OpenSSL command formats have their own set of \f[CR]printf\fP(3)\-like 
sequences
 similar to PGP's:
 .RS
 .PD 0
@@ -8459,7 +8454,7 @@ Default: ""
 This command is used to create encrypted S/MIME messages.
 .IP
 This is a format string, see the $smime_decrypt_command command for
-possible \f[CR]printf(3)\fP\-like sequences.
+possible \f[CR]printf\fP(3)\-like sequences.
 (S/MIME only)
 .IP
 Encrypt the message to $smime_default_key too.
@@ -8492,7 +8487,7 @@ Default: ""
 This command is used to extract X509 certificates from a PKCS7 structure.
 .IP
 This is a format string, see the $smime_decrypt_command command for
-possible \f[CR]printf(3)\fP\-like sequences.
+possible \f[CR]printf\fP(3)\-like sequences.
 (S/MIME only)
 
 
@@ -8508,7 +8503,7 @@ X509 certificates, and for verification
 certificate was issued for the sender's mailbox).
 .IP
 This is a format string, see the $smime_decrypt_command command for
-possible \f[CR]printf(3)\fP\-like sequences.
+possible \f[CR]printf\fP(3)\-like sequences.
 (S/MIME only)
 
 
@@ -8524,7 +8519,7 @@ signature, so that the certificate's own
 email's "From:" field.
 .IP
 This is a format string, see the $smime_decrypt_command command for
-possible \f[CR]printf(3)\fP\-like sequences.
+possible \f[CR]printf\fP(3)\-like sequences.
 (S/MIME only)
 
 
@@ -8538,7 +8533,7 @@ Default: ""
 This command is used to import a certificate via smime_keys.
 .IP
 This is a format string, see the $smime_decrypt_command command for
-possible \f[CR]printf(3)\fP\-like sequences.  NOTE: %c and %k will default
+possible \f[CR]printf\fP(3)\-like sequences.  NOTE: %c and %k will default
 to $smime_sign_as if set, otherwise $smime_default_key.
 (S/MIME only)
 
@@ -8585,7 +8580,7 @@ This command is used to extract PKCS7 st
 in order to extract the public X509 certificate(s).
 .IP
 This is a format string, see the $smime_decrypt_command command for
-possible \f[CR]printf(3)\fP\-like sequences.
+possible \f[CR]printf\fP(3)\-like sequences.
 (S/MIME only)
 
 
@@ -8624,7 +8619,7 @@ This command is used to created S/MIME s
 \f[CR]multipart/signed\fP, which can be read by all mail clients.
 .IP
 This is a format string, see the $smime_decrypt_command command for
-possible \f[CR]printf(3)\fP\-like sequences.
+possible \f[CR]printf\fP(3)\-like sequences.
 (S/MIME only)
 
 
@@ -8662,7 +8657,7 @@ Default: ""
 This command is used to verify S/MIME signatures of type 
\f[CR]multipart/signed\fP.
 .IP
 This is a format string, see the $smime_decrypt_command command for
-possible \f[CR]printf(3)\fP\-like sequences.
+possible \f[CR]printf\fP(3)\-like sequences.
 (S/MIME only)
 
 
@@ -8677,7 +8672,7 @@ This command is used to verify S/MIME si
 \f[CR]application/pkcs7\-mime\fP.
 .IP
 This is a format string, see the $smime_decrypt_command command for
-possible \f[CR]printf(3)\fP\-like sequences.
+possible \f[CR]printf\fP(3)\-like sequences.
 (S/MIME only)
 
 
@@ -8690,7 +8685,7 @@ Default: ""
 .IP
 This is a colon\-separated list of authentication methods NeoMutt may
 attempt to use to log in to an SMTP server, in the order NeoMutt should
-try them.  Authentication methods are any SASL mechanism, e.g. "plain",
+try them.  Authentication methods are any SASL mechanism, e.g.\& "plain",
 "digest\-md5", "gssapi" or "cram\-md5".
 This option is case\-insensitive. If it is "unset"
 (the default) NeoMutt will try all available methods, in order from
@@ -8955,10 +8950,14 @@ Default: ""
 .fi
 .IP
 Contains a colon\-separated list of ciphers to use when using SSL.
-For OpenSSL, see ciphers(1) for the syntax of the string.
+For OpenSSL, see
+.BR ciphers (1)
+for the syntax of the string.
 .IP
 For GnuTLS, this option will be used in place of "NORMAL" at the
-start of the priority string.  See gnutls_priority_init(3) for the
+start of the priority string.  See
+.BR gnutls_priority_init (3)
+for the
 syntax and more details. (Note: GnuTLS version 2.1.7 or higher is
 required.)
 
@@ -9161,7 +9160,7 @@ Controls the characters used by the "%r"
 \fBDescription\fP
 .TP
 1 
-\- 
+\(en
 Mailbox is unchanged
 .TP
 2 
@@ -9192,7 +9191,7 @@ Default: "\-%r\-NeoMutt: %D [Msgs:%<M?%M
 .IP
 Controls the format of the status line displayed in the "index"
 menu.  This string is similar to $index_format, but has its own
-set of \f[CR]printf(3)\fP\-like sequences:
+set of \f[CR]printf\fP(3)\-like sequences:
 .RS
 .PD 0
 .TP
@@ -9339,7 +9338,7 @@ are enabled with $use_threads:
 .IP
 \f[CR]%<T?%s/%S&%T/%s>\fP
 .IP
-You can force the result of any \f[CR]printf(3)\fP\-like sequence to be 
lowercase
+You can force the result of any \f[CR]printf\fP(3)\-like sequence to be 
lowercase
 by prefixing the sequence character with an underscore ("_") sign.
 For example, if you want to display the local hostname in lowercase,
 you would use: "\f[CR]%_h\fP".
@@ -9956,7 +9955,6 @@ name of original article author) to arti
 .\" --------------------------------------------------------------------
 .SH SEE ALSO
 .\" --------------------------------------------------------------------
-.PP
 .\" sorted by category and name
 .BR iconv (1),
 .BR neomutt (1),
@@ -9981,7 +9979,6 @@ For further NeoMutt information:
 .\" --------------------------------------------------------------------
 .SH AUTHOR
 .\" --------------------------------------------------------------------
-.PP
 Richard Russon and friends.
 Use <neomutt-devel@\:neomutt.org> to contact the developers.
 .
  Any program (person), that produces man pages, should check the output
for defects by using (both groff and nroff)

[gn]roff -mandoc -t -ww -b -z -K utf8 <man page>

  The same goes for man pages that are used as an input.

  For a style guide use

  mandoc -T lint

-.-

  Any "autogenerator" should check its products with the above mentioned
'groff', 'mandoc', and additionally with 'nroff ...'.

  It should also check its input files for too long (> 80) lines.

  This is just a simple quality control measure.

  The "autogenerator" may have to be corrected to get a better man page,
the source file may, and any additional file may.

  Common defects:

  Not removing trailing spaces (in in- and output).
  The reason for these trailing spaces should be found and eliminated.

  Not beginning each input sentence on a new line.
Line length should thus be reduced.

  The script "reportbug" uses 'quoted-printable' encoding when a line is
longer than 1024 characters in an 'ascii' file.

  See man-pages(7), item "semantic newline".

-.-

The difference between the formatted output of the original and patched file
can be seen with:

  nroff -mandoc <file1> > <out1>
  nroff -mandoc <file2> > <out2>
  diff -d -u <out1> <out2>

and for groff, using

\"printf '%s\n%s\n' '.kern 0' '.ss 12 0' | groff -mandoc -Z - \"

instead of 'nroff -mandoc'

  Add the option '-t', if the file contains a table.

  Read the output from 'diff -d -u ...' with 'less -R' or similar.

-.-.

  If 'man' (man-db) is used to check the manual for warnings,
the following must be set:

  The option \"-warnings=w\"

  The environmental variable:

export MAN_KEEP_STDERR=yes (or any non-empty value)

  or

  (produce only warnings):

export MANROFFOPT=\"-ww -b -z\"

export MAN_KEEP_STDERR=yes (or any non-empty value)

-.-

Reply via email to