ntpq/ntpq-opts.def restore Ba to | as unsupported by mdoc; util/ntp-keygen-opts.def...

bk: 58c85b45LrRJ3VW2FX5rOXTVudup-w

diff --git a/ntpq/ntpq-opts.def b/ntpq/ntpq-opts.def
index afc834129410f3ef3c8f4262e4996a031a2100eb..321d6f42709e4b3c63284b337ccae4efaa39e094 100644 (file)
--- a/ntpq/ntpq-opts.def
+++ b/ntpq/ntpq-opts.def
@@ -261,7 +261,7 @@ list.
 The
 .Ic showvars
 command displays the current list of optional variables.
-.It Ic authenticate Op Cm yes Ba Cm no
+.It Ic authenticate Op Cm yes | Cm no
 Normally
 .Nm
 does not authenticate requests unless
@@ -291,7 +291,7 @@ Variables which
 could not decode completely are
 marked with a trailing
 .Ql \&? .
-.It Ic debug Op Cm more Ba Cm less Ba Cm off
+.It Ic debug Op Cm more | Cm less | Cm off
 With no argument, displays the current debug level.
 Otherwise, the debugging level is changed as indicated.
 .It Ic delay Op Ar milliseconds
@@ -304,7 +304,7 @@ Actually the
 server does not now require timestamps in authenticated requests,
 so this command may be obsolete.
 Without any arguments, displays the current delay.
-.It Ic drefid Op Cm hash Ba Cm ipv4
+.It Ic drefid Op Cm hash | Cm ipv4
 Display refids as IPv4 or hash.
 Without any arguments, displays whether refids are shown as IPv4
 addresses or hashes.
@@ -317,7 +317,7 @@ The
 .Ar name
 may be either a host name or a numeric address.
 Without any arguments, displays the current host.
-.It Ic hostnames Op Cm yes Ba Cm no
+.It Ic hostnames Op Cm yes | Cm no
 If
 .Cm yes
 is specified, host names are printed in
@@ -355,7 +355,7 @@ can be any message digest algorithm supported by OpenSSL.
 If no argument is given, the current
 .Ic keytype Ar digest
 algorithm used is displayed.
-.It Ic ntpversion Op Cm 1 Ba Cm 2 Ba Cm 3 Ba Cm 4
+.It Ic ntpversion Op Cm 1 | Cm 2 | Cm 3 | Cm 4
 Sets the NTP version number which
 .Nm
 claims in
@@ -490,13 +490,13 @@ precision system variable.
 .It Ic lassociations
 Perform the same function as the associations command, except display
 mobilized and unmobilized associations, including all clients.
-.It Ic lopeers Op Fl 4 Ba Fl 6
+.It Ic lopeers Op Fl 4 | Fl 6
 Display a list of all peers and clients showing
 .Cm dstadr
 (associated with the given IP version).
 .It Ic lpassociations
 Display the last obtained list of associations, including all clients.
-.It Ic lpeers Op Fl 4 Ba Fl 6
+.It Ic lpeers Op Fl 4 | Fl 6
 Display a list of all peers and clients (associated with the given IP version).
 .It Ic monstats
 Display monitor facility status, statistics, and limits:
@@ -516,9 +516,9 @@ Perform the same function as the
 command for a range of association ids.
 This range may be determined from the list displayed by any
 command showing associations.
-.It Xo Ic mrulist Oo Cm limited Ba Cm kod Ba Cm mincount Ns = Ns Ar count Ba
-.Cm laddr Ns = Ns Ar localaddr Ba Cm sort Ns = Ns Ar sortorder Ba
-.Cm resany Ns = Ns Ar hexmask Ba Cm resall Ns = Ns Ar hexmask Oc
+.It Xo Ic mrulist Oo Cm limited | Cm kod | Cm mincount Ns = Ns Ar count |
+.Cm laddr Ns = Ns Ar localaddr | Cm sort Ns = Ns Ar sortorder |
+.Cm resany Ns = Ns Ar hexmask | Cm resall Ns = Ns Ar hexmask Oc
 .Xc
 Display traffic counts of the most recently seen source addresses
 collected and maintained by the monitor facility.
@@ -594,7 +594,7 @@ Source port of last packet from this address.
 DNS name, numeric address, or address followed by
 claimed DNS name which could not be verified in parentheses.
 .El
-.It Ic opeers Op Fl 4 Ba Fl 6
+.It Ic opeers Op Fl 4 | Fl 6
 Obtain and print the old-style list of all peers and clients showing
 .Cm dstadr
 (associated with the given IP version),

diff --git a/util/ntp-keygen-opts.def b/util/ntp-keygen-opts.def
index 07196f7f75c7c849cafeec686fc04b202aca822c..f8c39c48dcdeb6f425c1e5da67811d71bb8d0423 100644 (file)
--- a/util/ntp-keygen-opts.def
+++ b/util/ntp-keygen-opts.def
@@ -1058,7 +1058,7 @@ If
 is not specified, the default host name is the string returned by the Unix
 .Ic hostname
 command.
-.It Fl S Fl -sign-key Ns = Op Cm RSA Ba DSA
+.It Fl S Fl -sign-key Ns = Op Cm RSA | DSA
 Generate a new encrypted public/private sign key file of the specified type.
 By default, the sign key is the host key and has the same type.
 If compatibility with FIPS 140-2 is required, the sign key type must be
@@ -1181,13 +1181,13 @@ and edited using an ordinary text editor.
 # ntpkey_MD5key_bk.ntp.org.3595864945
 # Thu Dec 12 19:22:25 2013
 
-1  MD5 L";Nw<`.I<f4U0)247"i  # MD5 key
+1  MD5 L";Nw<\`.I<f4U0)247"i  # MD5 key
 2  MD5 &>l0%XXK9O'51VwV<xq~  # MD5 key
 3  MD5 lb4zLW~d^!K:]RsD'qb6  # MD5 key
-4  MD5 Yue:tL[+vR)M`n~bY,'?  # MD5 key
+4  MD5 Yue:tL[+vR)M\`n~bY,'?  # MD5 key
 5  MD5 B;fx'Kgr/&4ZTbL6=RxA  # MD5 key
-6  MD5 4eYwa`o@}3i@@@@V@@..R9!l  # MD5 key
-7  MD5 `A.([h+;wTQ|xfi%Sn_!  # MD5 key
+6  MD5 4eYwa\`o@}3i@@@@V@@..R9!l  # MD5 key
+7  MD5 \`A.([h+;wTQ|xfi%Sn_!  # MD5 key
 8  MD5 45:V,r4]l6y^JH6"Sh?F  # MD5 key
 9  MD5 3-5vcn*6l29DS?Xdsg)*  # MD5 key
 10 MD5 2late4Me              # MD5 key