27 files changed, 359 insertions, 157 deletions
diff --git a/usr.sbin/arp/arp.4 b/usr.sbin/arp/arp.4
index 37e23afaac4..034de87e381 100644
--- a/usr.sbin/arp/arp.4
+++ b/usr.sbin/arp/arp.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: arp.4,v 1.19 2007/05/31 19:20:22 jmc Exp $
+.\"	$OpenBSD: arp.4,v 1.20 2012/09/26 16:19:44 jmc Exp $
 .\"	$NetBSD: arp.4,v 1.2 1995/03/01 11:50:56 chopps Exp $
 .\"
 .\" Copyright (c) 1985, 1986, 1988, 1994
@@ -30,7 +30,7 @@
 .\"
 .\"	from: @(#)arp4.4	6.5 (Berkeley) 4/18/94
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt ARP 4
 .Os
 .Sh NAME
@@ -146,15 +146,18 @@ This indicates a netmask problem.
 .Xr arp 8 ,
 .Xr ifconfig 8 ,
 .Xr route 8
-.Pp
+.Sh STANDARDS
 .Rs
-.%A Plummer, D.
-.%B "An Ethernet Address Resolution Protocol"
-.%T RFC 826
+.%A David C. Plummer
+.%D November 1982
+.%R RFC 826
+.%T "An Ethernet Address Resolution Protocol"
 .Re
+.Pp
 .Rs
-.%A Karels, M.J.
-.%A Leffler, S.J.
-.%B Trailer Encapsulations
-.%T RFC 893
+.%A Samuel J. Leffler
+.%A Michael J. Karels
+.%D April 1984
+.%R RFC 893
+.%T Trailer Encapsulations
 .Re
diff --git a/usr.sbin/bgpctl/bgpctl.8 b/usr.sbin/bgpctl/bgpctl.8
index d2fe1e2dd57..3e538dc55e4 100644
--- a/usr.sbin/bgpctl/bgpctl.8
+++ b/usr.sbin/bgpctl/bgpctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bgpctl.8,v 1.59 2012/05/27 20:49:42 jmc Exp $
+.\" $OpenBSD: bgpctl.8,v 1.60 2012/09/26 16:19:44 jmc Exp $
 .\"
 .\" Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
 .\"
@@ -14,7 +14,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: May 27 2012 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt BGPCTL 8
 .Os
 .Sh NAME
@@ -360,10 +360,19 @@ control socket
 .Xr bgpd 8 ,
 .Xr bgplg 8 ,
 .Xr bgplgsh 8
+.Sh STANDARDS
 .Rs
-.%R RFC 2622
-.%T "Routing Policy Specification Language (RPSL)"
+.%A C. Alaettinoglu
+.%A C. Villamizar
+.%A E. Gerich
+.%A D. Kessens
+.%A D. Meyer
+.%A T. Bates
+.%A D. Karrenberg
+.%A M. Terpstra
 .%D June 1999
+.%R RFC 2622
+.%T Routing Policy Specification Language (RPSL)
 .Re
 .Sh HISTORY
 The
diff --git a/usr.sbin/bgpd/bgpd.8 b/usr.sbin/bgpd/bgpd.8
index eb95f377353..1b9cf25e106 100644
--- a/usr.sbin/bgpd/bgpd.8
+++ b/usr.sbin/bgpd/bgpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bgpd.8,v 1.45 2012/08/24 20:13:03 jmc Exp $
+.\" $OpenBSD: bgpd.8,v 1.46 2012/09/26 16:19:44 jmc Exp $
 .\"
 .\" Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
 .\"
@@ -14,7 +14,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: August 24 2012 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt BGPD 8
 .Os
 .Sh NAME
@@ -227,6 +227,7 @@ control socket
 .Xr bgpctl 8 ,
 .Xr bgplg 8 ,
 .Xr bgplgsh 8
+.Sh STANDARDS
 .Rs
 .%A R. Chandra
 .%A P. Traina
@@ -235,12 +236,14 @@ control socket
 .%R RFC 1997
 .%T BGP Communities Attribute
 .Re
+.Pp
 .Rs
 .%A A. Heffernan
 .%D August 1998
 .%R RFC 2385
 .%T Protection of BGP Sessions via the TCP MD5 Signature Option
 .Re
+.Pp
 .Rs
 .%A P. Marques
 .%A F. Dupont
@@ -248,18 +251,21 @@ control socket
 .%R RFC 2545
 .%T Use of BGP-4 Multiprotocol Extensions for IPv6 Inter-Domain Routing
 .Re
+.Pp
 .Rs
 .%A E. Chen
 .%D September 2000
 .%R RFC 2918
 .%T Route Refresh Capability for BGP-4
 .Re
+.Pp
 .Rs
 .%A G. Huston
 .%D April 2004
 .%R RFC 3765
 .%T NOPEER Community for Border Gateway Protocol (BGP) Route Scope Control
 .Re
+.Pp
 .Rs
 .%A Y. Rekhter
 .%A "T. Li"
@@ -268,6 +274,7 @@ control socket
 .%R RFC 4271
 .%T A Border Gateway Protocol 4 (BGP-4)
 .Re
+.Pp
 .Rs
 .%A S. Sangli
 .%A D. Tappan
@@ -276,6 +283,7 @@ control socket
 .%R RFC 4360
 .%T BGP Extended Communities Attribute
 .Re
+.Pp
 .Rs
 .%A E. Rosen
 .%A Y. Rekhter
@@ -283,6 +291,7 @@ control socket
 .%R RFC 4364
 .%T BGP/MPLS IP Virtual Private Networks (VPNs)
 .Re
+.Pp
 .Rs
 .%A T. Bates
 .%A E. Chen
@@ -291,6 +300,7 @@ control socket
 .%R RFC 4456
 .%T "BGP Route Reflection: An Alternative to Full Mesh Internal BGP (IBGP)"
 .Re
+.Pp
 .Rs
 .%A E. Chen
 .%A V. Gillet
@@ -298,6 +308,7 @@ control socket
 .%R RFC 4486
 .%T Subcodes for BGP Cease Notification Message
 .Re
+.Pp
 .Rs
 .%A T. Bates
 .%A R. Chandra
@@ -307,6 +318,7 @@ control socket
 .%R RFC 4760
 .%T Multiprotocol Extensions for BGP-4
 .Re
+.Pp
 .Rs
 .%A Q. Vohra
 .%A E. Chen
@@ -314,6 +326,7 @@ control socket
 .%R RFC 4893
 .%T BGP Support for Four-octet AS Number Space
 .Re
+.Pp
 .Rs
 .%A V. Gill
 .%A J. Heasley
@@ -324,6 +337,7 @@ control socket
 .%R RFC 5082
 .%T The Generalized TTL Security Mechanism (GTSM)
 .Re
+.Pp
 .Rs
 .%A J. Scudder
 .%A R. Chandra
@@ -331,11 +345,19 @@ control socket
 .%R RFC 5492
 .%T Capabilities Advertisement with BGP-4
 .Re
+.Pp
 .Rs
 .%D April 2009
 .%R draft-ietf-idr-optional-transitive-00
 .%T Error Handling for Optional Transitive BGP Attributes
 .Re
+.Pp
+.Rs
+.%D August 2011
+.%R draft-ietf-grow-mrt-17
+.%T MRT routing information export format
+.Re
+.Pp
 .Rs
 .%A J. Dong
 .%A M. Chen
@@ -344,11 +366,6 @@ control socket
 .%R RFC 6608
 .%T Subcodes for BGP Finite State Machine Error
 .Re
-.Rs
-.%D August 2011
-.%R draft-ietf-grow-mrt-17
-.%T MRT routing information export format
-.Re
 .Sh HISTORY
 The
 .Nm
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
diff --git a/usr.sbin/dhcrelay/dhcrelay.8 b/usr.sbin/dhcrelay/dhcrelay.8
index 75a738cebe6..ab6b8ee23e7 100644
--- a/usr.sbin/dhcrelay/dhcrelay.8
+++ b/usr.sbin/dhcrelay/dhcrelay.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dhcrelay.8,v 1.10 2010/10/08 15:43:45 sobrado Exp $
+.\"	$OpenBSD: dhcrelay.8,v 1.11 2012/09/26 16:19:45 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: October 8 2010 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt DHCRELAY 8
 .Os
 .Sh NAME
@@ -100,8 +100,38 @@ interface.
 .Sh SEE ALSO
 .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, RFC 3046, RFC 3456
+.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
 .Nm
diff --git a/usr.sbin/dvmrpd/dvmrpd.8 b/usr.sbin/dvmrpd/dvmrpd.8
index e9761125ff7..4b04fa4a4d3 100644
--- a/usr.sbin/dvmrpd/dvmrpd.8
+++ b/usr.sbin/dvmrpd/dvmrpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dvmrpd.8,v 1.7 2009/10/22 15:02:12 sobrado Exp $
+.\"	$OpenBSD: dvmrpd.8,v 1.8 2012/09/26 16:19:45 jmc Exp $
 .\"
 .\" Copyright (c) 2004, 2005, 2006 Esben Norby <norby@openbsd.org>
 .\"
@@ -14,7 +14,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: October 22 2009 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt DVMRPD 8
 .Os
 .Sh NAME
@@ -108,10 +108,11 @@ socket used for communication with
 .Sh SEE ALSO
 .Xr dvmrpd.conf 5 ,
 .Xr dvmrpctl 8
+.Sh STANDARDS
 .Rs
-.%R "draft-ietf-idmr-dvmrp-v3-11"
-.%T "DVMRP Version 3"
 .%D August 2000
+.%R draft-ietf-idmr-dvmrp-v3-11
+.%T DVMRP Version 3
 .Re
 .Sh HISTORY
 The
diff --git a/usr.sbin/faithd/faithd.8 b/usr.sbin/faithd/faithd.8
index 748eca9a771..2dd68180ffb 100644
--- a/usr.sbin/faithd/faithd.8
+++ b/usr.sbin/faithd/faithd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: faithd.8,v 1.36 2012/08/18 08:44:25 jmc Exp $
+.\"	$OpenBSD: faithd.8,v 1.37 2012/09/26 16:19:44 jmc Exp $
 .\"	$KAME: faithd.8,v 1.36 2002/05/09 13:59:16 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 18 2012 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt FAITHD 8
 .Os
 .Sh NAME
@@ -292,13 +292,13 @@ setting.
 .Xr faith 4 ,
 .Xr route 8 ,
 .Xr sysctl 8
+.Sh STANDARDS
 .Rs
-.%A Jun-ichiro itojun Hagino
-.%A Kazu Yamamoto
-.%T "An IPv6-to-IPv4 transport relay translator"
-.%B RFC 3142
-.%U ftp://ftp.isi.edu/in-notes/rfc3142.txt
+.%A J. Hagino
+.%A K. Yamamoto
 .%D June 2001
+.%R RFC 3142
+.%T "An IPv6-to-IPv4 Transport Relay Translator"
 .Re
 .\"
 .Sh HISTORY
diff --git a/usr.sbin/iscsid/iscsid.8 b/usr.sbin/iscsid/iscsid.8
index 244fd1477b5..21668328831 100644
--- a/usr.sbin/iscsid/iscsid.8
+++ b/usr.sbin/iscsid/iscsid.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: iscsid.8,v 1.6 2012/06/26 22:26:14 jmc Exp $
+.\"	$OpenBSD: iscsid.8,v 1.7 2012/09/26 16:19:44 jmc Exp $
 .\"
 .\" Copyright (c) 2010 David Gwynne <dlg@openbsd.org>
 .\"
@@ -14,7 +14,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: June 26 2012 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt ISCSID 8
 .Os
 .Sh NAME
@@ -72,15 +72,27 @@ socket used for communication with
 .Xr vscsi 4 ,
 .Xr iscsi.conf 5 ,
 .Xr iscsictl 8
+.Sh STANDARDS
 .Rs
-.%R RFC 3720
-.%T "Internet Small Computer Systems Interface (iSCSI)"
+.%A J. Satran
+.%A K. Meth
+.%A C. Sapuntzakis
+.%A M. Chadalapaka
+.%A E. Zeidner
 .%D April 2004
+.%R RFC 3720
+.%T Internet Small Computer Systems Interface (iSCSI)
 .Re
+.Pp
 .Rs
-.%R RFC 3721
-.%T "Internet Small Computer Systems Interface (iSCSI) Naming and Discovery"
+.%A M. Bakke
+.%A J. Hafner
+.%A J. Hufferd
+.%A K. Voruganti
+.%A M. Krueger
 .%D April 2004
+.%R RFC 3721
+.%T Internet Small Computer Systems Interface (iSCSI) Naming and Discovery
 .Re
 .Sh HISTORY
 The
diff --git a/usr.sbin/ldapd/ldapd.8 b/usr.sbin/ldapd/ldapd.8
index 767afa3978e..05719743807 100644
--- a/usr.sbin/ldapd/ldapd.8
+++ b/usr.sbin/ldapd/ldapd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ldapd.8,v 1.9 2011/01/28 09:26:22 martinh Exp $
+.\"	$OpenBSD: ldapd.8,v 1.10 2012/09/26 16:19:44 jmc Exp $
 .\"
 .\" Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se>
 .\"
@@ -14,7 +14,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: January 28 2011 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt LDAPD 8
 .Os
 .Sh NAME
@@ -131,15 +131,19 @@ database files
 .Xr ldapd.conf 5 ,
 .Xr login.conf 5 ,
 .Xr ldapctl 8
+.Sh STANDARDS
 .Rs
+.%A J. Sermersheim
+.%D June 2006
 .%R RFC 4511
 .%T Lightweight Directory Access Protocol (LDAP): The Protocol
-.%D June 2006
 .Re
+.Pp
 .Rs
+.%A K. Zeilenga
+.%D June 2006
 .%R RFC 4512
 .%T Lightweight Directory Access Protocol (LDAP): Directory Information Models
-.%D June 2006
 .Re
 .Sh HISTORY
 The
diff --git a/usr.sbin/ldapd/ldapd.conf.5 b/usr.sbin/ldapd/ldapd.conf.5
index 5112336626b..ea31221838a 100644
--- a/usr.sbin/ldapd/ldapd.conf.5
+++ b/usr.sbin/ldapd/ldapd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ldapd.conf.5,v 1.15 2012/04/24 14:56:09 jmc Exp $
+.\"	$OpenBSD: ldapd.conf.5,v 1.16 2012/09/26 16:19:44 jmc Exp $
 .\"
 .\" Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se>
 .\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org>
@@ -17,7 +17,7 @@
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\"
-.Dd $Mdocdate: April 24 2012 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt LDAPD.CONF 5
 .Os
 .Sh NAME
@@ -36,7 +36,6 @@ and extend to the end of the current line.
 Care should be taken when commenting out multi-line text:
 the comment is effective until the end of the entire block.
 .Pp
-.Pp
 Argument names not beginning with a letter, digit, or underscore
 must be quoted.
 Arguments containing whitespace should be surrounded by double quotes
@@ -337,10 +336,12 @@ Default schema definition files.
 .Sh SEE ALSO
 .Xr ldapctl 8 ,
 .Xr ldapd 8
+.Sh STANDARDS
 .Rs
+.%A K. Zeilenga
+.%D June 2006
 .%R RFC 4512
 .%T Lightweight Directory Access Protocol (LDAP): Directory Information Models
-.%D June 2006
 .Re
 .Sh HISTORY
 The
diff --git a/usr.sbin/ldpd/ldpd.8 b/usr.sbin/ldpd/ldpd.8
index 6d196ce0eb6..fec78af6a55 100644
--- a/usr.sbin/ldpd/ldpd.8
+++ b/usr.sbin/ldpd/ldpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ldpd.8,v 1.6 2012/08/29 20:15:19 jmc Exp $
+.\"	$OpenBSD: ldpd.8,v 1.7 2012/09/26 16:19:45 jmc Exp $
 .\"
 .\" Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
 .\" Copyright (c) 2004, 2005, 2006 Esben Norby <norby@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: August 29 2012 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt LDPD 8
 .Os
 .Sh NAME
@@ -78,6 +78,7 @@ socket used for communication with
 .Xr ldpd.conf 5 ,
 .Xr ldpctl 8 ,
 .Xr rc.conf 8
+.Sh STANDARDS
 .Rs
 .%A E. Rosen
 .%A A. Viswanathan
@@ -86,6 +87,7 @@ socket used for communication with
 .%R RFC 3031
 .%T Multiprotocol Label Switching Architecture
 .Re
+.Pp
 .Rs
 .%A L. Andersson
 .%A I. Minei
diff --git a/usr.sbin/mrouted/mrouted.8 b/usr.sbin/mrouted/mrouted.8
index b0425d3368c..34bd7c851df 100644
--- a/usr.sbin/mrouted/mrouted.8
+++ b/usr.sbin/mrouted/mrouted.8
@@ -1,11 +1,11 @@
-.\"	$OpenBSD: mrouted.8,v 1.22 2010/04/05 16:47:01 deraadt Exp $
+.\"	$OpenBSD: mrouted.8,v 1.23 2012/09/26 16:19:44 jmc Exp $
 .\" The mrouted program is covered by the license in the accompanying file
 .\" named "LICENSE".  Use of the mrouted program represents acceptance of
 .\" the terms and conditions listed in that file.
 .\"
 .\" The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
 .\" Leland Stanford Junior University.
-.Dd $Mdocdate: April 5 2010 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt MROUTED 8
 .Os
 .Sh NAME
@@ -469,9 +469,11 @@ Note that there can be many sources in one subnet.
 .Xr map-mbone 8 ,
 .Xr mrinfo 8 ,
 .Xr mtrace 8
-.Pp
-DVMRP is described, along with other multicast routing algorithms, in the
-paper "Multicast Routing in Internetworks and Extended LANs" by S. Deering,
-in the Proceedings of the ACM SIGCOMM '88 Conference.
+.Sh STANDARDS
+.Rs
+.%A S. Deering
+.%O Proceedings of the ACM SIGCOMM '88 Conference
+.%T Multicast Routing in Internetworks and Extended LANs
+.Re
 .Sh AUTHORS
 Steve Deering, Ajit Thyagarajan, Bill Fenner
diff --git a/usr.sbin/ntpd/ntpd.8 b/usr.sbin/ntpd/ntpd.8
index 3a5fdcb027c..02e15379ca6 100644
--- a/usr.sbin/ntpd/ntpd.8
+++ b/usr.sbin/ntpd/ntpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ntpd.8,v 1.33 2012/09/19 16:30:39 henning Exp $
+.\" $OpenBSD: ntpd.8,v 1.34 2012/09/26 16:19:45 jmc Exp $
 .\"
 .\" Copyright (c) 2003, 2004, 2006 Henning Brauer <henning@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" AN 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 19 2012 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt NTPD 8
 .Os
 .Sh NAME
@@ -139,12 +139,14 @@ Drift file.
 .Xr rc 8 ,
 .Xr rc.conf 8 ,
 .Xr rdate 8
+.Sh STANDARDS
 .Rs
 .%A D. Mills
 .%D March 1992
 .%R RFC 1305
 .%T Network Time Protocol (Version 3): Specification, Implementation and Analysis
 .Re
+.Pp
 .Rs
 .%A D. Mills
 .%A U. Delaware
diff --git a/usr.sbin/openssl/openssl.1 b/usr.sbin/openssl/openssl.1
index 5c88d732cd8..eee3a2f0783 100644
--- a/usr.sbin/openssl/openssl.1
+++ b/usr.sbin/openssl/openssl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: openssl.1,v 1.90 2012/08/15 19:25:41 jmc Exp $
+.\" $OpenBSD: openssl.1,v 1.91 2012/09/26 16:19:44 jmc Exp $
 .\" ====================================================================
 .\" Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
 .\"
@@ -112,7 +112,7 @@
 .\"
 .\" OPENSSL
 .\"
-.Dd $Mdocdate: August 15 2012 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt OPENSSL 1
 .Os
 .Sh NAME
@@ -10459,50 +10459,76 @@ certificates.
 .Xr sendmail 8 ,
 .Xr ssl 8 ,
 .Xr starttls 8
+.Sh STANDARDS
 .Rs
-.%T The SSL Protocol
+.%D February 1995
 .%Q Netscape Communications Corp.
-.%D February 9 1995
+.%T The SSL Protocol
 .Re
+.Pp
 .Rs
-.%T The SSL 3.0 Protocol
+.%D November 1996
 .%Q Netscape Communications Corp.
-.%D November 18 1996
+.%T The SSL 3.0 Protocol
 .Re
+.Pp
 .Rs
+.%A T. Dierks
+.%A C. Allen
+.%D January 1999
 .%R RFC 2246
 .%T The TLS Protocol Version 1.0
-.%D January 1999
 .Re
+.Pp
 .Rs
-.%R RFC 2253
-.%T "LDAPv3 Distinguished Names"
+.%A M. Wahl
+.%A S. Killie
+.%A T. Howes
 .%D December 1997
+.%R RFC 2253
+.%T Lightweight Directory Access Protocol (v3): UTF-8 String Representation of Distinguished Names
 .Re
+.Pp
 .Rs
-.%R RFC 2315
-.%T "PKCS #7: Cryptographic Message Syntax"
+.%A B. Kaliski
 .%D March 1998
+.%R RFC 2315
+.%T PKCS #7: Cryptographic Message Syntax Version 1.5
 .Re
+.Pp
 .Rs
-.%R RFC 2459
-.%T "X.509 Certificate and CRL Profile"
+.%A R. Housley
+.%A W. Ford
+.%A W. Polk
+.%A D. Solo
 .%D January 1999
+.%R RFC 2459
+.%T Internet X.509 Public Key Infrastructure Certificate and CRL Profile
 .Re
+.Pp
 .Rs
-.%R RFC 2560
-.%T "Online Certificate Status Protocol \- OCSP"
+.%A M. Myers
+.%A R. Ankney
+.%A A. Malpani
+.%A S. Galperin
+.%A C. Adams
 .%D June 1999
+.%R RFC 2560
+.%T X.509 Internet Public Key Infrastructure Online Certificate Status Protocol \(en OCSP
 .Re
+.Pp
 .Rs
-.%R RFC 2630
-.%T "Cryptographic Message Syntax"
+.%A R. Housley
 .%D June 1999
+.%R RFC 2630
+.%T Cryptographic Message Syntax
 .Re
+.Pp
 .Rs
-.%R RFC 3268
-.%T "Advanced Encryption Standard (AES) Ciphersuites for Transport Layer Security(TLS)"
+.%A P. Chown
 .%D June 2002
+.%R RFC 3268
+.%T Advanced Encryption Standard (AES) Ciphersuites for Transport Layer Security(TLS)
 .Re
 .\"
 .\" OPENSSL HISTORY
diff --git a/usr.sbin/ospf6d/ospf6d.8 b/usr.sbin/ospf6d/ospf6d.8
index 98d5adaf4c7..5de6a58a643 100644
--- a/usr.sbin/ospf6d/ospf6d.8
+++ b/usr.sbin/ospf6d/ospf6d.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ospf6d.8,v 1.13 2010/05/24 19:44:23 jmc Exp $
+.\"	$OpenBSD: ospf6d.8,v 1.14 2012/09/26 16:19:44 jmc Exp $
 .\"
 .\" Copyright (c) 2004, 2005, 2007 Esben Norby <norby@openbsd.org>
 .\"
@@ -14,7 +14,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: May 24 2010 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt OSPF6D 8
 .Os
 .Sh NAME
@@ -163,15 +163,23 @@ socket used for communication with
 .Xr ipsec.conf 5 ,
 .Xr ospf6d.conf 5 ,
 .Xr ospf6ctl 8
+.Sh STANDARDS
 .Rs
-.%R RFC 5340
-.%T "OSPF for IPv6"
-.%D July 2008
+.%A M. Gupta
+.%A N. Melam
+.%D June 2006
+.%R RFC 4552
+.%T Authentication/Confidentiality for OSPFv3
 .Re
+.Pp
 .Rs
-.%R RFC 4552
-.%T "Authentication/Confidentiality for OSPFv3"
-.%D June 2006
+.%A R. Coltun
+.%A D. Ferguson
+.%A J. Moy
+.%A A. Lindem
+.%D July 2008
+.%R RFC 5340
+.%T OSPF for IPv6
 .Re
 .Sh HISTORY
 The
diff --git a/usr.sbin/ospfd/ospfd.8 b/usr.sbin/ospfd/ospfd.8
index d2b09dc7c66..7e9ce599c75 100644
--- a/usr.sbin/ospfd/ospfd.8
+++ b/usr.sbin/ospfd/ospfd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ospfd.8,v 1.28 2010/05/24 19:44:23 jmc Exp $
+.\"	$OpenBSD: ospfd.8,v 1.29 2012/09/26 16:19:45 jmc Exp $
 .\"
 .\" Copyright (c) 2004, 2005, 2007 Esben Norby <norby@openbsd.org>
 .\"
@@ -14,7 +14,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: May 24 2010 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt OSPFD 8
 .Os
 .Sh NAME
@@ -165,15 +165,23 @@ socket used for communication with
 .Sh SEE ALSO
 .Xr ospfd.conf 5 ,
 .Xr ospfctl 8
+.Sh STANDARDS
 .Rs
-.%R RFC 2328
-.%T "OSPF Version 2"
+.%A J. Moy
 .%D April 1998
+.%R RFC 2328
+.%T OSPF Version 2
 .Re
+.Pp
 .Rs
-.%R RFC 3137
-.%T "OSPF Stub Router Advertisement"
+.%A A. Retana
+.%A L. Nguyen
+.%A R. White
+.%A A. Zinin
+.%A D. McPherson
 .%D June 2001
+.%R RFC 3137
+.%T OSPF Stub Router Advertisement
 .Re
 .Sh HISTORY
 The
diff --git a/usr.sbin/popa3d/popa3d.8 b/usr.sbin/popa3d/popa3d.8
index e5a9e4f5f00..8b32d68a654 100644
--- a/usr.sbin/popa3d/popa3d.8
+++ b/usr.sbin/popa3d/popa3d.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: popa3d.8,v 1.16 2012/08/15 19:25:41 jmc Exp $
+.\"	$OpenBSD: popa3d.8,v 1.17 2012/09/26 16:19:44 jmc Exp $
 .\"
 .\" Copyright (c) 2001-2003 Camiel Dobbelaar (cd@sentia.nl)
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 15 2012 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt POPA3D 8
 .Os
 .Sh NAME
@@ -168,10 +168,15 @@ and is used in combination with
 .Xr sendmail 8 ,
 .Xr tcpd 8
 .Pp
-Official Internet Protocol Standard STD 53,
-also known as RFC 1939.
-.Pp
 .Lk http://www.openwall.com/popa3d/
+.Sh STANDARDS
+.Rs
+.%A J. Myers
+.%A M. Rose
+.%D May 1996
+.%R RFC 1939
+.%T Post Office Protocol \(en Version 3
+.Re
 .Sh HISTORY
 .Nm
 first appeared in
diff --git a/usr.sbin/pppoe/pppoe.8 b/usr.sbin/pppoe/pppoe.8
index 8731c840ae9..c7c55c1ae31 100644
--- a/usr.sbin/pppoe/pppoe.8
+++ b/usr.sbin/pppoe/pppoe.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pppoe.8,v 1.25 2012/08/15 19:25:41 jmc Exp $
+.\"	$OpenBSD: pppoe.8,v 1.26 2012/09/26 16:19:44 jmc Exp $
 .\"
 .\" Copyright (c) 2000 Network Security Technologies, Inc.
 .\" (http://www.netsec.net)
@@ -25,7 +25,7 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: August 15 2012 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt PPPOE 8
 .Os
 .Sh NAME
@@ -218,10 +218,17 @@ to adjust the maximum segment size on outgoing SYN packets.
 .Xr hostname.if 5 ,
 .Xr ifconfig 8 ,
 .Xr ppp 8
+.Sh STANDARDS
 .Rs
+.%A L. Mamakos
+.%A K. Lidl
+.%A J. Evarts
+.%A D. Carrel
+.%A D. Simone
+.%A R. Wheeler
+.%D February 1999
 .%R RFC 2516
 .%T A Method for Transmitting PPP Over Ethernet (PPPoE)
-.%A L. Mamakos, et al.
 .Re
 .Sh HISTORY
 This implementation of
diff --git a/usr.sbin/rarpd/rarpd.8 b/usr.sbin/rarpd/rarpd.8
index a7ec630bb68..97558f21301 100644
--- a/usr.sbin/rarpd/rarpd.8
+++ b/usr.sbin/rarpd/rarpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rarpd.8,v 1.18 2010/08/26 17:07:46 jsg Exp $
+.\"	$OpenBSD: rarpd.8,v 1.19 2012/09/26 16:19:44 jmc Exp $
 .\"	$NetBSD: rarpd.8,v 1.7 1998/04/15 15:06:06 mrg Exp $
 .\"
 .\" Copyright (c) 1988-1990 The Regents of the University of California.
@@ -19,9 +19,9 @@
 .\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
 .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-.\" @(#) $Id: rarpd.8,v 1.18 2010/08/26 17:07:46 jsg Exp $
+.\" @(#) $Id: rarpd.8,v 1.19 2012/09/26 16:19:44 jmc Exp $
 .\"
-.Dd $Mdocdate: August 26 2010 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt RARPD 8
 .Os
 .Sh NAME
@@ -95,13 +95,15 @@ Process ID of
 .Sh SEE ALSO
 .Xr bpf 4 ,
 .Xr diskless 8
+.Sh STANDARDS
 .Rs
-.%R A Reverse Address Resolution Protocol
-.%N RFC 903
-.%A Finlayson, R.
-.%A Mann, T.
-.%A Mogul, J.C.
-.%A Theimer, M.
+.%A R. Finlayson
+.%A T. Mann
+.%A J. Mogul
+.%A M. Theimer
+.%D June 1984
+.%R RFC 903
+.%T A Reverse Address Resolution Protocol
 .Re
 .Sh AUTHORS
 Craig Leres (leres@ee.lbl.gov) and Steven McCanne (mccanne@ee.lbl.gov).
diff --git a/usr.sbin/ripd/ripd.8 b/usr.sbin/ripd/ripd.8
index 85ae4abe1a7..72e31ce95ef 100644
--- a/usr.sbin/ripd/ripd.8
+++ b/usr.sbin/ripd/ripd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ripd.8,v 1.9 2010/05/24 19:44:23 jmc Exp $
+.\"	$OpenBSD: ripd.8,v 1.10 2012/09/26 16:19:45 jmc Exp $
 .\"
 .\" Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
 .\" Copyright (c) 2004, 2005, 2006 Esben Norby <norby@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: May 24 2010 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt RIPD 8
 .Os
 .Sh NAME
@@ -78,15 +78,20 @@ socket used for communication with
 .Xr ripd.conf 5 ,
 .Xr rc.conf 8 ,
 .Xr ripctl 8
+.Sh STANDARDS
 .Rs
-.%R RFC 2453
-.%T RIP Version 2
-.%D November 1998
+.%A F. Baker
+.%A R. Atkinson
+.%D January 1997
+.%R RFC 2082
+.%T RIP-2 MD5 Authentication
 .Re
+.Pp
 .Rs
-.%R RFC 2082
-.%T "RIP-2 MD5 Authentication"
-.%D January 1997
+.%A G. Malkin
+.%D November 1998
+.%R RFC 2453
+.%T RIP Version 2
 .Re
 .Sh HISTORY
 The
diff --git a/usr.sbin/route6d/route6d.8 b/usr.sbin/route6d/route6d.8
index 07f754bfab6..4cbcb7673d8 100644
--- a/usr.sbin/route6d/route6d.8
+++ b/usr.sbin/route6d/route6d.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: route6d.8,v 1.22 2012/06/21 19:57:14 jmc Exp $
+.\"	$OpenBSD: route6d.8,v 1.23 2012/09/26 16:19:44 jmc Exp $
 .\"	$KAME: route6d.8,v 1.11 2002/06/02 15:00:30 itojun Exp $
 .\"
 .\" Copyright (c) 1996 WIDE Project. All rights reserved.
@@ -15,7 +15,7 @@
 .\" LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 .\" A PARTICULAR PURPOSE.
 .\"
-.Dd $Mdocdate: June 21 2012 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt ROUTE6D 8
 .Os
 .Sh NAME
@@ -233,12 +233,13 @@ signal.
 .El
 .Sh SEE ALSO
 .Xr ripd 8
+.Sh STANDARDS
 .Rs
 .%A G. Malkin
 .%A R. Minnear
-.%T RIPng for IPv6
-.%R RFC 2080
 .%D January 1997
+.%R RFC 2080
+.%T RIPng for IPv6
 .Re
 .Sh NOTES
 .Nm
diff --git a/usr.sbin/rtadvd/rtadvd.conf.5 b/usr.sbin/rtadvd/rtadvd.conf.5
index 185ed56b679..206f0b85153 100644
--- a/usr.sbin/rtadvd/rtadvd.conf.5
+++ b/usr.sbin/rtadvd/rtadvd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rtadvd.conf.5,v 1.30 2012/08/18 15:40:30 jmc Exp $
+.\"	$OpenBSD: rtadvd.conf.5,v 1.31 2012/09/26 16:19:45 jmc Exp $
 .\"	$KAME: rtadvd.conf.5,v 1.46 2003/06/17 08:26:35 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 18 2012 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt RTADVD.CONF 5
 .Os
 .Sh NAME
@@ -339,6 +339,7 @@ ef0:\e
 .Xr termcap 5 ,
 .Xr rtadvd 8 ,
 .Xr rtsol 8
+.Sh STANDARDS
 .Rs
 .%A T. Narten
 .%A E. Nordmark
@@ -348,6 +349,7 @@ ef0:\e
 .%R RFC 4861
 .%T Neighbor Discovery for IP version 6 (IPv6)
 .Re
+.Pp
 .Rs
 .%A J. Jeong
 .%A S. Park
diff --git a/usr.sbin/smtpd/smtpd.8 b/usr.sbin/smtpd/smtpd.8
index 32ecea07ffd..8c060544ef3 100644
--- a/usr.sbin/smtpd/smtpd.8
+++ b/usr.sbin/smtpd/smtpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: smtpd.8,v 1.15 2012/07/15 18:42:28 gilles Exp $
+.\"	$OpenBSD: smtpd.8,v 1.16 2012/09/26 16:19:45 jmc Exp $
 .\"
 .\" Copyright (c) 2008, Gilles Chehade <gilles@openbsd.org>
 .\" Copyright (c) 2008, Pierre-Yves Ritschard <pyr@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: July 15 2012 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt SMTPD 8
 .Os
 .Sh NAME
@@ -128,10 +128,12 @@ socket used for communication with
 .Xr smtpd.conf 5 ,
 .Xr mailwrapper 8 ,
 .Xr smtpctl 8
+.Sh STANDARDS
 .Rs
-.%R RFC 5321
-.%T "Simple Mail Transfer Protocol"
+.%A J. Klensin
 .%D October 2008
+.%R RFC 5321
+.%T Simple Mail Transfer Protocol
 .Re
 .Sh HISTORY
 The
diff --git a/usr.sbin/snmpd/snmpd.8 b/usr.sbin/snmpd/snmpd.8
index a1967b3b78b..cf31253f05a 100644
--- a/usr.sbin/snmpd/snmpd.8
+++ b/usr.sbin/snmpd/snmpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: snmpd.8,v 1.16 2012/09/18 10:40:20 reyk Exp $
+.\" $OpenBSD: snmpd.8,v 1.17 2012/09/26 16:19:45 jmc Exp $
 .\"
 .\" Copyright (c) 2007, 2008 Reyk Floeter <reyk@openbsd.org>
 .\"
@@ -14,7 +14,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 26 2012 $
 .Dt SNMPD 8
 .Os
 .Sh NAME
@@ -81,40 +81,41 @@ Management Information Base definitions
 .Sh SEE ALSO
 .Xr snmpd.conf 5 ,
 .Xr snmpctl 8
+.Sh STANDARDS
 .Rs
-.%A R. Presuhn
-.%R STD 62
-.%R RFC 3418
-.%T Management Information Base (MIB) for the Simple Network Management Protocol (SNMP)
+.%A U. Blumenthal
+.%A B. Wijnen
 .%D December 2002
+.%R RFC 3414
+.%T User-based Security Model (USM) for version 3 of the Simple Network Management Protocol (SNMPv3)
 .Re
+.Pp
 .Rs
 .%A R. Presuhn
-.%R STD 62
-.%R RFC 3417
-.%T Transport Mappings for the Simple Network Management Protocol (SNMP)
 .%D December 2002
+.%R RFC 3416
+.%T Version 2 of the Protocol Operations for the Simple Network Management Protocol (SNMP)
 .Re
+.Pp
 .Rs
 .%A R. Presuhn
-.%R STD 62
-.%R RFC 3416
-.%T Version 2 of the Protocol Operations for the Simple Network Management Protocol (SNMP)
 .%D December 2002
+.%R RFC 3417
+.%T Transport Mappings for the Simple Network Management Protocol (SNMP)
 .Re
+.Pp
 .Rs
-.%A U. Blumenthal
-.%A B. Wijnen
-.%R STD 62
-.%R RFC 3414
-.%T User-based Security Model (USM) for version 3 of the Simple Network Management Protocol (SNMPv3)
+.%A R. Presuhn
 .%D December 2002
+.%R RFC 3418
+.%T Management Information Base (MIB) for the Simple Network Management Protocol (SNMP)
 .Re
+.Pp
 .Rs
 .%A U. Blumenthal
+.%D June 2004
 .%R RFC 3826
 .%T The Advanced Encryption Standard (AES) Cipher Algorithm in the SNMP User-based Security Model
-.%D June 2004
 .Re
 .Sh HISTORY
 The
diff --git a/usr.sbin/tcpdump/tcpdump.8 b/usr.sbin/tcpdump/tcpdump.8
index a252422737d..ee40633afa9 100644
--- a/usr.sbin/tcpdump/tcpdump.8
+++ b/usr.sbin/tcpdump/tcpdump.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tcpdump.8,v 1.78 2012/08/29 22:19:31 jmc Exp $
+.\"	$OpenBSD: tcpdump.8,v 1.79 2012/09/26 16:19:45 jmc Exp $
 .\"
 .\" Copyright (c) 1987, 1988, 1989, 1990, 1991, 1992, 1994, 1995, 1996
 .\"	The Regents of the University of California.  All rights reserved.
@@ -19,7 +19,7 @@
 .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
-.Dd $Mdocdate: August 29 2012 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt TCPDUMP 8
 .Os
 .Sh NAME
@@ -1838,34 +1838,40 @@ sees the packet.
 .Xr pf.os 5 ,
 .Xr protocols 5 ,
 .Xr services 5
+.Sh STANDARDS
 .Rs
 .%D September 1981
 .%R RFC 793
 .%T Transmission Control Protocol
 .Re
+.Pp
 .Rs
 .%A P. Mockapetris
 .%D November 1987
 .%R RFC 1034
 .%T Domain Names \(en Concepts and Facilities
 .Re
+.Pp
 .Rs
 .%A P. Mockapetris
 .%D November 1987
 .%R RFC 1035
 .%T Domain Names \(en Implementation and Specification
 .Re
+.Pp
 .Rs
 .%D April 1988
 .%R RFC 1050
 .%T RPC: Remote Procedure Call Protocol Specification
 .Re
+.Pp
 .Rs
 .%A V. Jacobson
 .%D February 1990
 .%R RFC 1144
 .%T Compressing TCP/IP Headers for Low-Speed Serial Links
 .Re
+.Pp
 .Rs
 .%A M. Mathis
 .%A J. Mahdavi
@@ -1875,6 +1881,7 @@ sees the packet.
 .%R RFC 2018
 .%T TCP Selective Acknowledgement Options
 .Re
+.Pp
 .Rs
 .%A V. Manral
 .%D April 2007