Complete the whatis.1 -> apropos.1 merge,

[mandoc.git] / man.7

diff --git a/man.7 b/man.7
index 08f43dfbb57271e93a5868549813a0be1d134c9c..4b64d7f442f43b23edb9bf14fd6e37b30bb7876e 100644 (file)
--- a/man.7
+++ b/man.7
@@ -1,4 +1,4 @@
-.\"    $Id: man.7,v 1.125 2014/03/17 06:57:48 schwarze Exp $
+.\"    $Id: man.7,v 1.127 2014/06/22 16:39:45 schwarze Exp $
 .\"
 .\" Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -16,7 +16,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: March 17 2014 $
+.Dd $Mdocdate: June 22 2014 $
 .Dt MAN 7
 .Os
 .Sh NAME
@@ -106,6 +106,8 @@ file for a utility
 \efBprogname\efR [\efB\e-options\efR] \efIfile ...\efR
 \&.SH DESCRIPTION
 The \efBfoo\efR utility processes files ...
+\&.\e\(dq .Sh CONTEXT
+\&.\e\(dq For section 9 functions only.
 \&.\e\(dq .SH IMPLEMENTATION NOTES
 \&.\e\(dq Not used in OpenBSD.
 \&.\e\(dq .SH RETURN VALUES
@@ -171,6 +173,9 @@ This expands upon the brief, one-line description in
 .Em NAME .
 It usually contains a break-down of the options (if documenting a
 command).
+.It Em CONTEXT
+This section lists the contexts in which functions can be called in section 9.
+The contexts are autoconf, process, or interrupt.
 .It Em IMPLEMENTATION NOTES
 Implementation-specific notes should be kept here.
 This is useful when implementing standard functions that may have side
@@ -868,10 +873,11 @@ Note that macros like
 .Sx \&BR
 open and close a font scope for each argument.
 .Sh COMPATIBILITY
-This section documents areas of questionable portability between
+This section mentions some areas of questionable portability between
 implementations of the
 .Nm
 language.
+More incompatibilities exist.
 .Pp
 .Bl -dash -compact
 .It
@@ -883,47 +889,12 @@ to close out a literal context opened with
 .Sx \&nf .
 This behaviour may not be portable.
 .It
-In quoted literals, GNU troff allowed pair-wise double-quotes to produce
-a standalone double-quote in formatted output.
-It is not known whether this behaviour is exhibited by other formatters.
-.It
 troff suppresses a newline before
 .Sq \(aq
 macro output; in mandoc, it is an alias for the standard
 .Sq \&.
 control character.
 .It
-The
-.Sq \eh
-.Pq horizontal position ,
-.Sq \ev
-.Pq vertical position ,
-.Sq \em
-.Pq text colour ,
-.Sq \eM
-.Pq text filling colour ,
-.Sq \ez
-.Pq zero-length character ,
-.Sq \ew
-.Pq string length ,
-.Sq \ek
-.Pq horizontal position marker ,
-.Sq \eo
-.Pq text overstrike ,
-and
-.Sq \es
-.Pq text size
-escape sequences are all discarded in mandoc.
-.It
-The
-.Sq \ef
-scaling unit is accepted by mandoc, but rendered as the default unit.
-.It
-The
-.Sx \&sp
-macro does not accept negative values in mandoc.
-In GNU troff, this would result in strange behaviour.
-.It
 In page header lines, GNU troff versions up to and including 1.21
 only print
 .Ar volume
@@ -939,8 +910,13 @@ is given, like in
 .El
 .Pp
 The
-.Sx OP
-macro is part of the extended
+.Sx EE ,
+.Sx EX ,
+.Sx OP ,
+.Sx UE ,
+and
+.Sx UR
+macros are part of the GNU extended
 .Nm
 macro set, and may not be portable to non-GNU troff implementations.
 .Sh SEE ALSO