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

references into a STANDARDS section;

3 files changed, 55 insertions, 10 deletions

diff --git a/usr.sbin/dhcpd/dhcp-options.5 b/usr.sbin/dhcpd/dhcp-options.5
index 101b9bf5852..18a1d3837a8 100644
--- a/usr.sbin/dhcpd/dhcp-options.5
+++ b/usr.sbin/dhcpd/dhcp-options.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dhcp-options.5,v 1.11 2012/08/29 18:13:50 jmc Exp $
+.\"	$OpenBSD: dhcp-options.5,v 1.12 2012/09/26 16:19:45 jmc Exp $
 .\"
 .\" Copyright (c) 1995, 1996, 1997, 1998 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 29 2012 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt DHCP-OPTIONS 5
 .Os
 .Sh NAME
@@ -587,12 +587,14 @@ Servers should be listed in order of preference.
 .Xr dhcpd.leases 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
 .Rs
 .%A S. Alexander
 .%A R. Droms
diff --git a/usr.sbin/dhcpd/dhcpd.conf.5 b/usr.sbin/dhcpd/dhcpd.conf.5
index 30eb84a0d9e..6aa7de9d413 100644
--- a/usr.sbin/dhcpd/dhcpd.conf.5
+++ b/usr.sbin/dhcpd/dhcpd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dhcpd.conf.5,v 1.10 2009/09/01 08:42:31 reyk Exp $
+.\"	$OpenBSD: dhcpd.conf.5,v 1.11 2012/09/26 16:19:45 jmc Exp $
 .\"
 .\" Copyright (c) 1995, 1996, 1997, 1998, 1998, 1999
 .\" 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: September 1 2009 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt DHCPD.CONF 5
 .Os
 .Sh NAME
@@ -930,8 +930,38 @@ manual page.
 .Xr dhcp-options 5 ,
 .Xr dhcpd.leases 5 ,
 .Xr dhcpd 8
-.Pp
-RFC 2132, RFC 2131, RFC 3046, RFC 3456
+.Sh STANDARDS
+.Rs
+.%A R. Droms
+.%D March 1997
+.%R RFC 2131
+.%T Dynamic Host Configuration Protocol
+.Re
+.Pp
+.Rs
+.%A S. Alexander
+.%A R. Droms
+.%D March 1997
+.%R RFC 2132
+.%T DHCP Options and BOOTP Vendor Extensions
+.Re
+.Pp
+.Rs
+.%A M. Patrick
+.%D January 2001
+.%R RFC 3046
+.%T DHCP Relay Agent Information Option
+.Re
+.Pp
+.Rs
+.%A B. Patel
+.%A B. Aboba
+.%A S. Kelly
+.%A V. Gupta
+.%D January 2003
+.%R RFC 3456
+.%T Dynamic Host Configuration Protocol (DHCPv4) Configuration of IPsec Tunnel Mode
+.Re
 .Sh AUTHORS
 .An -nosplit
 .Xr dhcpd 8
diff --git a/usr.sbin/dhcpd/dhcpd.leases.5 b/usr.sbin/dhcpd/dhcpd.leases.5
index 4b9e454acb3..446c701358e 100644
--- a/usr.sbin/dhcpd/dhcpd.leases.5
+++ b/usr.sbin/dhcpd/dhcpd.leases.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dhcpd.leases.5,v 1.6 2007/05/31 19:20:23 jmc Exp $
+.\"	$OpenBSD: dhcpd.leases.5,v 1.7 2012/09/26 16:19:45 jmc Exp $
 .\"
 .\" Copyright (c) 1997, 1998 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 26 2012 $
 .Dt DHCPD.LEASES 5
 .Os
 .Sh NAME
@@ -175,8 +175,21 @@ In that case, the address is immediately assigned to the client.
 .Xr dhcp-options 5 ,
 .Xr dhcpd.conf 5 ,
 .Xr dhcpd 8
-.Pp
-RFC 2132, RFC 2131.
+.Sh STANDARDS
+.Rs
+.%A R. Droms
+.%D March 1997
+.%R RFC 2131
+.%T Dynamic Host Configuration Protocol
+.Re
+.Pp
+.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 dhcpd 8