summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--contrib/groff/tmac/doc-syms51
-rw-r--r--contrib/groff/tmac/tmac.doc20
-rw-r--r--share/man/man7/mdoc.samples.732
3 files changed, 38 insertions, 65 deletions
diff --git a/contrib/groff/tmac/doc-syms b/contrib/groff/tmac/doc-syms
index 07753de8541b..91a3ec906957 100644
--- a/contrib/groff/tmac/doc-syms
+++ b/contrib/groff/tmac/doc-syms
@@ -246,11 +246,11 @@
\&is currently in beta test.
..
.\" NS St macro - standards (posix, ansi - formal standard names)
-.\" ISO/IEC 9945-1 : 1996 (-iso9945-1) comprises:
-.\" IEEE 1003.1-1996
+.\" ISO/IEC 9945-1:1996 (-p1003.1-96) comprises:
+.\" IEEE 1003.1-1990
.\" IEEE 1003.1b-1993
-.\" IEEE 1003.1i-1995
-.\" and IEEE 1003.1c-1995
+.\" IEEE 1003.1c-1995
+.\" and IEEE 1003.1i-1995
.\"
.ds Px \\*(tNPOSIX
.ds Ai \\*(tNANSI
@@ -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'')
-. \}
-. if "\\*(A\\n(aP"-p1003.1b" \{\
-. ds b1 \&\\*(tNIEEE Std \\*(aa1003.1b\\*(sV
-. as b1 (``\\*(tN\\*(Px\\*(aa'')
+. as b1 (``\\*(tN\\*(Px.1\\*(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
@@ -312,37 +308,31 @@
. ds b1 \&\\*(tNIEEE Std \\*(aa1003.2\\*(sV
. as b1 (``\\*(tN\\*(Px.2\\*(aa'')
. \}
-. if "\\*(A\\n(aP"-iso9945-1" \{\
+. if "\\*(A\\n(aP"-p1003.1-96" \{\
. ds b1 \&\\*(tNISO/IEC \\*(aa9945-1:1996\\*(sV
. as b1 (``\\*(tN\\*(Px.1\\*(aa'')
. \}
. if "\\*(A\\n(aP"-ansiC" \{\
-. ds b1 \&\\*(tNISO \\*(aa9899:1990\\*(sV
-. as b1 (``\\*(tNISO\~C\\*(aa'')
+. 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/contrib/groff/tmac/tmac.doc b/contrib/groff/tmac/tmac.doc
index 0532bff5222c..65c5c05c5994 100644
--- a/contrib/groff/tmac/tmac.doc
+++ b/contrib/groff/tmac/tmac.doc
@@ -373,7 +373,7 @@
. ie !"\\*(A\\n(aP"\\*(Ba" \{\
. ie !"\\*(A\\n(aP"\fR|\fP" \{\
. ie "\\*(A\\n(aP"-" .as b1 \&\|\-\^\-\|
-. el .as b1 \&\|\-\\*(A\\n(aP
+. el .as b1 \|\%\-\\*(A\\n(aP
. \}
. el .as b1 \&\\*(A\\n(aP
. \}
@@ -1533,7 +1533,7 @@
.de Ef
.ds mN Ef
.ie \\n(.$>0 .tm Usage .Ef (does not take arguments) (#\\n(.c)
-.el \&\f\\n(bF\s\\n(bZ
+.el \&\f\\n(bF\s\\n(bZ\c
..
.\" Ns Bk macro - Begin Keep
.\" Ns Ek macro - End Keep
@@ -1819,7 +1819,6 @@
. if "\\*(A\\n(aP"-width" \{\
. nr iD 1
. nr aP \\n(aP+1
-. nr tW 1
. ds t\\n(lC TagwidtH
. ds tS \\*(A\\n(aP
. aW \\n(aP
@@ -2120,7 +2119,7 @@
.de tL
.nh
.\" tm in tL here is b1==\\*(b1
-.if \\n(tW==0 .lW
+.if !"TagwidtH"\\*(t\\n(lC" .lW
.lX
.nr bb \\n(w\\n(lCu+\\n(lSu
.ti -\\n(bbu
@@ -2139,25 +2138,23 @@
'fi
.hy
..
-.\" NS lW macro - resolve unknown label/tag width (if .Bl [inset | tag] only)
+.\" NS lW macro - resolve unknown label/tag width (`tag' list-type only)
.de lW
.if !"TagwidtH"\\*(t\\n(lC" \{\
. ie \\n(tX==1 \{\
-. ds t\\n(lN \\*(tX
-. nr w\\n(lN \\n(\\*(tX
+. ds t\\n(lC \\*(tX
+. nr w\\n(lC \\n(\\*(tX
. \}
. el \{\
-. ds t\\n(lN No
-. nr w\\n(lN \\n(No
+. ds t\\n(lC No
+. nr w\\n(lC \\n(No
. \}
-. if !"\\*(t\\n(lC"\\*(t\\n(lN" .nr tC 1
.\}
..
.\" NS lX macro - set up vertical spacing (if compact) and offset+indent (all)
.de lX
.ie \\n(tC \{\
. nr tC 0
-. nr tW 0
. if \\n(v\\n(lC==0 .sp \\n(dVu
. in \\n(.iu+\\n(w\\n(lCu+\\n(o\\n(lCu+\\n(lSu
.\}
@@ -2175,7 +2172,6 @@
.de lY
.ie \\n(tC \{\
. nr tC 0
-. nr tW 0
. if \\n(v\\n(lC==0 .sp \\n(dVu
. in \\n(.iu+\\n(o\\n(lCu
.\}
diff --git a/share/man/man7/mdoc.samples.7 b/share/man/man7/mdoc.samples.7
index 6ae5837f0818..953cd55c9df8 100644
--- a/share/man/man7/mdoc.samples.7
+++ b/share/man/man7/mdoc.samples.7
@@ -1151,7 +1151,8 @@ may be used with
(function argument)
to get around the limitation. For example:
.Bd -literal -offset indent
-\&.Fo "int res_mkquery"
+\&.Ft int
+\&.Fo res_mkquery
\&.Fa "int op"
\&.Fa "char *dname"
\&.Fa "int class"
@@ -1166,7 +1167,8 @@ to get around the limitation. For example:
.Pp
Produces:
.Bd -filled -offset indent
-.Fo "int res_mkquery"
+.Ft int
+.Fo res_mkquery
.Fa "int op"
.Fa "char *dname"
.Fa "int class"
@@ -1443,10 +1445,6 @@ are:
.St -ieee754
.It Li "-iso8802-3"
.St -iso8802-3
-.It Li "-iso9899"
-.St -iso9899
-.It Li "-iso9945-1"
-.St -iso9945-1
.It Li "-isoC"
.St -isoC
.It Li "-isoC-99"
@@ -1457,12 +1455,12 @@ are:
.St -p1003.1-88
.It Li "-p1003.1-90"
.St -p1003.1-90
-.It Li "-p1003.1b"
-.St -p1003.1b
+.It Li "-p1003.1-96"
+.St -p1003.1-96
.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"
@@ -2117,7 +2115,7 @@ placed in alphabetical order and comma separated. For example:
.Xr ls 1 ,
.Xr ps 1 ,
.Xr group 5 ,
-.Xr passwd 5 .
+.Xr passwd 5
.Pp
At this time
.Xr refer 1
@@ -3026,13 +3024,6 @@ several example man pages
.Xr troff 1 ,
.Xr mdoc 7
.Sh BUGS
-Undesirable hyphenation on the dash of a flag
-argument is not yet resolved, and causes
-occasional mishaps in the
-.Sx DESCRIPTION
-section.
-(line break on the hyphen).
-.Pp
Predefined strings are not declared in documentation.
.Pp
Section 3f has not been added to the header routines.
@@ -3049,11 +3040,6 @@ Occasionally it
separates the last parenthesis, and sometimes
looks ridiculous if a line is in fill mode.
.Pp
-The method used to prevent header and footer page
-breaks (other than the initial header and footer) when using
-nroff occasionally places an unsightly partially filled line (blank)
-at the would be bottom of the page.
-.Pp
The list and display macros to not do any keeps
and certainly should be able to.
.\" Note what happens if the parameter list overlaps a newline
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-02 01:38:56 +0000