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

references into a STANDARDS section;

13 files changed, 116 insertions, 54 deletions

diff --git a/share/man/man4/faith.4 b/share/man/man4/faith.4
index ae0c48cef4e..ffb0d079fba 100644
--- a/share/man/man4/faith.4
+++ b/share/man/man4/faith.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: faith.4,v 1.18 2012/08/18 08:44:25 jmc Exp $
+.\"	$OpenBSD: faith.4,v 1.19 2012/09/26 17:34:38 jmc Exp $
 .\"	$KAME: faith.4,v 1.10 2001/06/30 00:42:48 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 FAITH 4
 .Os
 .Sh NAME
@@ -123,13 +123,13 @@ interface is intended to be used on routers, not on hosts.
 .Xr hostname.if 5 ,
 .Xr faithd 8 ,
 .Xr netstart 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
 The FAITH IPv6-to-IPv4 TCP relay translator first appeared in
diff --git a/share/man/man4/gif.4 b/share/man/man4/gif.4
index a19139b906c..0b53f9d053a 100644
--- a/share/man/man4/gif.4
+++ b/share/man/man4/gif.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gif.4,v 1.26 2012/08/23 15:03:36 jmc Exp $
+.\"	$OpenBSD: gif.4,v 1.27 2012/09/26 17:34:38 jmc Exp $
 .\"	$KAME: gif.4,v 1.15 2000/04/19 09:39:42 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 26 2012 $
 .Dt GIF 4
 .Os
 .Sh NAME
@@ -204,6 +204,7 @@ operator.
 .Xr hostname.if 5 ,
 .Xr ifconfig 8 ,
 .Xr netstart 8
+.Sh STANDARDS
 .Rs
 .%A R. Housley
 .%A S. Hollenbeck
@@ -211,6 +212,7 @@ operator.
 .%R RFC 3378
 .%T EtherIP: Tunneling Ethernet Frames in IP Datagrams
 .Re
+.Pp
 .Rs
 .%A E. Nordmark
 .%A R. Gilligan
diff --git a/share/man/man4/gre.4 b/share/man/man4/gre.4
index cef7bde4ba7..953e1041084 100644
--- a/share/man/man4/gre.4
+++ b/share/man/man4/gre.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: gre.4,v 1.36 2012/08/18 08:44:25 jmc Exp $
+.\" $OpenBSD: gre.4,v 1.37 2012/09/26 17:34:38 jmc Exp $
 .\" $NetBSD: gre.4,v 1.10 1999/12/22 14:55:49 kleink Exp $
 .\"
 .\" Copyright 1998 (c) The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY  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 GRE 4
 .Os
 .Sh NAME
@@ -250,22 +250,39 @@ these packets.
 .Xr ifconfig 8 ,
 .Xr netstart 8 ,
 .Xr sysctl 8
+.Sh STANDARDS
 .Rs
+.%A S. Hanks
+.%A "T. Li"
+.%A D. Farinacci
+.%A P. Traina
+.%D October 1994
 .%R RFC 1701
-.%T Generic Routing Encapsulation
+.%T Generic Routing Encapsulation (GRE)
 .Re
+.Pp
 .Rs
+.%A S. Hanks
+.%A "T. Li"
+.%A D. Farinacci
+.%A P. Traina
+.%D October 1994
 .%R RFC 1702
 .%T Generic Routing Encapsulation over IPv4 networks
 .Re
+.Pp
 .Rs
+.%A C. Perkins
+.%D October 1996
 .%R RFC 2004
 .%T Minimal Encapsulation within IP
 .Re
+.Pp
 .Rs
 .%U http://www.wrec.org/Drafts/draft-ietf-wrec-web-pro-00.txt
 .%T Web Cache Coordination Protocol V1.0
 .Re
+.Pp
 .Rs
 .%U http://www.wrec.org/Drafts/draft-wilson-wrec-wccp-v2-00.txt
 .%T Web Cache Coordination Protocol V2.0
diff --git a/share/man/man4/icmp6.4 b/share/man/man4/icmp6.4
index b95e53b24d3..dbe4af1261b 100644
--- a/share/man/man4/icmp6.4
+++ b/share/man/man4/icmp6.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: icmp6.4,v 1.27 2012/08/23 21:01:30 jmc Exp $
+.\"	$OpenBSD: icmp6.4,v 1.28 2012/09/26 17:34:38 jmc Exp $
 .\"	$KAME: icmp6.4,v 1.6 2004/12/27 05:30:56 itojun Exp $
 .\"
 .\" Copyright (c) 1986, 1991, 1993
@@ -27,7 +27,7 @@
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
-.Dd $Mdocdate: August 23 2012 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt ICMP6 4
 .Os
 .Sh NAME
@@ -236,6 +236,7 @@ structure as the option value.
 .Xr inet6 4 ,
 .Xr ip6 4 ,
 .Xr netintro 4
+.Sh STANDARDS
 .Rs
 .%A W. Stevens
 .%A M. Thomas
@@ -245,6 +246,7 @@ structure as the option value.
 .%R RFC 3542
 .%T Advanced Sockets Application Program Interface (API) for IPv6
 .Re
+.Pp
 .Rs
 .%A A. Conta
 .%A S. Deering
diff --git a/share/man/man4/ip6.4 b/share/man/man4/ip6.4
index 2b758f53759..6e581383b16 100644
--- a/share/man/man4/ip6.4
+++ b/share/man/man4/ip6.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ip6.4,v 1.28 2012/09/17 21:12:42 jmc Exp $
+.\"	$OpenBSD: ip6.4,v 1.29 2012/09/26 17:34:38 jmc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -26,7 +26,7 @@
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
-.Dd $Mdocdate: September 17 2012 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt IP6 4
 .Os
 .Sh NAME
@@ -679,42 +679,46 @@ An ancillary data object was improperly formed.
 .Xr netintro 4 ,
 .Xr tcp 4 ,
 .Xr udp 4
+.Sh STANDARDS
 .Rs
 .%A S. Deering
 .%A R. Hinden
-.%T Internet Protocol, Version 6 (IPv6) Specification
-.%R RFC 2460
 .%D December 1998
+.%R RFC 2460
+.%T Internet Protocol, Version 6 (IPv6) Specification
 .Re
+.Pp
 .Rs
 .%A R. Gilligan
 .%A S. Thomson
 .%A J. Bound
 .%A W. Stevens
-.%T Basic Socket Interface Extensions for IPv6
-.%R RFC 2553
 .%D March 1999
+.%R RFC 2553
+.%T Basic Socket Interface Extensions for IPv6
 .Re
+.Pp
 .Rs
+.%A R. Gilligan
+.%A S. Thomson
+.%A J. Bound
+.%A J. McCann
 .%A W. Stevens
-.%A B. Fenner
-.%A A. Rudoff
-.%T UNIX Network Programming, third edition
+.%D February 2003
+.%R RFC 3493
+.%T Basic Socket Interface Extensions for IPv6
 .Re
+.Pp
 .Rs
 .%A W. Stevens
 .%A M. Thomas
 .%A E. Nordmark
 .%A T. Jinmei
-.%T Advanced Sockets Application Program Interface (API) for IPv6
-.%R RFC 3542
 .%D May 2003
+.%R RFC 3542
+.%T Advanced Sockets Application Program Interface (API) for IPv6
 .Re
-.Sh STANDARDS
-Most of the socket options are defined in RFC 2553 or RFC 3542.
-The
-.Dv IPV6_V6ONLY
-socket option is defined in RFC 3493.
+.Pp
 The
 .Dv IPV6_PORTRANGE
 socket option and the conflict resolution rule are not defined in the
diff --git a/share/man/man4/pflow.4 b/share/man/man4/pflow.4
index 1db7382f02d..219851921af 100644
--- a/share/man/man4/pflow.4
+++ b/share/man/man4/pflow.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pflow.4,v 1.12 2012/08/22 18:22:42 jmc Exp $
+.\" $OpenBSD: pflow.4,v 1.13 2012/09/26 17:34:38 jmc Exp $
 .\"
 .\" Copyright (c) 2008 Henning Brauer <henning@openbsd.org>
 .\" Copyright (c) 2008 Joerg Goltermann <jg@osn.de>
@@ -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 22 2012 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt PFLOW 4
 .Os
 .Sh NAME
@@ -111,12 +111,14 @@ The protocol is set to IPFIX with the following command:
 .Xr pf.conf 5 ,
 .Xr ifconfig 8 ,
 .Xr tcpdump 8
+.Sh STANDARDS
 .Rs
 .%A B. Claise
 .%D October 2004
 .%R RFC 3954
 .%T Cisco Systems NetFlow Services Export Version 9
 .Re
+.Pp
 .Rs
 .%A B. Claise
 .%D January 2008
diff --git a/share/man/man4/ppp.4 b/share/man/man4/ppp.4
index 6a162ba9fd6..dc2ebd225cb 100644
--- a/share/man/man4/ppp.4
+++ b/share/man/man4/ppp.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ppp.4,v 1.12 2009/01/31 19:37:12 sobrado Exp $
+.\"	$OpenBSD: ppp.4,v 1.13 2012/09/26 17:34:38 jmc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     From:	@(#)lo.4	8.1 (Berkeley) 6/5/93
 .\"
-.Dd $Mdocdate: January 31 2009 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt PPP 4
 .Os
 .Sh NAME
@@ -74,10 +74,12 @@ family; the packet was dropped.
 .Xr netstart 8 ,
 .Xr pppd 8 ,
 .Xr pppstats 8
+.Sh STANDARDS
 .Rs
-.%R RFC 1661
+.%A W. Simpson
 .%D July 1994
-.%T "The Point-to-Point Protocol (PPP)"
+.%R RFC 1661
+.%T The Point-to-Point Protocol (PPP)
 .Re
 .Sh HISTORY
 The
diff --git a/share/man/man4/pppoe.4 b/share/man/man4/pppoe.4
index d6ec596ec8d..baa02391786 100644
--- a/share/man/man4/pppoe.4
+++ b/share/man/man4/pppoe.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pppoe.4,v 1.23 2012/01/19 23:29:24 sthen Exp $
+.\"	$OpenBSD: pppoe.4,v 1.24 2012/09/26 17:34:38 jmc Exp $
 .\"	$NetBSD: pppoe.4,v 1.26 2003/10/02 07:06:36 wiz Exp $
 .\"
 .\" Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 19 2012 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt PPPOE 4
 .Os
 .Sh NAME
@@ -240,15 +240,28 @@ for more information on MTU, MSS, and NAT.
 .Xr ifconfig 8 ,
 .Xr ppp 8 ,
 .Xr pppoe 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)
-.%D February 1999
 .Re
+.Pp
 .Rs
+.%A P. Arberg
+.%A D. Kourkouzelis
+.%A M. Duckett
+.%A T. Anschutz
+.%A J. Moisand
+.%D September 2006
 .%R RFC 4638
 .%T Accommodating a Maximum Transit Unit/Maximum Receive Unit (MTU/MRU) Greater Than 1492 in the Point-to-Point Protocol over Ethernet (PPPoE)
-.%D September 2006
 .Re
 .Sh HISTORY
 The
diff --git a/share/man/man4/sppp.4 b/share/man/man4/sppp.4
index a7db3779c55..47c428e0f63 100644
--- a/share/man/man4/sppp.4
+++ b/share/man/man4/sppp.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sppp.4,v 1.21 2012/08/24 14:41:43 jmc Exp $
+.\" $OpenBSD: sppp.4,v 1.22 2012/09/26 17:34:38 jmc Exp $
 .\"
 .\" Copyright (c) 1997 Joerg Wunsch
 .\"
@@ -25,7 +25,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd $Mdocdate: August 24 2012 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt SPPP 4
 .Os
 .Sh NAME
@@ -206,12 +206,14 @@ take place.
 .Xr pppoe 4 ,
 .Xr ifconfig 8 ,
 .Xr ppp 8
+.Sh STANDARDS
 .Rs
 .%A G. McGregor
 .%D May 1992
 .%R RFC 1332
 .%T The PPP Internet Protocol Control Protocol (IPCP)
 .Re
+.Pp
 .Rs
 .%A B. Lloyd
 .%A W. Simpson
@@ -219,18 +221,21 @@ take place.
 .%R RFC 1334
 .%T PPP Authentication Protocols
 .Re
+.Pp
 .Rs
 .%A W. Simpson
 .%D July 1994
 .%R RFC 1661
 .%T The Point-to-Point Protocol (PPP)
 .Re
+.Pp
 .Rs
 .%A W. Simpson
 .%D August 1996
 .%R RFC 1994
 .%T PPP Challenge Handshake Authentication Protocol (CHAP)
 .Re
+.Pp
 .Rs
 .%A S. Varada
 .%A D. Haskins
diff --git a/share/man/man5/moduli.5 b/share/man/man5/moduli.5
index aa7e06291b9..ef0de08506b 100644
--- a/share/man/man5/moduli.5
+++ b/share/man/man5/moduli.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: moduli.5,v 1.16 2011/11/28 08:46:27 eric Exp $
+.\"	$OpenBSD: moduli.5,v 1.17 2012/09/26 17:34:38 jmc Exp $
 .\"
 .\" Copyright (c) 2008 Damien Miller <djm@mindrot.org>
 .\"
@@ -13,7 +13,7 @@
 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 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: November 28 2011 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt MODULI 5
 .Os
 .Sh NAME
@@ -115,8 +115,13 @@ that best meets the size requirement.
 .Sh SEE ALSO
 .Xr ssh-keygen 1 ,
 .Xr sshd 8
+.Sh STANDARDS
 .Rs
+.%A M. Friedl
+.%A N. Provos
+.%A W. Simpson
+.%D March 2006
 .%R RFC 4419
-.%T "Diffie-Hellman Group Exchange for the Secure Shell (SSH) Transport Layer Protocol"
+.%T Diffie-Hellman Group Exchange for the Secure Shell (SSH) Transport Layer Protocol
 .%D 2006
 .Re
diff --git a/share/man/man5/networks.5 b/share/man/man5/networks.5
index 426658c03bd..fc01d04ee96 100644
--- a/share/man/man5/networks.5
+++ b/share/man/man5/networks.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: networks.5,v 1.15 2012/08/22 19:48:50 jmc Exp $
+.\"	$OpenBSD: networks.5,v 1.16 2012/09/26 17:34:38 jmc Exp $
 .\"	$NetBSD: networks.5,v 1.9 1999/03/17 20:19:47 garbled Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)networks.5	8.1 (Berkeley) 6/5/93
 .\"
-.Dd $Mdocdate: August 22 2012 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt NETWORKS 5
 .Os
 .Sh NAME
@@ -105,12 +105,14 @@ ISP should the need arise.
 .Xr resolv.conf 5 ,
 .Xr hostname 7 ,
 .Xr named 8
+.Sh STANDARDS
 .Rs
 .%A P. Mockapetris
 .%D April 1989
 .%R RFC 1101
 .%T DNS Encoding of Network Names and Other Types
 .Re
+.Pp
 .Rs
 .%A Y. Rekhter
 .%A B. Moskowitz
@@ -121,6 +123,7 @@ ISP should the need arise.
 .%R RFC 1918
 .%T Address Allocation for Private Internets
 .Re
+.Pp
 .Rs
 .%A H. Eidnes
 .%A G. de Groot
@@ -129,12 +132,13 @@ ISP should the need arise.
 .%R RFC 2317
 .%T Classless IN-ADDR.ARPA delegation
 .Re
+.Pp
 .Rs
 .%A V. Fuller
 .%A "T. Li"
 .%D August 2006
 .%R RFC 4632
-.%T "Classless Inter-domain Routing (CIDR): The Internet Address Assignment and Aggregation Plan"
+.%T Classless Inter-domain Routing (CIDR): The Internet Address Assignment and Aggregation Plan
 .Re
 .Sh HISTORY
 The
diff --git a/share/man/man7/mailaddr.7 b/share/man/man7/mailaddr.7
index a2626cbeee3..8975134b9a5 100644
--- a/share/man/man7/mailaddr.7
+++ b/share/man/man7/mailaddr.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mailaddr.7,v 1.12 2012/08/18 16:25:20 jmc Exp $
+.\"	$OpenBSD: mailaddr.7,v 1.13 2012/09/26 17:34:38 jmc Exp $
 .\"	$NetBSD: mailaddr.7,v 1.3 1994/11/30 19:07:17 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1987, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)mailaddr.7	8.1 (Berkeley) 6/16/93
 .\"
-.Dd $Mdocdate: August 18 2012 $
+.Dd $Mdocdate: September 26 2012 $
 .Dt MAILADDR 7
 .Os
 .Sh NAME
@@ -161,6 +161,7 @@ respectively.
 .Sh SEE ALSO
 .Xr mail 1 ,
 .Xr sendmail 8
+.Sh STANDARDS
 .Rs
 .%A P. Resnick
 .%D 2008
diff --git a/share/man/man8/starttls.8 b/share/man/man8/starttls.8
index 91255a5a8bc..596b70660e8 100644
--- a/share/man/man8/starttls.8
+++ b/share/man/man8/starttls.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: starttls.8,v 1.17 2012/08/15 19:07:30 jmc Exp $
+.\" $OpenBSD: starttls.8,v 1.18 2012/09/26 17:34:38 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Jose Nazario <jose@monkey.org>
 .\" All rights reserved.
@@ -23,7 +23,7 @@
 .\" OTHERWISE) ARISING IN 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 STARTTLS 8
 .Os
 .Sh NAME
@@ -374,8 +374,13 @@ Lastly, interoperability problems can appear between different implementations.
 .Xr sendmail 8 ,
 .Xr ssl 8
 .Pp
-DARPA Internet Request for Comments RFC 3207
-.Pp
 .Lk http://www.sendmail.org/~ca/email/starttls.html
+.Sh STANDARDS
+.Rs
+.%A P. Hoffman
+.%D February 2002
+.%R RFC 3207
+.%T SMTP Service Extension for Secure SMTP over Transport Layer Security
+.Re
 .Sh HISTORY
 TLS features first appeared in sendmail 8.11.