- fix some lists/displays

- .Dl for one-line displays
- simplify macros
- .An/.Aq for AUTHORS

4 files changed, 57 insertions, 82 deletions

diff --git a/lib/libkeynote/keynote.1 b/lib/libkeynote/keynote.1
index 393a5c73db1..38d8c504bd3 100644
--- a/lib/libkeynote/keynote.1
+++ b/lib/libkeynote/keynote.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: keynote.1,v 1.24 2003/04/08 01:21:11 david Exp $
+.\" $OpenBSD: keynote.1,v 1.25 2003/07/08 11:02:23 jmc Exp $
 .\"
 .\" The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
 .\"
@@ -69,7 +69,7 @@ Supported
 .Fa AlgorithmName
 identifiers are:
 .Pp
-.Bl -tag -width -offset indent -compact
+.Bl -tag -width Dq -offset indent -compact
 .It Dq dsa-hex:
 .It Dq dsa-base64:
 .It Dq rsa-hex:
@@ -121,7 +121,7 @@ Valid
 .Fa AlgorithmName
 identifiers are:
 .Pp
-.Bl -tag -width indent -compact
+.Bl -tag -width Dq -offset indent -compact
 .It Dq sig-dsa-sha1-hex:
 .It Dq sig-dsa-sha1-base64:
 .It Dq sig-rsa-sha1-hex:
@@ -216,9 +216,8 @@ Files given with the
 .Fl e
 flag are assumed to contain environment variables and their values,
 in the format:
-.Bd -literal -offset indent
- varname = "value"
-.Ed
+.Pp
+.Dl  varname = \&"value\&"
 .Pp
 .Fa varname
 can begin with any letter (upper or lower case) or number,
@@ -229,7 +228,7 @@ is a quoted string, and can contain any character, and escape
 RFC.
 .Pp
 The remaining options are:
-.Bl -tag -width indent
+.Bl -tag -width "-k file"
 .It Fl h
 Print a usage message and exit.
 .It Fl k Ar file
@@ -281,13 +280,10 @@ exits with code \-1 if there was an error, and 0 on success.
 .%D 1998
 .Re
 .Sh AUTHORS
-Angelos D. Keromytis
-.Aq angelos@dsl.cis.upenn.edu
+.An Angelos D. Keromytis Aq angelos@dsl.cis.upenn.edu
 .Sh WEB PAGE
 .Pa http://www.cis.upenn.edu/~keynote
 .Sh BUGS
 None that we know of.
 If you find any, please report them at
-.Bd -literal -offset indent -compact
-keynote@research.att.com
-.Ed
+.Dl Aq keynote@research.att.com
diff --git a/lib/libkeynote/keynote.3 b/lib/libkeynote/keynote.3
index a58b7babc72..50391a7f5d3 100644
--- a/lib/libkeynote/keynote.3
+++ b/lib/libkeynote/keynote.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: keynote.3,v 1.35 2003/05/24 18:30:32 jmc Exp $
+.\" $OpenBSD: keynote.3,v 1.36 2003/07/08 11:02:23 jmc Exp $
 .\"
 .\" The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
 .\"
@@ -889,8 +889,7 @@ This is useful for parsing key files.
 .%D 1998
 .Re
 .Sh AUTHORS
-Angelos D. Keromytis
-.Aq angelos@dsl.cis.upenn.edu
+.An Angelos D. Keromytis Aq angelos@dsl.cis.upenn.edu
 .Sh WEB PAGE
 .Pa http://www.cis.upenn.edu/~keynote
 .Sh DIAGNOSTICS
@@ -899,6 +898,4 @@ function description above.
 .Sh BUGS
 None that we know of.
 If you find any, please report them to
-.Bd -literal -offset indent -compact
-keynote@research.att.com
-.Ed
+.Dl Aq keynote@research.att.com
diff --git a/lib/libkeynote/keynote.4 b/lib/libkeynote/keynote.4
index 2c9a08b78ad..24c0b071931 100644
--- a/lib/libkeynote/keynote.4
+++ b/lib/libkeynote/keynote.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: keynote.4,v 1.24 2003/06/02 09:47:15 jmc Exp $
+.\" $OpenBSD: keynote.4,v 1.25 2003/07/08 11:02:23 jmc Exp $
 .\"
 .\" The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
 .\"
@@ -523,14 +523,12 @@ expression that evaluates to one value from the ordered set of
 compliance values given with the query.
 If the value subclause is missing, it is considered to be _MAX_TRUST.
 That is, the clause
-.Bd -literal
-       foo=="bar";
-.Ed
+.Pp
+.Dl foo==\&"bar\&";
 .Pp
 is equivalent to
-.Bd -literal
-       foo=="bar" -> _MAX_TRUST;
-.Ed
+.Pp
+.Dl foo==\&"bar\&" -> _MAX_TRUST;
 .Pp
 If the value component of a clause is present, in the simplest case it
 contains a string expression representing a possible compliance value.
@@ -559,12 +557,10 @@ the possible compliance value set would contain the values
 (by clause (4)).
 If the ordered set of compliance values
 given in the query (in ascending order) is
-.Pf { Ns Qo no_access
-.Qc ,
+.Pf { Ns Qo no_access Qc ,
 .Qq guest_access ,
 .Qq user_access ,
-.Qo full_access
-.No Qc Ns },
+.Qo full_access Qc Ns } ,
 the Conditions Compliance Value of the assertion would be
 .Qq full_access
 (because
@@ -676,7 +672,7 @@ expression has the higher-order (maximum) of its two subexpression values.
 A
 .Qo
 .Ao K
-.No Ac Ns -of Ns Po Aq List
+.Ac Ns -of Ns Po Aq List
 .Pc
 .Qc
 expression has the K-th highest order compliance value listed in
@@ -688,9 +684,8 @@ order 2.
 .El
 .Pp
 For example, consider the following Licensees field:
-.Bd -literal
-        Licensees: ("alice" && "bob") || "eve"
-.Ed
+.Pp
+.Dl Licensees: (\&"alice\&" && \&"bob\&") || \&"eve\&"
 .Pp
 If the Principal Compliance Value is
 .Qq yes
@@ -830,11 +825,9 @@ A log entry is made if the amount is at least 100.
 .Ed
 .Pp
 Assume a query in which the ordered set of Compliance Values is
-.Pf { Ns Qo Reject
-.Qc ,
+.Pf { Ns Qo Reject Qc ,
 .Qq ApproveAndLog ,
-.Qo Approve
-.No Qc Ns }.
+.Qo Approve Qc Ns } .
 Under policies E and G, and
 credentials F and H, the Policy Compliance Value is
 .Qq Approve
@@ -900,13 +893,10 @@ However, the following return "Reject" (_MIN_TRUST):
 .%D 1998
 .Re
 .Sh AUTHORS
-Angelos D. Keromytis
-.Aq angelos@dsl.cis.upenn.edu
+.An Angelos D. Keromytis Aq angelos@dsl.cis.upenn.edu
 .Sh WEB PAGE
 .Pa http://www.cis.upenn.edu/~keynote
 .Sh BUGS
 None that we know of.
 If you find any, please report them at
-.Bd -literal -offset indent -compact
-keynote@research.att.com
-.Ed
+.Dl Aq keynote@research.att.com
diff --git a/lib/libkeynote/keynote.5 b/lib/libkeynote/keynote.5
index 8966cec3c54..277bc192784 100644
--- a/lib/libkeynote/keynote.5
+++ b/lib/libkeynote/keynote.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: keynote.5,v 1.12 2003/01/19 21:02:14 deraadt Exp $
+.\" $OpenBSD: keynote.5,v 1.13 2003/07/08 11:02:23 jmc Exp $
 .\"
 .\" The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
 .\"
@@ -47,7 +47,7 @@ KeyNote assertions are divided into sections, called
 that serve various semantic functions.
 Each field starts with an
 identifying label at the beginning of a line, followed by the
-.Qq \:
+.Qq \&:
 character and the field's contents.
 There can be at most one field per line.
 .Pp
@@ -112,15 +112,15 @@ inside string literals.
 .Pp
 A similar escape mechanism is also used to represent non-printable
 characters.
-.Qq \e Ns n
+.Qq \en
 represents the newline character (ASCII character 10
 decimal),
-.Qq \e Ns r
+.Qq \er
 represents the carriage-return character (ASCII
 character 13 decimal),
-.Qq \e Ns t
+.Qq \et
 represents the tab character (ASCII character 9 decimal), and
-.Qq \e Ns f
+.Qq \ef
 represents the form-feed character (ASCII character 12 decimal).
 A backslash character followed by a newline suppresses all subsequent
 whitespace (including the newline) up to the next non-whitespace character
@@ -128,26 +128,26 @@ whitespace (including the newline) up to the next non-whitespace character
 Un-escaped newline and return characters are illegal inside string literals.
 .Pp
 The constructs
-.Qq \e Ns 0o ,
-.Qq \e Ns 0oo ,
+.Qq \e0o ,
+.Qq \e0oo ,
 and
-.Qq \e Ns ooo
+.Qq \eooo
 (where o represents any octal digit) may be used to represent any non-NUL
 ASCII characters with their corresponding octal values (thus,
-.Qq \e Ns 012
+.Qq \e012
 is the same as
-.Qq \e Ns n ,
-.Qq \e Ns 101
+.Qq \en ,
+.Qq \e101
 is
 .Qq A ,
 and
-.Qq \e Ns 377
+.Qq \e377
 is the ASCII character 255 decimal).
 However, the NUL character cannot be encoded in this manner;
-.Qq \e Ns 0 ,
-.Qq \e Ns 00 ,
+.Qq \e0 ,
+.Qq \e00 ,
 and
-.Qq \e Ns 000
+.Qq \e000
 are converted to the strings
 .Qq 0 ,
 .Qq 00 ,
@@ -156,7 +156,7 @@ and
 respectively.
 Similarly, all other escaped characters have the
 leading backslash removed (e.g.,
-.Qq \e Ns a
+.Qq \ea
 becomes
 .Qq a ,
 and
@@ -208,7 +208,7 @@ Attributes are dereferenced as strings by default.
 When required,
 dereferenced attributes can be converted to integers or floating point
 numbers with the type conversion operators
-.Qq \@
+.Qq @
 and
 .Qq & .
 Thus, an attribute named
@@ -298,29 +298,26 @@ Principal Identifiers that are used by KeyNote only as labels are
 said to be
 .Sq opaque .
 Opaque identifiers are encoded in assertions as strings (as defined above):
-.Bd -literal
-       <OpaqueID>:: <StrEx> ;
-.Ed
+.Pp
+.Dl <OpaqueID>:: <StrEx>\ \&;
 .Pp
 Opaque identifier strings should not contain the
-.Qq \:
+.Qq \&:
 character.
 .Sh CRYPTOGRAPHIC PRINCIPAL IDENTIFIERS
 Principal Identifiers that are used by KeyNote as keys, e.g., to
 verify credential signatures, are said to be
 .Sq cryptographic .
 Cryptographic identifiers are also lexically encoded as strings:
-.Bd -literal
-       <KeyID>:: <StrEx> ;
-.Ed
+.Pp
+.Dl <KeyID>:: <StrEx>\ \&;
 .Pp
 Unlike Opaque Identifiers, however, Cryptographic Identifier strings
 have a special form.
 To be interpreted by KeyNote (for signature
 verification), an identifier string should be of the form:
-.Bd -literal
-      <IDString>:: <ALGORITHM>":"<ENCODEDBITS> ;
-.Ed
+.Pp
+.Dl <IDString>:: <ALGORITHM>":"<ENCODEDBITS>\ \&;
 .Pp
 .Qq ALGORITHM
 is an ASCII substring that describes the algorithms to be
@@ -563,7 +560,7 @@ regular expression syntax and semantics (see
 Any string expression (or attribute) containing the ASCII
 representation of a numeric value can be converted to an integer or
 float with the use of the
-.Qq \@
+.Qq @
 and
 .Qq &
 operators, respectively.
@@ -576,9 +573,8 @@ to be zero.
 The Comment field allows assertions to be annotated with information
 describing their purpose.
 It is of the form:
-.Bd -literal
-       <CommentField>:: "Comment:" <text> ;
-.Ed
+.Pp
+.Dl <CommentField>:: \&"Comment:\&" <text>\ \&;
 .Pp
 No interpretation of the contents of this field is performed by
 KeyNote.
@@ -598,9 +594,8 @@ The Signature field is of the form:
 .Ed
 .Pp
 The <Signature> string should be of the form:
-.Bd -literal
-       <IDString>:: <ALGORITHM>":"<ENCODEDBITS> ;
-.Ed
+.Pp
+.Dl <IDString>:: <ALGORITHM>":"<ENCODEDBITS>\ \&;
 .Pp
 The formats of the
 .Qq ALGORITHM
@@ -696,13 +691,10 @@ the interest of readability.
 .%D 1998
 .Re
 .Sh AUTHORS
-Angelos D. Keromytis
-.Aq angelos@dsl.cis.upenn.edu
+.An Angelos D. Keromytis Aq angelos@dsl.cis.upenn.edu
 .Sh WEB PAGE
 .Pa http://www.cis.upenn.edu/~keynote
 .Sh BUGS
 None that we know of.
 If you find any, please report them at
-.Bd -literal -offset indent -compact
-keynote@research.att.com
-.Ed
+.Dl Aq keynote@research.att.com