2 files changed, 18 insertions, 31 deletions

diff --git a/contrib/groff/tmac/doc-syms b/contrib/groff/tmac/doc-syms
index ae8d1e2c7a634..91a3ec9069578 100644
--- a/contrib/groff/tmac/doc-syms
+++ b/contrib/groff/tmac/doc-syms
@@ -282,27 +282,23 @@
 .	nr aP \\n(aP+1
 .       if "\\*(A\\n(aP"-p1003.1b-93" \{\
 .		ds b1 \&\\*(tNIEEE Std \\*(aa1003.1b-1993\\*(sV
-.		as b1 (``\\*(tN\\*(Px\\*(aa'')
+.		as b1 (``\\*(tN\\*(Px.1\\*(aa'')
 .       \}
-.       if "\\*(A\\n(aP"-p1003.1b" \{\
-.		ds b1 \&\\*(tNIEEE Std \\*(aa1003.1b\\*(sV
-.		as b1 (``\\*(tN\\*(Px\\*(aa'')
-.       \}
-.       if "\\*(A\\n(aP"-p1003.1g" \{\
-.		ds b1 \&\\*(tNIEEE \\*(aaP1003.1g\\*(sV
-.		as b1 (``\\*(tN\\*(Px\\*(aa'')
+.       if "\\*(A\\n(aP"-p1003.1g-2000" \{\
+.		ds b1 \&\\*(tNIEEE Std \\*(aa1003.1g-2000\\*(sV
+.		as b1 (``\\*(tN\\*(Px.1\\*(aa'')
 .       \}
 .       if "\\*(A\\n(aP"-p1003.1-90" \{\
-.		ds b1 \&\\*(tNIEEE Std \\*(aa1003.1-1990\\*(sV
-.		as b1 (``\\*(tN\\*(Px\\*(aa'')
+.		ds b1 \&\\*(tNISO/IEC \\*(aa9945-1:1990\\*(sV
+.		as b1 (``\\*(tN\\*(Px.1\\*(aa'')
 .       \}
 .       if "\\*(A\\n(aP"-p1003.1-88" \{\
 .		ds b1 \&\\*(tNIEEE Std \\*(aa1003.1-1988\\*(sV
-.		as b1 (``\\*(tN\\*(Px\\*(aa'')
+.		as b1 (``\\*(tN\\*(Px.1\\*(aa'')
 .       \}
 .       if "\\*(A\\n(aP"-p1003.1" \{\
 .		ds b1 \&\\*(tNIEEE Std \\*(aa1003.1\\*(sV
-.		as b1 (``\\*(tN\\*(Px\\*(aa'')
+.		as b1 (``\\*(tN\\*(Px.1\\*(aa'')
 .       \}
 .       if "\\*(A\\n(aP"-p1003.2-92" \{\
 .		ds b1 \&\\*(tNIEEE Std \\*(aa1003.2-1992\\*(sV
@@ -314,35 +310,29 @@
 .       \}
 .       if "\\*(A\\n(aP"-p1003.1-96" \{\
 .		ds b1 \&\\*(tNISO/IEC \\*(aa9945-1:1996\\*(sV
-.		as b1 (``\\*(tN\\*(Px\\*(aa'')
+.		as b1 (``\\*(tN\\*(Px.1\\*(aa'')
 .       \}
 .       if "\\*(A\\n(aP"-ansiC" \{\
-.		ds b1 \&\\*(tNANSI \\*(aaX\~3.159-1989\\*(sV
+.		ds b1 \&\\*(tNANSI \\*(aaX\^3.159-1989\\*(sV
 .		as b1 (``\\*(tNANSI\~C\\*(aa'')
 .       \}
 .       if "\\*(A\\n(aP"-isoC" \{\
-.		ds b1 \&\\*(tNISO \\*(aa9899:1990\\*(sV
-.		as b1 (``\\*(tNISO\~C\\*(aa'')
+.		ds b1 \&\\*(tNISO/IEC \\*(aa9899:1990\\*(sV
+.		as b1 (``\\*(tNISO\~C89\\*(aa'')
 .       \}
 .       if "\\*(A\\n(aP"-isoC-99" \{\
 .		ds b1 \&\\*(tNISO/IEC \\*(aa9899:1999\\*(sV
 .		as b1 (``\\*(tNISO C99\\*(aa'')
 .       \}
-.       if "\\*(A\\n(aP"-iso9899" \{\
-.		ds b1 \&\\*(tNISO \\*(aa9899:1990\\*(sV
-.		as b1 (``\\*(tNISO\~C\\*(aa'')
-.       \}
 .       if "\\*(A\\n(aP"-ansiC-89" \{\
-.		ds b1 \&\\*(tNANSI \\*(aaX\~3.159-1989\\*(sV
+.		ds b1 \&\\*(tNANSI \\*(aaX\^3.159-1989\\*(sV
 .		as b1 (``\\*(tNANSI\~C\\*(aa'')
 .       \}
 .       if "\\*(A\\n(aP"-ieee754" \{\
 .		ds b1 \&\\*(tNIEEE Std \\*(aa754-1985
 .       \}
 .       if "\\*(A\\n(aP"-iso8802-3" \{\
-.		ds b1 \&\\*(tNISO \\*(aa8802-3:1989
-.\" .		ds b1 \&\\*(tNISO \\*(aa8802-3: 1989\\*(sV
-.\" .		as b1 (``\\*(tNANSI\~C\\*(aa'')
+.		ds b1 \&\\*(tNISO/IEC \\*(aa8802-3:1989
 .       \}
 .       if "\\*(A\\n(aP"-xpg3" \{\
 .		ds b1 \&\\*(tNX/Open Portability Guide Issue\~3\\*(aa\\*(sV
@@ -357,7 +347,8 @@
 .		as b1 (``\\*(tNXPG4.2\\*(aa'')
 .       \}
 .       if "\\*(A\\n(aP"-susv2" \{\
-.		ds b1 \&\\*(tNVersion\~2 of the Single UNIX Specification\\*(aa
+.		ds b1 \&\\*(tNVersion\~2 of the Single UNIX Specification\\*(aa\\*(sV
+.		as b1 (``\\*(tNSUSv2\\*(aa'')
 .       \}
 .	ie \\n(aC>\\n(aP \{\
 .		nr aP \\n(aP+1
diff --git a/share/man/man7/mdoc.samples.7 b/share/man/man7/mdoc.samples.7
index 2b8be15c0bdd4..953cd55c9df84 100644
--- a/share/man/man7/mdoc.samples.7
+++ b/share/man/man7/mdoc.samples.7
@@ -1445,8 +1445,6 @@ are:
 .St -ieee754
 .It Li "-iso8802-3"
 .St -iso8802-3
-.It Li "-iso9899"
-.St -iso9899
 .It Li "-isoC"
 .St -isoC
 .It Li "-isoC-99"
@@ -1459,12 +1457,10 @@ are:
 .St -p1003.1-90
 .It Li "-p1003.1-96"
 .St -p1003.1-96
-.It Li "-p1003.1b"
-.St -p1003.1b
 .It Li "-p1003.1b-93"
 .St -p1003.1b-93
-.It Li "-p1003.1g"
-.St -p1003.1g
+.It Li "-p1003.1g-2000"
+.St -p1003.1g-2000
 .It Li "-p1003.2"
 .St -p1003.2
 .It Li "-p1003.2-92"