===================================================================
RCS file: /cvs/mandoc/man.7,v
retrieving revision 1.140
retrieving revision 1.142
diff -u -p -r1.140 -r1.142
--- mandoc/man.7	2018/08/18 04:32:10	1.140
+++ mandoc/man.7	2019/01/01 03:45:29	1.142
@@ -1,7 +1,7 @@
-.\"	$Id: man.7,v 1.140 2018/08/18 04:32:10 schwarze Exp $
+.\"	$Id: man.7,v 1.142 2019/01/01 03:45:29 schwarze Exp $
 .\"
 .\" Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
-.\" Copyright (c) 2011-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
+.\" Copyright (c) 2011-2015,2017,2018,2019 Ingo Schwarze <schwarze@openbsd.org>
 .\" Copyright (c) 2017 Anthony Bentley <bentley@openbsd.org>
 .\" Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org>
 .\"
@@ -17,7 +17,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: August 18 2018 $
+.Dd $Mdocdate: January 1 2019 $
 .Dt MAN 7
 .Os
 .Sh NAME
@@ -100,9 +100,7 @@ but can be found in the alphabetical reference below.
 .It Sx RS , RE Ta reset the left margin: Op Ar width
 .It Sx IP Ta indented paragraph: Op Ar head Op Ar width
 .It Sx TP Ta tagged paragraph: Op Ar width
-.It Sx HP Ta hanged paragraph: Op Ar width
 .It Sx PD Ta set vertical paragraph distance: Op Ar height
-.It Sx fi , nf Ta fill mode and no-fill mode (no arguments)
 .It Sx in Ta additional indent: Op Ar width
 .El
 .Ss Physical markup
@@ -164,14 +162,18 @@ request.
 This is a non-standard GNU extension.
 In
 .Xr mandoc 1 ,
-it does the same as
-.Sx \&fi .
+it does the same as the
+.Xr roff 7
+.Sx \&fi
+request (switch to fill mode).
 .Ss \&EX
 This is a non-standard GNU extension.
 In
 .Xr mandoc 1 ,
-it does the same as
-.Sx \&nf .
+it does the same as the
+.Xr roff 7
+.Ic \&nf
+request (switch to no-fill mode).
 .Ss \&HP
 Begin a paragraph whose initial output line is left-justified, but
 subsequent output lines are indented, with the following syntax:
@@ -185,8 +187,13 @@ The
 argument is a
 .Xr roff 7
 scaling width.
-If specified, it's saved for later paragraph left-margins; if unspecified, the
-saved or default width is used.
+If specified, it's saved for later paragraph left margins;
+if unspecified, the saved or default width is used.
+.Pp
+This macro is portable, but deprecated
+because it has no good representation in HTML output,
+usually ending up indistinguishable from
+.Sx \&PP .
 .Ss \&I
 Text is rendered in italics.
 .Ss \&IB
@@ -380,6 +387,9 @@ and footer with the following syntax:
 Conventionally, the document
 .Ar name
 is given in all caps.
+The
+.Ar section
+is usually a single digit, in a few cases followed by a letter.
 The recommended
 .Ar date
 format is
@@ -399,21 +409,22 @@ uses its
 argument.
 The
 .Ar volume
-string replaces the default rendered volume, which is dictated by the
-manual section.
+string replaces the default volume title of the
+.Ar section .
 .Pp
 Examples:
 .Pp
 .Dl \&.TH CVS 5 "1992-02-12" GNU
 .Ss \&TP
 Begin a paragraph where the head, if exceeding the indentation width, is
-followed by a newline; if not, the body follows on the same line after a
-buffer to the indentation width.
+followed by a newline; if not, the body follows on the same line after
+advancing to the indentation width.
 Subsequent output lines are indented.
 The syntax is as follows:
-.Bd -filled -offset indent
-.Pf \. Sx \&TP
-.Op Ar width
+.Bd -unfilled -offset indent
+.Pf \. Sx \&TP Op Ar width
+.Ar head No \e" one line
+.Ar body
 .Ed
 .Pp
 The
@@ -451,9 +462,6 @@ link description to be shown
 End a synopsis block started with
 .Sx \&SY .
 This is a non-standard GNU extension.
-.Ss \&fi
-End literal mode started with
-.Sx \&nf .
 .Ss \&in
 Indent relative to the current indentation:
 .Pp
@@ -464,15 +472,6 @@ If
 is signed, the new offset is relative.
 Otherwise, it is absolute.
 This value is reset upon the next paragraph, section, or sub-section.
-.Ss \&nf
-Begin literal mode: all subsequent free-form lines have their end of
-line boundaries preserved.
-May be ended by
-.Sx \&fi .
-Literal mode is implicitly ended by
-.Sx \&SH
-or
-.Sx \&SS .
 .Sh MACRO SYNTAX
 The
 .Nm
@@ -523,9 +522,7 @@ The syntax is as follows:
 .It Sx \&SM  Ta    n         Ta    next-line Ta    \&
 .It Sx \&TH  Ta    >1, <6    Ta    current   Ta    \&
 .It Sx \&UC  Ta    <=1       Ta    current   Ta    \&
-.It Sx \&fi  Ta    0         Ta    current   Ta    Xr roff 7
 .It Sx \&in  Ta    1         Ta    current   Ta    Xr roff 7
-.It Sx \&nf  Ta    0         Ta    current   Ta    Xr roff 7
 .El
 .Ss Block Macros
 Block macros comprise a head and body.