From ecabba142785ad106c05e2eea8414e57ed8b0376 Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Sun, 26 Sep 2010 19:46:48 +0000
Subject: sync to OpenBSD: note that IMPLEMENTATION NOTES is not used in
 OpenBSD add missing comma in "sections 1, 6, & 8 only" below EXIT STATUS
 below SEE ALSO, add an .Xr to man(1), and from man(7) to mdoc(7)

---
 man.7  | 11 +++++++----
 mdoc.7 |  8 +++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/man.7 b/man.7
index 894631ab..6d41ef6e 100644
--- a/man.7
+++ b/man.7
@@ -1,4 +1,4 @@
-.\"	$Id: man.7,v 1.88 2010/09/04 17:22:41 kristaps Exp $
+.\"	$Id: man.7,v 1.89 2010/09/26 19:46:48 schwarze Exp $
 .\"
 .\" Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
 .\"
@@ -14,7 +14,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: September 4 2010 $
+.Dd $Mdocdate: September 26 2010 $
 .Dt MAN 7
 .Os
 .Sh NAME
@@ -227,13 +227,14 @@ Documents are generally structured as follows:
 \&.SH DESCRIPTION
 The \efBfoo\efR utility processes files...
 \&.\e\*q .SH IMPLEMENTATION NOTES
+\&.\e\*q Not used in OpenBSD.
 \&.\e\*q .SH RETURN VALUES
 \&.\e\*q For sections 2, 3, & 9 only.
 \&.\e\*q .SH ENVIRONMENT
 \&.\e\*q For sections 1, 6, 7, & 8 only.
 \&.\e\*q .SH FILES
 \&.\e\*q .SH EXIT STATUS
-\&.\e\*q For sections 1, 6 & 8 only.
+\&.\e\*q For sections 1, 6, & 8 only.
 \&.\e\*q .SH EXAMPLES
 \&.\e\*q .SH DIAGNOSTICS
 \&.\e\*q For sections 1, 4, 6, 7, & 8 only.
@@ -961,8 +962,10 @@ macro does not accept negative values in mandoc.
 In GNU troff, this would result in strange behaviour.
 .El
 .Sh SEE ALSO
+.Xr man 1 ,
 .Xr mandoc 1 ,
-.Xr mandoc_char 7
+.Xr mandoc_char 7 ,
+.Xr mdoc 7
 .Sh HISTORY
 The
 .Nm
diff --git a/mdoc.7 b/mdoc.7
index 1f94e328..ff47d5ae 100644
--- a/mdoc.7
+++ b/mdoc.7
@@ -1,4 +1,4 @@
-.\"	$Id: mdoc.7,v 1.158 2010/09/04 17:22:41 kristaps Exp $
+.\"	$Id: mdoc.7,v 1.159 2010/09/26 19:46:48 schwarze Exp $
 .\"
 .\" Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2010 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: September 4 2010 $
+.Dd $Mdocdate: September 26 2010 $
 .Dt MDOC 7
 .Os
 .Sh NAME
@@ -343,13 +343,14 @@ The
 \&.Nm
 utility processes files ...
 \&.\e\*q .Sh IMPLEMENTATION NOTES
+\&.\e\*q Not used in OpenBSD.
 \&.\e\*q .Sh RETURN VALUES
 \&.\e\*q For sections 2, 3, & 9 only.
 \&.\e\*q .Sh ENVIRONMENT
 \&.\e\*q For sections 1, 6, 7, & 8 only.
 \&.\e\*q .Sh FILES
 \&.\e\*q .Sh EXIT STATUS
-\&.\e\*q For sections 1, 6 & 8 only.
+\&.\e\*q For sections 1, 6, & 8 only.
 \&.\e\*q .Sh EXAMPLES
 \&.\e\*q .Sh DIAGNOSTICS
 \&.\e\*q For sections 1, 4, 6, 7, & 8 only.
@@ -2868,6 +2869,7 @@ standalone double-quote in formatted output.
 This is not supported by mandoc.
 .El
 .Sh SEE ALSO
+.Xr man 1 ,
 .Xr mandoc 1 ,
 .Xr mandoc_char 7
 .Sh HISTORY
-- 
cgit v1.2.3-56-ge451