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

references into a STANDARDS section;

7 files changed, 73 insertions, 32 deletions

diff --git a/bin/md5/md5.1 b/bin/md5/md5.1
index 28c764e223d..ec728216ac0 100644
--- a/bin/md5/md5.1
+++ b/bin/md5/md5.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: md5.1,v 1.32 2010/09/03 09:53:20 jmc Exp $
+.\"	$OpenBSD: md5.1,v 1.33 2012/09/22 20:09:43 jmc Exp $
 .\"
 .\" Copyright (c) 2003, 2004, 2006 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -18,7 +18,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.Dd $Mdocdate: September 3 2010 $
+.Dd $Mdocdate: September 22 2012 $
 .Dt MD5 1
 .Os
 .Sh NAME
@@ -98,10 +98,12 @@ options are processed.
 .Xr cksum 1 ,
 .Xr sha1 1 ,
 .Xr sha256 1
+.Sh STANDARDS
 .Rs
 .%A R. Rivest
+.%D April 1992
+.%R RFC 1321
 .%T The MD5 Message-Digest Algorithm
-.%O RFC 1321
 .Re
 .Sh CAVEATS
 Since collisions have been found for
diff --git a/bin/md5/sha1.1 b/bin/md5/sha1.1
index 184db0da4f6..5829888de8b 100644
--- a/bin/md5/sha1.1
+++ b/bin/md5/sha1.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sha1.1,v 1.30 2012/05/13 16:49:44 jmc Exp $
+.\"	$OpenBSD: sha1.1,v 1.31 2012/09/22 20:09:43 jmc Exp $
 .\"
 .\" Copyright (c) 2003, 2004, 2006 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -18,7 +18,7 @@
 .\" Agency (DARPA) and Air Force Research Laboratory, Air Force
 .\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
 .\"
-.Dd $Mdocdate: May 13 2012 $
+.Dd $Mdocdate: September 22 2012 $
 .Dt SHA1 1
 .Os
 .Sh NAME
@@ -113,22 +113,26 @@ sha256, sha384 and sha512.
 .Xr md5 1 ,
 .Xr sha256 1
 .Rs
-.%A J. Burrows
-.%T The Secure Hash Standard
-.%O FIPS PUB 180-1
-.Re
-.Rs
-.%A D. Eastlake and P. Jones
-.%T US Secure Hash Algorithm 1
-.%O RFC 3174
-.Re
-.Rs
 .%A X. Wang
 .%A Y. Yin
 .%A H. Yu
-.%T Finding Collisions in the Full SHA-1
-.%J Crypto
 .%D 2005
+.%J Crypto
+.%T Finding Collisions in the Full SHA-1
+.Re
+.Sh STANDARDS
+.Rs
+.%A J. Burrows
+.%O FIPS PUB 180-1
+.%T The Secure Hash Standard
+.Re
+.Pp
+.Rs
+.%A D. Eastlake
+.%A P. Jones
+.%D September 2001
+.%R RFC 3174
+.%T US Secure Hash Algorithm 1 (SHA1)
 .Re
 .Sh CAVEATS
 Theoretical attacks that significantly reduce the amount of time needed
diff --git a/sbin/bioctl/bioctl.8 b/sbin/bioctl/bioctl.8
index 9b38e2472db..b5937ae8af8 100644
--- a/sbin/bioctl/bioctl.8
+++ b/sbin/bioctl/bioctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: bioctl.8,v 1.89 2012/01/29 17:26:13 jmc Exp $
+.\"	$OpenBSD: bioctl.8,v 1.90 2012/09/22 20:09:43 jmc Exp $
 .\"
 .\" Copyright (c) 2004, 2005 Marco Peereboom
 .\"
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 29 2012 $
+.Dd $Mdocdate: September 22 2012 $
 .Dt BIOCTL 8
 .Os
 .Sh NAME
@@ -302,10 +302,12 @@ using a new chunk on wd0d:
 .Xr bio 4 ,
 .Xr scsi 4 ,
 .Xr softraid 4
+.Sh STANDARDS
 .Rs
+.%A B. Kaliski
+.%D September 2000
 .%R RFC 2898
-.%T "PKCS #5: Password-Based Cryptography Specification Version 2.0"
-.%D 2000
+.%T PKCS #5: Password-Based Cryptography Specification Version 2.0
 .Re
 .Sh HISTORY
 The
diff --git a/sbin/dhclient/dhclient.conf.5 b/sbin/dhclient/dhclient.conf.5
index 100894ace7e..d6da0655414 100644
--- a/sbin/dhclient/dhclient.conf.5
+++ b/sbin/dhclient/dhclient.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dhclient.conf.5,v 1.22 2012/08/22 00:14:42 tedu Exp $
+.\"	$OpenBSD: dhclient.conf.5,v 1.23 2012/09/22 20:09:43 jmc Exp $
 .\"
 .\" Copyright (c) 1997 The Internet Software Consortium.
 .\" All rights reserved.
@@ -36,7 +36,7 @@
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.Dd $Mdocdate: August 22 2012 $
+.Dd $Mdocdate: September 22 2012 $
 .Dt DHCLIENT.CONF 5
 .Os
 .Sh NAME
@@ -480,8 +480,21 @@ file \- the defaults are usually fine.
 .Xr dhclient 8 ,
 .Xr dhclient-script 8 ,
 .Xr dhcpd 8
+.Sh STANDARDS
+.Rs
+.%A R. Droms
+.%D March 1997
+.%R RFC 2131
+.%T Dynamic Host Configuration Protocol
+.Re
 .Pp
-RFC 2132, RFC 2131.
+.Rs
+.%A S. Alexander
+.%A R. Droms
+.%D March 1997
+.%R RFC 2132
+.%T DHCP Options and BOOTP Vendor Extensions
+.Re
 .Sh AUTHORS
 .An -nosplit
 .Xr dhclient 8
diff --git a/sbin/dhclient/dhclient.leases.5 b/sbin/dhclient/dhclient.leases.5
index 49f7fdcdb56..bbf9578b586 100644
--- a/sbin/dhclient/dhclient.leases.5
+++ b/sbin/dhclient/dhclient.leases.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dhclient.leases.5,v 1.6 2007/05/31 19:19:43 jmc Exp $
+.\"	$OpenBSD: dhclient.leases.5,v 1.7 2012/09/22 20:09:43 jmc Exp $
 .\"
 .\" Copyright (c) 1997 The Internet Software Consortium.
 .\" All rights reserved.
@@ -36,7 +36,7 @@
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 22 2012 $
 .Dt DHCLIENT.LEASES 5
 .Os
 .Sh NAME
@@ -75,8 +75,21 @@ Current lease file.
 .Xr dhcpd.conf 5 ,
 .Xr dhclient 8 ,
 .Xr dhcpd 8
+.Sh STANDARDS
+.Rs
+.%A R. Droms
+.%D March 1997
+.%R RFC 2131
+.%T Dynamic Host Configuration Protocol
+.Re
 .Pp
-RFC 2132, RFC 2131.
+.Rs
+.%A S. Alexander
+.%A R. Droms
+.%D March 1997
+.%R RFC 2132
+.%T DHCP Options and BOOTP Vendor Extensions
+.Re
 .Sh AUTHORS
 .An -nosplit
 .Xr dhclient 8
diff --git a/sbin/iked/iked.8 b/sbin/iked/iked.8
index 233dc4b4873..03357a43131 100644
--- a/sbin/iked/iked.8
+++ b/sbin/iked/iked.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iked.8,v 1.7 2012/09/18 12:07:59 reyk Exp $
+.\" $OpenBSD: iked.8,v 1.8 2012/09/22 20:09:43 jmc Exp $
 .\" $vantronix: iked.8,v 1.5 2010/06/02 14:38:08 reyk Exp $
 .\"
 .\" Copyright (c) 2010 Reyk Floeter <reyk@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: September 18 2012 $
+.Dd $Mdocdate: September 22 2012 $
 .Dt IKED 8
 .Os
 .Sh NAME
@@ -125,10 +125,15 @@ control socket.
 .Xr iked.conf 5 ,
 .Xr ikectl 8 ,
 .Xr isakmpd 8
+.Sh STANDARDS
 .Rs
+.%A C. Kaufman
+.%A P. Hoffman
+.%A Y. Nir
+.%A P. Eronen
+.%D September 2010
 .%R RFC 5996
 .%T Internet Key Exchange Protocol Version 2 (IKEv2)
-.%D September 2010
 .Re
 .Sh HISTORY
 The
diff --git a/sbin/ping6/ping6.8 b/sbin/ping6/ping6.8
index 4def78d5156..92fad6da615 100644
--- a/sbin/ping6/ping6.8
+++ b/sbin/ping6/ping6.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ping6.8,v 1.43 2012/08/23 21:01:30 jmc Exp $
+.\"	$OpenBSD: ping6.8,v 1.44 2012/09/22 20:09:43 jmc Exp $
 .\"	$KAME: ping6.8,v 1.57 2002/05/26 13:18:25 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 23 2012 $
+.Dd $Mdocdate: September 22 2012 $
 .Dt PING6 8
 .Os
 .Sh NAME
@@ -412,6 +412,7 @@ $ ping6 -a agl dst.foo.com
 .Xr ping 8 ,
 .Xr route6d 8 ,
 .Xr traceroute6 8
+.Sh STANDARDS
 .Rs
 .%A A. Conta
 .%A S. Deering
@@ -420,6 +421,7 @@ $ ping6 -a agl dst.foo.com
 .%R RFC 4443
 .%T "Internet Control Message Protocol (ICMPv6) for the Internet Protocol Version 6 (IPv6) Specification"
 .Re
+.Pp
 .Rs
 .%A M. Crawford
 .%A B. Haberman