last stage of rfc changes, using consistent Rs/Re blocks, and moving the

references into a STANDARDS section;

4 files changed, 72 insertions, 62 deletions

diff --git a/lib/libkeynote/keynote.1 b/lib/libkeynote/keynote.1
index 8f1b93cfd55..5ee95805bde 100644
--- a/lib/libkeynote/keynote.1
+++ b/lib/libkeynote/keynote.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: keynote.1,v 1.33 2012/08/15 18:56:28 jmc Exp $
+.\" $OpenBSD: keynote.1,v 1.34 2012/09/27 11:31:58 jmc Exp $
 .\"
 .\" The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
 .\"
@@ -20,7 +20,7 @@
 .\" MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
 .\" PURPOSE.
 .\"
-.Dd $Mdocdate: August 15 2012 $
+.Dd $Mdocdate: September 27 2012 $
 .Dt KEYNOTE 1
 .\" .TH keynote 1 local
 .Os
@@ -252,26 +252,28 @@ exits with code \-1 if there was an error, and 0 on success.
 .Rs
 .%A M. Blaze
 .%A J. Feigenbaum
-.%A A. D. Keromytis
-.%T "The KeyNote Trust-Management System, Version 2"
-.%N RFC 2704
-.%D 1999
-.Re
-.Rs
-.%A M. Blaze
-.%A J. Feigenbaum
 .%A J. Lacy
-.%T Decentralized Trust Management
-.%J IEEE Symposium on Security and Privacy
 .%D 1996
+.%J IEEE Symposium on Security and Privacy
+.%T Decentralized Trust Management
 .Re
 .Rs
 .%A M. Blaze
 .%A J. Feigenbaum
 .%A M. Strauss
-.%T Compliance-Checking in the PolicyMaker Trust Management System
-.%J Financial Crypto Conference
 .%D 1998
+.%J Financial Crypto Conference
+.%T Compliance-Checking in the PolicyMaker Trust Management System
+.Re
+.Sh STANDARDS
+.Rs
+.%A M. Blaze
+.%A J. Feigenbaum
+.%A J. Ioannidis
+.%A A. Keromytis
+.%D September 1999
+.%R RFC 2704
+.%T The KeyNote Trust-Management System Version 2
 .Re
 .Sh AUTHORS
 .An Angelos D. Keromytis Aq angelos@cs.columbia.edu
diff --git a/lib/libkeynote/keynote.3 b/lib/libkeynote/keynote.3
index fae0a936de0..6313be72828 100644
--- a/lib/libkeynote/keynote.3
+++ b/lib/libkeynote/keynote.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: keynote.3,v 1.44 2012/08/15 18:56:28 jmc Exp $
+.\" $OpenBSD: keynote.3,v 1.45 2012/09/27 11:31:58 jmc Exp $
 .\"
 .\" The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
 .\"
@@ -20,7 +20,7 @@
 .\" MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
 .\" PURPOSE.
 .\"
-.Dd $Mdocdate: August 15 2012 $
+.Dd $Mdocdate: September 27 2012 $
 .Dt KEYNOTE 3
 .\" .TH KeyNote 3 local
 .Os
@@ -288,7 +288,8 @@ large.
 .Pp
 On success,
 .Xr kn_add_action 3
-returns 0. On failure, it returns \-1 and sets
+returns 0.
+On failure, it returns \-1 and sets
 .Va keynote_errno
 to
 .Er ERROR_NOTFOUND
@@ -874,26 +875,28 @@ function description above.
 .Rs
 .%A M. Blaze
 .%A J. Feigenbaum
-.%A A. D. Keromytis
-.%T "The KeyNote Trust-Management System, Version 2"
-.%N RFC 2704
-.%D 1999
-.Re
-.Rs
-.%A M. Blaze
-.%A J. Feigenbaum
 .%A J. Lacy
-.%T Decentralized Trust Management
-.%J IEEE Symposium on Security and Privacy
 .%D 1996
+.%J IEEE Symposium on Security and Privacy
+.%T Decentralized Trust Management
 .Re
 .Rs
 .%A M. Blaze
 .%A J. Feigenbaum
 .%A M. Strauss
-.%T Compliance-Checking in the PolicyMaker Trust Management System
-.%J Financial Crypto Conference
 .%D 1998
+.%J Financial Crypto Conference
+.%T Compliance-Checking in the PolicyMaker Trust Management System
+.Re
+.Sh STANDARDS
+.Rs
+.%A M. Blaze
+.%A J. Feigenbaum
+.%A J. Ioannidis
+.%A A. Keromytis
+.%D September 1999
+.%R RFC 2704
+.%T The KeyNote Trust-Management System Version 2
 .Re
 .Sh AUTHORS
 .An Angelos D. Keromytis Aq angelos@cs.columbia.edu
@@ -902,4 +905,4 @@ function description above.
 .Sh BUGS
 None that we know of.
 If you find any, please report them to
-.Dl Aq keynote@research.att.com
+.Aq keynote@research.att.com .
diff --git a/lib/libkeynote/keynote.4 b/lib/libkeynote/keynote.4
index a3ad07e2f7e..7edebb88d66 100644
--- a/lib/libkeynote/keynote.4
+++ b/lib/libkeynote/keynote.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: keynote.4,v 1.29 2012/08/15 18:56:28 jmc Exp $
+.\" $OpenBSD: keynote.4,v 1.30 2012/09/27 11:31:58 jmc Exp $
 .\"
 .\" The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
 .\"
@@ -20,7 +20,7 @@
 .\" MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
 .\" PURPOSE.
 .\"
-.Dd $Mdocdate: August 15 2012 $
+.Dd $Mdocdate: September 27 2012 $
 .Dt KEYNOTE 4
 .\" .TH KeyNote 4 local
 .Os
@@ -621,7 +621,8 @@ Regular expression evaluation is case sensitive.
 .Pp
 A runtime error occurring in the evaluation of a test, such as
 division by zero or an invalid regular expression, causes the test to
-be considered false. For example:
+be considered false.
+For example:
 .Bd -literal
       foo == "bar" -> {
                         @a == 1/0 -> "oneval";    # subclause 1
@@ -678,7 +679,7 @@ A
 expression has the K-th highest order compliance value listed in
 .Aq list .
 Values that appear multiple times are counted with multiplicity.
- For example, if K = 3 and the orders of the listed compliance values are
+For example, if K = 3 and the orders of the listed compliance values are
 (0, 1, 2, 2, 3), the value of the expression is the compliance value of
 order 2.
 .El
@@ -871,26 +872,28 @@ However, the following return "Reject" (_MIN_TRUST):
 .Rs
 .%A M. Blaze
 .%A J. Feigenbaum
-.%A A. D. Keromytis
-.%T "The KeyNote Trust-Management System, Version 2"
-.%N RFC 2704
-.%D 1999
-.Re
-.Rs
-.%A M. Blaze
-.%A J. Feigenbaum
 .%A J. Lacy
-.%T Decentralized Trust Management
-.%J IEEE Symposium on Security and Privacy
 .%D 1996
+.%J IEEE Symposium on Security and Privacy
+.%T Decentralized Trust Management
 .Re
 .Rs
 .%A M. Blaze
 .%A J. Feigenbaum
 .%A M. Strauss
-.%T Compliance-Checking in the PolicyMaker Trust Management System
-.%J Financial Crypto Conference
 .%D 1998
+.%J Financial Crypto Conference
+.%T Compliance-Checking in the PolicyMaker Trust Management System
+.Re
+.Sh STANDARDS
+.Rs
+.%A M. Blaze
+.%A J. Feigenbaum
+.%A J. Ioannidis
+.%A A. Keromytis
+.%D September 1999
+.%R RFC 2704
+.%T The KeyNote Trust-Management System Version 2
 .Re
 .Sh AUTHORS
 .An Angelos D. Keromytis Aq angelos@cs.columbia.edu
@@ -899,4 +902,4 @@ However, the following return "Reject" (_MIN_TRUST):
 .Sh BUGS
 None that we know of.
 If you find any, please report them at
-.Dl Aq keynote@research.att.com
+.Aq keynote@research.att.com .
diff --git a/lib/libkeynote/keynote.5 b/lib/libkeynote/keynote.5
index bbf8f2348fc..c37fe8d2c5a 100644
--- a/lib/libkeynote/keynote.5
+++ b/lib/libkeynote/keynote.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: keynote.5,v 1.20 2012/08/15 18:56:28 jmc Exp $
+.\" $OpenBSD: keynote.5,v 1.21 2012/09/27 11:31:58 jmc Exp $
 .\"
 .\" The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
 .\"
@@ -20,7 +20,7 @@
 .\" MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
 .\" PURPOSE.
 .\"
-.Dd $Mdocdate: August 15 2012 $
+.Dd $Mdocdate: September 27 2012 $
 .Dt KEYNOTE 5
 .\" .TH KeyNote 5 local
 .Os
@@ -671,26 +671,28 @@ the interest of readability.
 .Rs
 .%A M. Blaze
 .%A J. Feigenbaum
-.%A A. D. Keromytis
-.%T "The KeyNote Trust-Management System, Version 2"
-.%N RFC 2704
-.%D 1999
-.Re
-.Rs
-.%A M. Blaze
-.%A J. Feigenbaum
 .%A J. Lacy
-.%T Decentralized Trust Management
-.%J IEEE Symposium on Security and Privacy
 .%D 1996
+.%J IEEE Symposium on Security and Privacy
+.%T Decentralized Trust Management
 .Re
 .Rs
 .%A M. Blaze
 .%A J. Feigenbaum
 .%A M. Strauss
-.%T Compliance-Checking in the PolicyMaker Trust Management System
-.%J Financial Crypto Conference
 .%D 1998
+.%J Financial Crypto Conference
+.%T Compliance-Checking in the PolicyMaker Trust Management System
+.Re
+.Sh STANDARDS
+.Rs
+.%A M. Blaze
+.%A J. Feigenbaum
+.%A J. Ioannidis
+.%A A. Keromytis
+.%D September 1999
+.%R RFC 2704
+.%T The KeyNote Trust-Management System Version 2
 .Re
 .Sh AUTHORS
 .An Angelos D. Keromytis Aq angelos@cs.columbia.edu
@@ -699,4 +701,4 @@ the interest of readability.
 .Sh BUGS
 None that we know of.
 If you find any, please report them at
-.Dl Aq keynote@research.att.com
+.Aq keynote@research.att.com .