===================================================================
RCS file: /cvs/mandoc/mandoc.1,v
retrieving revision 1.145
retrieving revision 1.148
diff -u -p -r1.145 -r1.148
--- mandoc/mandoc.1	2015/02/04 22:30:10	1.145
+++ mandoc/mandoc.1	2015/02/06 08:28:35	1.148
@@ -1,4 +1,4 @@
-.\"	$Id: mandoc.1,v 1.145 2015/02/04 22:30:10 schwarze Exp $
+.\"	$Id: mandoc.1,v 1.148 2015/02/06 08:28:35 schwarze Exp $
 .\"
 .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2012, 2014, 2015 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: February 4 2015 $
+.Dd $Mdocdate: February 6 2015 $
 .Dt MANDOC 1
 .Os
 .Sh NAME
@@ -994,8 +994,19 @@ except that it may control a following
 clause.
 .It Sy "skipping empty macro"
 .Pq mdoc
-The indicated macro has no arguments or no body content
-and hence no effect.
+The indicated macro has no arguments and hence no effect.
+.It Sy "empty block"
+.Pq mdoc , man
+A
+.Ic \&Bd ,
+.Ic \&Bk ,
+.Ic \&Bl ,
+.Ic \&D1 ,
+.Ic \&Dl ,
+.Ic \&RS ,
+or
+.Ic \&UR
+block contains nothing in its body and will produce no output.
 .It Sy "empty argument, using 0n"
 .Pq mdoc
 The required width is missing after
@@ -1005,12 +1016,6 @@ or
 .Fl offset
 or
 .Fl width.
-.It Sy "argument count wrong"
-.Pq mdoc , man
-The indicated macro has too few or too many arguments.
-The syntax tree will contain the wrong number of arguments as given.
-Formatting behaviour depends on the specific macro in question.
-Note that the same message may also occur as an ERROR, see below.
 .It Sy "missing display type, using -ragged"
 .Pq mdoc
 The
@@ -1042,6 +1047,12 @@ The
 macro is called without an argument before
 .Ic \&Nm
 has first been called with an argument.
+.It Sy "missing function name, using \(dq\(dq"
+.Pq mdoc
+The
+.Ic \&Fo
+macro is called without an argument.
+No function name is printed.
 .It Sy "empty head in list item"
 .Pq mdoc
 In a
@@ -1624,7 +1635,10 @@ or
 .Ic \&EN
 macro, or a
 .Xr roff 7
-.Ic \&br
+.Ic \&br ,
+.Ic \&fi ,
+or
+.Ic \&nf
 request or
 .Sq \&..
 block closing request is invoked with at least one argument.
@@ -1637,6 +1651,8 @@ macro is invoked with another argument after
 .Fl split
 or
 .Fl nosplit ,
+.Ic \&Fo
+is invoked with more than one argument,
 .Ic \&Bd ,
 .Ic \&Bk ,
 or