Talk less about "Single UNIX" because it has a confusing numbering

scheme.  Instead, stick to the XPG/POSIX numbering scheme that has
clearly won: earlier this year, POSIX Issue 8 has been released,
and nobody calls it "Single UNIX version 5".

The XPG/POSIX numbering scheme is also preferable because it can
be used for the entire history leading up to the current POSIX
standard (1988-2024), whereas the Single UNIX numbering scheme
only works for the period from XPG4.2 to POSIX Issue 7 (1994-2008).

This patch mostly changes (informational) paragraph headers
and corrects two instances of the incorrect term "XPG version"
to the correct term "XPG Issue".  The (normative) .St argument
definitions remain unchanged, and all supported .St arguments
remain documented, including the deprecated arguments -susv1 to -susv4.

No objections when shown on tech@ a few months ago.

1 files changed, 11 insertions, 10 deletions

diff --git a/share/man/man7/mdoc.7 b/share/man/man7/mdoc.7
index c621462e503..dd3311ad033 100644
--- a/share/man/man7/mdoc.7
+++ b/share/man/man7/mdoc.7
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mdoc.7,v 1.184 2024/06/17 15:35:33 schwarze Exp $
+.\" $OpenBSD: mdoc.7,v 1.185 2024/09/22 10:13:03 schwarze Exp $
 .\"
 .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2010, 2011, 2013-2020 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: June 17 2024 $
+.Dd $Mdocdate: September 22 2024 $
 .Dt MDOC 7
 .Os
 .Sh NAME
@@ -2418,7 +2418,7 @@ The second major version of the C language standard.
 .br
 The third major version of the C language standard.
 .El
-.It POSIX.1 before the Single UNIX Specification
+.It POSIX.1 before XPG4.2
 .Pp
 .Bl -tag -width "-p1003.1g-2000" -compact
 .It \-p1003.1-88
@@ -2459,7 +2459,7 @@ Technical Corrigendum.
 .br
 Includes POSIX.1-1990, 1b, 1c, and 1i.
 .El
-.It X/Open Portability Guide version 4 and related standards
+.It X/Open Portability Guide before XPG4.2
 .Pp
 .Bl -tag -width "-p1003.1g-2000" -compact
 .It \-xpg3
@@ -2486,7 +2486,7 @@ Updates to POSIX.2.
 .br
 Based on POSIX.1 and POSIX.2, published in 1992.
 .El
-.It Single UNIX Specification version 1 and related standards
+.It X/Open Portability Guide Issue 4 Version 2 and related standards
 .Pp
 .Bl -tag -width "-p1003.1g-2000" -compact
 .It \-susv1
@@ -2511,13 +2511,14 @@ Networking APIs, including sockets.
 .br
 Published in 1995.
 .El
-.It Single UNIX Specification version 2 and related standards
+.It X/Open Portability Guide Issue 5 and related standards
 .Pp
 .Bl -tag -width "-p1003.1g-2000" -compact
 .It \-susv2
 .St -susv2
+.br
 This Standard was published in 1997
-and is also called X/Open Portability Guide version 5.
+and is also called X/Open Portability Guide Issue 5.
 It was used as the basis for UNIX 98 certification.
 The following refer to parts of it.
 .Pp
@@ -2535,7 +2536,7 @@ The following refer to parts of it.
 .It \-xns5.2
 .St -xns5.2
 .El
-.It Single UNIX Specification version 3
+.It POSIX Issue 6
 .Pp
 .Bl -tag -width "-p1003.1-2001" -compact
 .It \-p1003.1-2001
@@ -2544,7 +2545,7 @@ The following refer to parts of it.
 .St -susv3
 .br
 This standard is based on C99, SUSv2, POSIX.1-1996, 1d, and 1j.
-It is also called X/Open Portability Guide version 6.
+It is also called X/Open Portability Guide Issue 6.
 It is used as the basis for UNIX 03 certification.
 .Pp
 .It \-p1003.1-2004
@@ -2552,7 +2553,7 @@ It is used as the basis for UNIX 03 certification.
 .br
 The second and last Technical Corrigendum.
 .El
-.It POSIX issues 7 and 8
+.It POSIX Issues 7 and 8
 .Pp
 .Bl -tag -width "-p1003.1g-2000" -compact
 .It \-p1003.1-2008