===================================================================
RCS file: /cvs/mandoc/mdoc.7,v
retrieving revision 1.274
retrieving revision 1.278
diff -u -p -r1.274 -r1.278
--- mandoc/mdoc.7	2018/12/23 22:03:32	1.274
+++ mandoc/mdoc.7	2019/04/24 13:15:00	1.278
@@ -1,4 +1,4 @@
-.\"	$Id: mdoc.7,v 1.274 2018/12/23 22:03:32 schwarze Exp $
+.\"	$Id: mdoc.7,v 1.278 2019/04/24 13:15:00 schwarze Exp $
 .\"
 .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2010, 2011, 2013-2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,7 +15,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: December 23 2018 $
+.Dd $Mdocdate: April 24 2019 $
 .Dt MDOC 7
 .Os
 .Sh NAME
@@ -516,7 +516,7 @@ in the alphabetical
 .Bl -column "Brq, Bro, Brc" description
 .It Ic \&Em Ta italic font or underline (emphasis) (>0 arguments)
 .It Ic \&Sy Ta boldface font (symbolic) (>0 arguments)
-.It Ic \&No Ta return to roman font (normal) (no arguments)
+.It Ic \&No Ta return to roman font (normal) (>0 arguments)
 .It Ic \&Bf , \&Ef Ta font block: Fl Ar type | Cm \&Em | \&Li | \&Sy
 .El
 .Ss Physical enclosures
@@ -596,6 +596,13 @@ block.
 Book or journal page number of an
 .Ic \&Rs
 block.
+Conventionally, the argument starts with
+.Ql p.\&
+for a single page or
+.Ql pp.\&
+for a range of pages, for example:
+.Pp
+.Dl .%P pp. 42\e(en47
 .It Ic \&%Q Ar name
 Institutional author (school, government, etc.) of an
 .Ic \&Rs
@@ -1156,17 +1163,19 @@ declarations.
 This practise is discouraged.
 .It Ic \&Cm Ar keyword ...
 Command modifiers.
-Typically used for fixed strings passed as arguments, unless
+Typically used for fixed strings passed as arguments to interactive
+commands, to commands in interpreted scripts, or to configuration
+file directives, unless
 .Ic \&Fl
 is more appropriate.
-Also useful when specifying configuration options or keys.
 .Pp
 Examples:
 .Dl ".Nm mt Fl f Ar device Cm rewind"
 .Dl ".Nm ps Fl o Cm pid , Ns Cm command"
 .Dl ".Nm dd Cm if= Ns Ar file1 Cm of= Ns Ar file2"
-.Dl ".Cm IdentityFile Pa ~/.ssh/id_rsa"
-.Dl ".Cm LogLevel Dv DEBUG"
+.Dl ".Ic set Fl o Cm vi"
+.Dl ".Ic lookup Cm file bind"
+.Dl ".Ic permit Ar identity Op Cm as Ar target"
 .It Ic \&D1 Ar line
 One-line indented display.
 This is formatted by the default rules and is useful for simple indented
@@ -1588,8 +1597,7 @@ Examples:
 .Dl \&.Fn \(dqint funcname\(dq \(dqint arg0\(dq \(dqint arg1\(dq
 .Dl \&.Fn funcname \(dqint arg0\(dq
 .Dl \&.Fn funcname arg0
-.Pp
-.Bd -literal -offset indent -compact
+.Bd -literal -offset indent
 \&.Ft functype
 \&.Fn funcname
 .Ed
@@ -1678,10 +1686,10 @@ This macro is not implemented in
 .Xr mandoc 1 .
 It was used to include the contents of a (header) file literally.
 .It Ic \&Ic Ar keyword ...
-Designate an internal or interactive command.
-This is similar to
-.Ic \&Cm
-but used for instructions rather than values.
+Internal or interactive command, or configuration instruction
+in a configuration file.
+See also
+.Ic \&Cm .
 .Pp
 Examples:
 .Dl \&.Ic :wq
@@ -1933,8 +1941,7 @@ using semantic annotation macros.
 .Pp
 Examples:
 .Dl ".Em italic , Sy bold , No and roman"
-.Pp
-.Bd -literal -offset indent -compact
+.Bd -literal -offset indent
 \&.Sm off
 \&.Cm :C No / Ar pattern No / Ar replacement No /
 \&.Sm on
@@ -2891,7 +2898,7 @@ then the macro accepts an arbitrary number of argument
 .It Ic \&Ms  Ta    Yes      Ta    Yes      Ta    >0
 .It Ic \&Mt  Ta    Yes      Ta    Yes      Ta    >0
 .It Ic \&Nm  Ta    Yes      Ta    Yes      Ta    n
-.It Ic \&No  Ta    Yes      Ta    Yes      Ta    0
+.It Ic \&No  Ta    Yes      Ta    Yes      Ta    >0
 .It Ic \&Ns  Ta    Yes      Ta    Yes      Ta    0
 .It Ic \&Nx  Ta    Yes      Ta    Yes      Ta    n
 .It Ic \&Os  Ta    \&No     Ta    \&No     Ta    n
@@ -2971,7 +2978,7 @@ exclamation mark
 Note that even a period preceded by a backslash
 .Pq Sq \e.\&
 gets this special handling; use
-.Sq \e&.
+.Sq \e&.\&
 to prevent that.
 .Pp
 Many in-line macros interrupt their scope when they encounter