From: Sascha Wildner <swildner@dragonflybsd.org>
Date: Fri, 23 Nov 2007 23:16:37 +0000 (+0000)
Subject: Uniformly refer to RFCs as 'RFC xxxx' and not 'RFCxxxx' or 'RFC-xxxx'.
X-Git-Url: https://gitweb.dragonflybsd.org/~syl/dragonfly.git/commitdiff_plain/cabeba4772bc70c9d55f7e8ef07c932d5a30e411

Uniformly refer to RFCs as 'RFC xxxx' and not 'RFCxxxx' or 'RFC-xxxx'.
---

diff --git a/lib/libc/gen/vis.3 b/lib/libc/gen/vis.3
index c532c281b0..d70ae8fa1c 100644
--- a/lib/libc/gen/vis.3
+++ b/lib/libc/gen/vis.3
@@ -31,7 +31,7 @@
 .\"
 .\"     From: @(#)vis.3	8.1 (Berkeley) 6/9/93
 .\" $FreeBSD: src/lib/libc/gen/vis.3,v 1.27 2005/01/15 11:40:33 ru Exp $
-.\" $DragonFly: src/lib/libc/gen/vis.3,v 1.4 2005/09/03 16:25:42 joerg Exp $
+.\" $DragonFly: src/lib/libc/gen/vis.3,v 1.5 2007/11/23 23:16:36 swildner Exp $
 .\"
 .Dd March 21, 2004
 .Dt VIS 3
@@ -311,7 +311,7 @@ ambiguous and non-invertible.
 .Rs
 .%A R. Fielding
 .%T Relative Uniform Resource Locators
-.%O RFC1808
+.%O RFC 1808
 .Re
 .Sh HISTORY
 These functions first appeared in
diff --git a/lib/libc/net/getipnodebyname.3 b/lib/libc/net/getipnodebyname.3
index ba1b29c134..54ff771cb2 100644
--- a/lib/libc/net/getipnodebyname.3
+++ b/lib/libc/net/getipnodebyname.3
@@ -1,5 +1,5 @@
 .\"	$FreeBSD: src/lib/libc/net/getipnodebyname.3,v 1.2.2.4 2001/12/14 18:33:55 ru Exp $
-.\"	$DragonFly: src/lib/libc/net/getipnodebyname.3,v 1.3 2006/02/17 19:35:06 swildner Exp $
+.\"	$DragonFly: src/lib/libc/net/getipnodebyname.3,v 1.4 2007/11/23 23:16:36 swildner Exp $
 .\"	$KAME: getipnodebyname.3,v 1.6 2000/08/09 21:16:17 itojun Exp $
 .\"
 .\" Copyright (c) 1983, 1987, 1991, 1993
@@ -428,7 +428,7 @@ The meanings of each error code are described in
 .%A J. Bound
 .%A W. Stevens
 .%T Basic Socket Interface Extensions for IPv6
-.%R RFC2553
+.%R RFC 2553
 .%D March 1999
 .Re
 .\"
@@ -438,7 +438,7 @@ and
 .Fn getipnodebyaddr
 are documented in
 .Dq Basic Socket Interface Extensions for IPv6
-(RFC2553).
+(RFC 2553).
 .\"
 .Sh HISTORY
 The implementation first appeared in KAME advanced networking kit.
@@ -458,4 +458,4 @@ are recommended.
 .Pp
 The current implementation is not thread-safe.
 .Pp
-The text was shamelessly copied from RFC2553.
+The text was shamelessly copied from RFC 2553.
diff --git a/lib/libc/net/inet6_option_space.3 b/lib/libc/net/inet6_option_space.3
index 4ad669595c..d5b5d65fcf 100644
--- a/lib/libc/net/inet6_option_space.3
+++ b/lib/libc/net/inet6_option_space.3
@@ -1,6 +1,6 @@
 .\"	$KAME: inet6_option_space.3,v 1.11 2005/01/05 03:00:44 itojun Exp $
 .\"	$FreeBSD: src/lib/libc/net/inet6_option_space.3,v 1.16 2005/01/23 16:02:48 gnn Exp $
-.\"	$DragonFly: src/lib/libc/net/inet6_option_space.3,v 1.6 2007/04/07 19:29:51 swildner Exp $
+.\"	$DragonFly: src/lib/libc/net/inet6_option_space.3,v 1.7 2007/11/23 23:16:36 swildner Exp $
 .\"
 .\" Copyright (C) 2004 WIDE Project.
 .\" All rights reserved.
@@ -66,7 +66,7 @@ Manipulating and parsing IPv6's Hop-by-Hop and Destination options is
 complicated by the need to properly align and pad data as well as the
 need to manipulate ancillary information that is not part of the data
 stream.
-RFC2292 defines a set of functions, which are implemented as
+RFC 2292 defines a set of functions, which are implemented as
 part of the Kame libraries, to support help developers create, change,
 and parse Hop-by-Hope and Destination options.
 All of the prototypes
@@ -103,7 +103,7 @@ structures, where
 is the number of options to be stored in the object.
 Usually this has
 no impact because it is assumed that most Hop-by-Hop and Destination
-option headers carry only one option as indicated in appendix B of RFC2460.
+option headers carry only one option as indicated in appendix B of RFC 2460.
 .\"
 .Ss inet6_option_init
 The
@@ -378,7 +378,7 @@ beginning after the value of
 .Fa *tptrp .
 .\"
 .Sh EXAMPLES
-RFC2292 gives comprehensive examples in chapter 6.
+RFC 2292 gives comprehensive examples in chapter 6.
 .\"
 .Sh DIAGNOSTICS
 The
@@ -414,21 +414,21 @@ value.
 .%A W. Stevens
 .%A M. Thomas
 .%T "Advanced Sockets API for IPv6"
-.%N RFC2292
+.%N RFC 2292
 .%D February 1998
 .Re
 .Rs
 .%A S. Deering
 .%A R. Hinden
 .%T "Internet Protocol, Version 6 (IPv6) Specification"
-.%N RFC2460
+.%N RFC 2460
 .%D December 1998
 .Re
 .\"
 .Sh STANDARDS
 The functions are documented in
 .Dq Advanced Sockets API for IPv6
-(RFC2292).
+(RFC 2292).
 .\"
 .Sh HISTORY
 The implementation first appeared in KAME advanced networking kit.
diff --git a/lib/libc/net/inet6_rthdr_space.3 b/lib/libc/net/inet6_rthdr_space.3
index fe94f1d0d8..91f3f293fb 100644
--- a/lib/libc/net/inet6_rthdr_space.3
+++ b/lib/libc/net/inet6_rthdr_space.3
@@ -1,6 +1,6 @@
 .\"	$KAME: inet6_rthdr_space.3,v 1.11 2005/01/05 03:00:44 itojun Exp $
 .\"	$FreeBSD: src/lib/libc/net/inet6_rthdr_space.3,v 1.14 2005/01/23 16:02:48 gnn Exp $
-.\"	$DragonFly: src/lib/libc/net/inet6_rthdr_space.3,v 1.4 2006/02/17 19:35:06 swildner Exp $
+.\"	$DragonFly: src/lib/libc/net/inet6_rthdr_space.3,v 1.5 2007/11/23 23:16:36 swildner Exp $
 .\"
 .\" Copyright (C) 2004 WIDE Project.
 .\" All rights reserved.
@@ -246,10 +246,10 @@ that segment.
 When an error occurs \-1 is returned.
 .Pp
 Note: Flags begin at index 0 while segments begin at index 1, to
-maintain consistency with the terminology and figures in RFC2460.
+maintain consistency with the terminology and figures in RFC 2460.
 .\"
 .Sh EXAMPLES
-RFC2292 gives comprehensive examples in chapter 8.
+RFC 2292 gives comprehensive examples in chapter 8.
 .\"
 .Sh DIAGNOSTICS
 The
@@ -281,14 +281,14 @@ functions return -1 on error.
 .%A W. Stevens
 .%A M. Thomas
 .%T "Advanced Sockets API for IPv6"
-.%N RFC2292
+.%N RFC 2292
 .%D February 1998
 .Re
 .Rs
 .%A S. Deering
 .%A R. Hinden
 .%T "Internet Protocol, Version 6 (IPv6) Specification"
-.%N RFC2460
+.%N RFC 2460
 .%D December 1998
 .Re
 .\"
diff --git a/lib/libc/net/rcmd.3 b/lib/libc/net/rcmd.3
index 9d79d6f099..0838ee67b9 100644
--- a/lib/libc/net/rcmd.3
+++ b/lib/libc/net/rcmd.3
@@ -31,7 +31,7 @@
 .\"
 .\"     From: @(#)rcmd.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/net/rcmd.3,v 1.12.2.8 2001/12/14 18:33:55 ru Exp $
-.\" $DragonFly: src/lib/libc/net/rcmd.3,v 1.3 2007/07/30 22:11:33 swildner Exp $
+.\" $DragonFly: src/lib/libc/net/rcmd.3,v 1.4 2007/11/23 23:16:36 swildner Exp $
 .\"
 .Dd March 3, 2000
 .Dt RCMD 3
@@ -274,7 +274,7 @@ is overloaded to mean ``All network ports in use.''
 .%A W. Stevens
 .%A M. Thomas
 .%T "Advanced Socket API for IPv6"
-.%O RFC2292
+.%O RFC 2292
 .Re
 .Rs
 .%A W. Stevens
@@ -288,7 +288,7 @@ Most of these
 functions appeared in
 .Bx 4.2 .
 .Fn rresvport_af
-appeared in RFC2292, and was implemented by the WIDE project
+appeared in RFC 2292, and was implemented by the WIDE project
 for the Hydrangea IPv6 protocol stack kit.
 .Fn rcmd_af
 appeared in draft-ietf-ipngwg-rfc2292bis-01.txt,
diff --git a/lib/libc/net/resolver.3 b/lib/libc/net/resolver.3
index e5f437f10a..6c6ef53bfd 100644
--- a/lib/libc/net/resolver.3
+++ b/lib/libc/net/resolver.3
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)resolver.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/net/resolver.3,v 1.11.2.7 2001/12/14 18:33:55 ru Exp $
-.\" $DragonFly: src/lib/libc/net/resolver.3,v 1.3 2006/05/26 19:39:37 swildner Exp $
+.\" $DragonFly: src/lib/libc/net/resolver.3,v 1.4 2007/11/23 23:16:36 swildner Exp $
 .\"
 .Dd June 4, 1993
 .Dt RESOLVER 3
@@ -357,11 +357,11 @@ see
 .Xr hostname 7 ,
 .Xr named 8
 .Pp
-.%T RFC1032 ,
-.%T RFC1033 ,
-.%T RFC1034 ,
-.%T RFC1035 ,
-.%T RFC974
+.%T RFC 1032 ,
+.%T RFC 1033 ,
+.%T RFC 1034 ,
+.%T RFC 1035 ,
+.%T RFC 974
 .Rs
 .%T "Name Server Operations Guide for BIND"
 .Re
diff --git a/lib/libc/rpc/rpc.3 b/lib/libc/rpc/rpc.3
index f7a567120a..6b0cc427b1 100644
--- a/lib/libc/rpc/rpc.3
+++ b/lib/libc/rpc/rpc.3
@@ -1,6 +1,6 @@
 .\" @(#)rpc.3n	2.4 88/08/08 4.0 RPCSRC; from 1.19 88/06/24 SMI
 .\" $FreeBSD: src/lib/libc/rpc/rpc.3,v 1.11.2.5 2001/12/14 18:33:56 ru Exp $
-.\" $DragonFly: src/lib/libc/rpc/rpc.3,v 1.5 2006/10/26 16:50:42 swildner Exp $
+.\" $DragonFly: src/lib/libc/rpc/rpc.3,v 1.6 2007/11/23 23:16:36 swildner Exp $
 .\"
 .Dd February 16, 1988
 .Dt RPC 3
@@ -1516,6 +1516,6 @@ Service implementors usually do not need this routine.
 .Re
 .Rs
 .%T "RPC: Remote Procedure Call Protocol Specification"
-.%O RFC1050
+.%O RFC 1050
 .%Q "Sun Microsystems, Inc., USC-ISI"
 .Re
diff --git a/lib/libc/rpc/rpc_secure.3 b/lib/libc/rpc/rpc_secure.3
index 9c232341b9..73b3c87022 100644
--- a/lib/libc/rpc/rpc_secure.3
+++ b/lib/libc/rpc/rpc_secure.3
@@ -1,6 +1,6 @@
 .\" @(#)rpc_secure.3n	2.1 88/08/08 4.0 RPCSRC; from 1.19 88/06/24 SMI
 .\" $FreeBSD: src/lib/libc/rpc/rpc_secure.3,v 1.6.2.5 2001/12/14 18:33:57 ru Exp $
-.\" $DragonFly: src/lib/libc/rpc/rpc_secure.3,v 1.3 2007/08/18 20:48:47 swildner Exp $
+.\" $DragonFly: src/lib/libc/rpc/rpc_secure.3,v 1.4 2007/11/23 23:16:36 swildner Exp $
 .\"
 .Dd February 16, 1988
 .Dt RPC 3
@@ -254,5 +254,5 @@ The following manuals:
 .Re
 .Rs
 .%B RPC: Remote Procedure Call Protocol Specification
-.%O RFC1050, Sun Microsystems Inc., USC-ISI
+.%O RFC 1050, Sun Microsystems Inc., USC-ISI
 .Re
diff --git a/lib/libc/xdr/xdr.3 b/lib/libc/xdr/xdr.3
index c804fe35ac..35ce0057c7 100644
--- a/lib/libc/xdr/xdr.3
+++ b/lib/libc/xdr/xdr.3
@@ -1,6 +1,6 @@
 .\" @(#)xdr.3n	2.2 88/08/03 4.0 RPCSRC; from 1.16 88/03/14 SMI
 .\" $FreeBSD: src/lib/libc/xdr/xdr.3,v 1.8.2.4 2001/12/14 18:34:06 ru Exp $
-.\" $DragonFly: src/lib/libc/xdr/xdr.3,v 1.2 2003/06/17 04:26:47 dillon Exp $
+.\" $DragonFly: src/lib/libc/xdr/xdr.3,v 1.3 2007/11/23 23:16:36 swildner Exp $
 .\"
 .Dd February 16, 1988
 .Dt XDR 3
@@ -729,6 +729,6 @@ Returns one if it succeeds, zero otherwise.
 .Re
 .Rs
 .%T "XDR: External Data Representation Standard"
-.%O RFC1014
+.%O RFC 1014
 .%Q "Sun Microsystems, Inc., USC\-ISI"
 .Re
diff --git a/lib/libfetch/fetch.3 b/lib/libfetch/fetch.3
index a35353f4be..35813d7413 100644
--- a/lib/libfetch/fetch.3
+++ b/lib/libfetch/fetch.3
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/lib/libfetch/fetch.3,v 1.63 2007/05/24 20:28:14 des Exp $
-.\" $DragonFly: src/lib/libfetch/fetch.3,v 1.4 2007/08/05 21:48:12 swildner Exp $
+.\" $DragonFly: src/lib/libfetch/fetch.3,v 1.5 2007/11/23 23:16:36 swildner Exp $
 .\"
 .Dd July 1, 1998
 .Dt FETCH 3
@@ -127,7 +127,7 @@ uploading files using Uniform Resource Locators (URLs).
 .Fn fetchParseURL
 takes a URL in the form of a null-terminated string and splits it into
 its components function according to the Common Internet Scheme Syntax
-detailed in RFC1738.
+detailed in RFC 1738.
 A regular expression which produces this syntax is:
 .Bd -literal
     <scheme>:(//(<user>(:<pwd>)?@)?<host>(:<port>)?)?/(<document>)?
@@ -308,7 +308,7 @@ replacing them.
 .Fn fetchGetFTP
 and
 .Fn fetchPutFTP
-implement the FTP protocol as described in RFC959.
+implement the FTP protocol as described in RFC 959.
 .Pp
 If the
 .Ql p
@@ -342,7 +342,7 @@ and
 .Fn fetchPutHTTP
 functions implement the HTTP/1.1 protocol.
 With a little luck, there is
-even a chance that they comply with RFC2616 and RFC2617.
+even a chance that they comply with RFC 2616 and RFC 2617.
 .Pp
 If the
 .Ql d
@@ -564,7 +564,7 @@ HTTP_PROXY_AUTH=basic:*:<user>:<pwd>
 .%A J. K. Reynolds
 .%D October 1985
 .%B File Transfer Protocol
-.%O RFC959
+.%O RFC 959
 .Re
 .Rs
 .%A P. Deutsch
@@ -572,7 +572,7 @@ HTTP_PROXY_AUTH=basic:*:<user>:<pwd>
 .%A A. Marine.
 .%D May 1994
 .%T How to Use Anonymous FTP
-.%O RFC1635
+.%O RFC 1635
 .Re
 .Rs
 .%A T. Berners-Lee
@@ -580,7 +580,7 @@ HTTP_PROXY_AUTH=basic:*:<user>:<pwd>
 .%A M. McCahill
 .%D December 1994
 .%T Uniform Resource Locators (URL)
-.%O RFC1738
+.%O RFC 1738
 .Re
 .Rs
 .%A R. Fielding
@@ -592,7 +592,7 @@ HTTP_PROXY_AUTH=basic:*:<user>:<pwd>
 .%A T. Berners-Lee
 .%D January 1999
 .%B Hypertext Transfer Protocol -- HTTP/1.1
-.%O RFC2616
+.%O RFC 2616
 .Re
 .Rs
 .%A J. Franks
@@ -604,7 +604,7 @@ HTTP_PROXY_AUTH=basic:*:<user>:<pwd>
 .%A L. Stewart
 .%D June 1999
 .%B HTTP Authentication: Basic and Digest Access Authentication
-.%O RFC2617
+.%O RFC 2617
 .Re
 .Sh HISTORY
 The
diff --git a/libexec/bootpd/bootpd.8 b/libexec/bootpd/bootpd.8
index 298882ff1e..5b99f3c833 100644
--- a/libexec/bootpd/bootpd.8
+++ b/libexec/bootpd/bootpd.8
@@ -1,7 +1,7 @@
 .\" Copyright (c) 1988, 1989, 1991 Carnegie Mellon University
 .\"
 .\" $FreeBSD: src/libexec/bootpd/bootpd.8,v 1.10.2.5 2001/07/22 12:07:21 dd Exp $
-.\" $DragonFly: src/libexec/bootpd/bootpd.8,v 1.4 2006/02/17 19:33:31 swildner Exp $
+.\" $DragonFly: src/libexec/bootpd/bootpd.8,v 1.5 2007/11/23 23:16:36 swildner Exp $
 .\"
 .Dd November 6, 1993
 .Dt BOOTPD 8
@@ -30,7 +30,7 @@
 .Sh DESCRIPTION
 .Nm Bootpd
 implements an Internet Bootstrap Protocol (BOOTP) server as defined in
-RFC951, RFC1532, and RFC1533.
+RFC 951, RFC 1532, and RFC 1533.
 .Nm Bootpgw
 implements a simple BOOTP gateway which can be used to forward
 requests and responses between clients on one subnet and a
@@ -252,12 +252,12 @@ Current directory typically used by the TFTP server and
 .Xr tftpd 8
 .Pp
 DARPA Internet Request For Comments:
-.Bl -tag -width RFC1533 -compact
-.It RFC951
+.Bl -tag -width "RFC 1533" -compact
+.It RFC 951
 Bootstrap Protocol
-.It RFC1532
+.It RFC 1532
 Clarifications and Extensions for the Bootstrap Protocol
-.It RFC1533
+.It RFC 1533
 DHCP Options and BOOTP Vendor Extensions
 .El
 .Sh BUGS
diff --git a/libexec/bootpd/bootptab.5 b/libexec/bootpd/bootptab.5
index 553a1fbe80..6adf219d30 100644
--- a/libexec/bootpd/bootptab.5
+++ b/libexec/bootpd/bootptab.5
@@ -1,7 +1,7 @@
 .\" Copyright (c) 1988, 1989, 1991 Carnegie Mellon University
 .\"
 .\" $FreeBSD: src/libexec/bootpd/bootptab.5,v 1.4.2.4 2001/08/16 10:44:13 ru Exp $
-.\" $DragonFly: src/libexec/bootpd/bootptab.5,v 1.2 2003/06/17 04:27:07 dillon Exp $
+.\" $DragonFly: src/libexec/bootpd/bootptab.5,v 1.3 2007/11/23 23:16:36 swildner Exp $
 .\"
 .Dd October 31, 1991
 .Dt BOOTPTAB 5
@@ -106,15 +106,15 @@ There is also a generic tag,
 .Pf T Em n ,
 where
 .Em n
-is an RFC1084 vendor field tag number.  Thus it is possible to immediately
-take advantage of future extensions to RFC1084 without being forced to modify
+is an RFC 1084 vendor field tag number.  Thus it is possible to immediately
+take advantage of future extensions to RFC 1084 without being forced to modify
 .Nm bootpd
 first.  Generic data may be represented as either a stream of hexadecimal
 numbers or as a quoted string of
 .Tn ASCII
 characters.  The length of the generic
 data is automatically determined and inserted into the proper field(s) of the
-RFC1084-style bootp reply.
+RFC 1084 style bootp reply.
 .Pp
 The following tags take a whitespace-separated list of IP addresses:
 .Em cs ,
@@ -296,14 +296,14 @@ tag) may take one of the following keywords:
 .Em rfc1048
 or
 .Em rfc1084
-(which always forces an RFC1084-style reply), or
+(which always forces an RFC 1084 style reply), or
 .Em cmu
-(which always forces a CMU-style reply).
+(which always forces a CMU style reply).
 .Pp
 The
 .Em hn
 tag is strictly a boolean tag; it does not take the usual equals-sign and
-value.  Its presence indicates that the hostname should be sent to RFC1084
+value.  Its presence indicates that the hostname should be sent to RFC 1084
 clients.
 .Nm Bootpd
 attempts to send the entire hostname as it is specified in the configuration
@@ -406,4 +406,5 @@ mtoliver:ht=1:ha=00DD00FE1600:tc=.default:
 .Xr bootpd 8 ,
 .Xr tftpd 8
 .Pp
-DARPA Internet Request For Comments RFC951, RFC1048, RFC1084, Assigned Numbers
+DARPA Internet Request For Comments RFC 951, RFC 1048, RFC 1084,
+Assigned Numbers
diff --git a/libexec/bootpd/tools/bootpef/bootpef.8 b/libexec/bootpd/tools/bootpef/bootpef.8
index ce3cae78bf..f6451c61b0 100644
--- a/libexec/bootpd/tools/bootpef/bootpef.8
+++ b/libexec/bootpd/tools/bootpef/bootpef.8
@@ -1,5 +1,5 @@
 .\" $FreeBSD: src/libexec/bootpd/tools/bootpef/bootpef.8,v 1.2.2.1 2001/01/16 13:14:37 ru Exp $
-.\" $DragonFly: src/libexec/bootpd/tools/bootpef/bootpef.8,v 1.2 2003/06/17 04:27:07 dillon Exp $
+.\" $DragonFly: src/libexec/bootpd/tools/bootpef/bootpef.8,v 1.3 2007/11/23 23:16:36 swildner Exp $
 .\"
 .\" bootpef.8
 .Dd December 4, 1993
@@ -55,10 +55,10 @@ data to be sent to each client.
 .Xr bootpd 8 ,
 .Xr tftpd 8
 .Rs
-.%O RFC951
+.%O RFC 951
 .%T "BOOTSTRAP PROTOCOL (BOOTP)"
 .Re
 .Rs
-.%O RFC1497
+.%O RFC 1497
 .%T "BOOTP Vendor Information Extensions"
 .Re
diff --git a/libexec/bootpd/tools/bootptest/bootptest.8 b/libexec/bootpd/tools/bootptest/bootptest.8
index 1dddb1ab73..24f8f8568f 100644
--- a/libexec/bootpd/tools/bootptest/bootptest.8
+++ b/libexec/bootpd/tools/bootptest/bootptest.8
@@ -1,5 +1,5 @@
 .\" $FreeBSD: src/libexec/bootpd/tools/bootptest/bootptest.8,v 1.2.2.1 2001/01/16 13:14:38 ru Exp $
-.\" $DragonFly: src/libexec/bootpd/tools/bootptest/bootptest.8,v 1.3 2006/02/17 19:33:31 swildner Exp $
+.\" $DragonFly: src/libexec/bootpd/tools/bootptest/bootptest.8,v 1.4 2007/11/23 23:16:36 swildner Exp $
 .\"
 .\" bootptest.8
 .Dd June 10, 1993
@@ -48,11 +48,11 @@ area of the request packet.
 .Sh SEE ALSO
 .Xr bootpd 8
 .Rs
-.%O RFC951
+.%O RFC 951
 .%T "BOOTSTRAP PROTOCOL (BOOTP)"
 .Re
 .Rs
-.%O RFC1048
+.%O RFC 1048
 .%T "BOOTP Vendor Information Extensions"
 .Re
 .Sh AUTHORS
diff --git a/libexec/fingerd/fingerd.8 b/libexec/fingerd/fingerd.8
index 0ce0869446..b918f1d58b 100644
--- a/libexec/fingerd/fingerd.8
+++ b/libexec/fingerd/fingerd.8
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)fingerd.8	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/libexec/fingerd/fingerd.8,v 1.4.2.3 2001/08/16 10:44:15 ru Exp $
-.\" $DragonFly: src/libexec/fingerd/fingerd.8,v 1.4 2006/04/08 08:17:07 swildner Exp $
+.\" $DragonFly: src/libexec/fingerd/fingerd.8,v 1.5 2007/11/23 23:16:36 swildner Exp $
 .\"
 .Dd June 4, 1993
 .Dt FINGERD 8
@@ -47,7 +47,7 @@
 .Sh DESCRIPTION
 .Nm Fingerd
 is a simple protocol based on
-.%T RFC1196
+.%T RFC 1196
 that provides an interface to the
 Name and Finger programs at several network sites.
 The program is supposed to return a friendly,
diff --git a/libexec/tftpd/tftpd.8 b/libexec/tftpd/tftpd.8
index b783f0b6d6..e9b731eac6 100644
--- a/libexec/tftpd/tftpd.8
+++ b/libexec/tftpd/tftpd.8
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)tftpd.8	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/libexec/tftpd/tftpd.8,v 1.6.2.6 2003/04/06 19:42:56 dwmalone Exp $
-.\" $DragonFly: src/libexec/tftpd/tftpd.8,v 1.2 2003/06/17 04:27:08 dillon Exp $
+.\" $DragonFly: src/libexec/tftpd/tftpd.8,v 1.3 2007/11/23 23:16:36 swildner Exp $
 .\"
 .Dd September 14, 2000
 .Dt TFTPD 8
@@ -195,6 +195,6 @@ option was introduced in
 .Fx 4.3 .
 .Sh BUGS
 Files larger than 33488896 octets (65535 blocks) cannot be transferred
-without client and server supporting blocksize negotiation (RFC1783).
+without client and server supporting blocksize negotiation (RFC 1783).
 .Pp
 Many tftp clients will not transfer files over 16744448 octets (32767 blocks).
diff --git a/sbin/md5/md5.1 b/sbin/md5/md5.1
index 9653583085..377adff87f 100644
--- a/sbin/md5/md5.1
+++ b/sbin/md5/md5.1
@@ -1,5 +1,5 @@
 .\" $FreeBSD: src/sbin/md5/md5.1,v 1.23 2005/01/17 07:44:09 ru Exp $
-.\" $DragonFly: src/sbin/md5/md5.1,v 1.6 2007/09/29 08:33:46 swildner Exp $
+.\" $DragonFly: src/sbin/md5/md5.1,v 1.7 2007/11/23 23:16:36 swildner Exp $
 .Dd June 6, 2004
 .Dt MD5 1
 .Os
@@ -102,7 +102,7 @@ and 1 if at least one of the input files could not be read.
 .Rs
 .%A R. Rivest
 .%T The MD5 Message-Digest Algorithm
-.%O RFC1321
+.%O RFC 1321
 .Re
 .Rs
 .%A J. Burrows
diff --git a/sbin/mountd/exports.5 b/sbin/mountd/exports.5
index 8151115d9a..89a8755add 100644
--- a/sbin/mountd/exports.5
+++ b/sbin/mountd/exports.5
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)exports.5	8.3 (Berkeley) 3/29/95
 .\" $FreeBSD: src/sbin/mountd/exports.5,v 1.10.2.8 2002/09/28 16:31:45 markm Exp $
-.\" $DragonFly: src/sbin/mountd/exports.5,v 1.4 2007/09/02 19:30:47 swildner Exp $
+.\" $DragonFly: src/sbin/mountd/exports.5,v 1.5 2007/11/23 23:16:36 swildner Exp $
 .\"
 .Dd March 29, 1995
 .Dt EXPORTS 5
@@ -52,7 +52,7 @@ mount protocol per the
 .Tn NFS
 server specification; see
 .%T "Network File System Protocol Specification" ,
-RFC1094, Appendix A and
+RFC 1094, Appendix A and
 .%T "NFS: Network File System Version 3 Specification" ,
 Appendix I.
 .Pp
diff --git a/sbin/mountd/mountd.8 b/sbin/mountd/mountd.8
index a5ab165f99..8a5c41bdd1 100644
--- a/sbin/mountd/mountd.8
+++ b/sbin/mountd/mountd.8
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)mountd.8	8.4 (Berkeley) 4/28/95
 .\" $FreeBSD: src/sbin/mountd/mountd.8,v 1.16.2.2 2000/12/08 14:04:02 ru Exp $
-.\" $DragonFly: src/sbin/mountd/mountd.8,v 1.3 2007/07/14 21:48:16 swildner Exp $
+.\" $DragonFly: src/sbin/mountd/mountd.8,v 1.4 2007/11/23 23:16:36 swildner Exp $
 .\"
 .Dd April 28, 1995
 .Dt MOUNTD 8
@@ -54,7 +54,7 @@ It listens for service requests at the port indicated in the
 .Tn NFS
 server specification; see
 .%T "Network File System Protocol Specification" ,
-RFC1094, Appendix A and
+RFC 1094, Appendix A and
 .%T "NFS: Network File System Version 3 Protocol Specification" ,
 Appendix I.
 .Pp
diff --git a/sbin/nfsd/nfsd.8 b/sbin/nfsd/nfsd.8
index 30111dc3a7..ad02eea85e 100644
--- a/sbin/nfsd/nfsd.8
+++ b/sbin/nfsd/nfsd.8
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)nfsd.8	8.4 (Berkeley) 3/29/95
 .\" $FreeBSD: src/sbin/nfsd/nfsd.8,v 1.12.2.3 2002/05/20 18:06:11 gordon Exp $
-.\" $DragonFly: src/sbin/nfsd/nfsd.8,v 1.3 2006/03/21 04:24:28 swildner Exp $
+.\" $DragonFly: src/sbin/nfsd/nfsd.8,v 1.4 2007/11/23 23:16:36 swildner Exp $
 .\"
 .Dd March 29, 1995
 .Dt NFSD 8
@@ -115,7 +115,7 @@ listens for service requests at the port indicated in the
 .Tn NFS
 server specification; see
 .%T "Network File System Protocol Specification" ,
-RFC1094 and
+RFC 1094 and
 .%T "NFS: Network File System Version 3 Protocol Specification" .
 .Pp
 If
diff --git a/sbin/ping6/ping6.8 b/sbin/ping6/ping6.8
index a572bfbf89..42ee8c13b1 100644
--- a/sbin/ping6/ping6.8
+++ b/sbin/ping6/ping6.8
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	$FreeBSD: src/sbin/ping6/ping6.8,v 1.3.2.12 2003/02/24 00:56:42 trhodes Exp $
-.\"	$DragonFly: src/sbin/ping6/ping6.8,v 1.6 2007/11/21 19:12:40 swildner Exp $
+.\"	$DragonFly: src/sbin/ping6/ping6.8,v 1.7 2007/11/23 23:16:36 swildner Exp $
 .\"
 .Dd May 17, 1998
 .Dt PING6 8
@@ -98,7 +98,7 @@ from a host or gateway.
 datagrams (``pings'') have an IPv6 header,
 and
 .Tn ICMPv6
-header formatted as documented in RFC2463.
+header formatted as documented in RFC 2463.
 The options are as follows:
 .Bl -tag -width Ds
 .\" old ipsec
@@ -446,7 +446,7 @@ and non-zero if the arguments are incorrect or the host is not responding.
 .%A A. Conta
 .%A S. Deering
 .%T "Internet Control Message Protocol (ICMPv6) for the Internet Protocol Version 6 (IPv6) Specification"
-.%N RFC2463
+.%N RFC 2463
 .%D December 1998
 .Re
 .Rs
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index a66685fe5b..b2846b5ed9 100644
--- a/sbin/routed/routed.8
+++ b/sbin/routed/routed.8
@@ -1,5 +1,5 @@
 .\" $FreeBSD: src/sbin/routed/routed.8,v 1.15.2.9 2002/02/17 08:37:54 schweikh Exp $
-.\" $DragonFly: src/sbin/routed/routed.8,v 1.3 2006/02/17 19:33:33 swildner Exp $
+.\" $DragonFly: src/sbin/routed/routed.8,v 1.4 2007/11/23 23:16:36 swildner Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -56,8 +56,8 @@
 .Nm Routed
 is a daemon invoked at boot time to manage the network
 routing tables.
-It uses Routing Information Protocol, RIPv1 (RFC\ 1058),
-RIPv2 (RFC\ 1723),
+It uses Routing Information Protocol, RIPv1 (RFC 1058),
+RIPv2 (RFC 1723),
 and Internet Router Discovery Protocol (RFC 1256)
 to maintain the kernel routing table.
 The RIPv1 protocol is based on the reference
diff --git a/sbin/routed/rtquery/rtquery.8 b/sbin/routed/rtquery/rtquery.8
index 1272b2ec09..1a6c8aae05 100644
--- a/sbin/routed/rtquery/rtquery.8
+++ b/sbin/routed/rtquery/rtquery.8
@@ -1,6 +1,6 @@
 .\" $Revision: 1.10 $
 .\" $FreeBSD: src/sbin/routed/rtquery/rtquery.8,v 1.11.2.4 2003/05/10 23:22:48 murray Exp $
-.\" $DragonFly: src/sbin/routed/rtquery/rtquery.8,v 1.2 2003/06/17 04:27:34 dillon Exp $
+.\" $DragonFly: src/sbin/routed/rtquery/rtquery.8,v 1.3 2007/11/23 23:16:36 swildner Exp $
 .\"
 .Dd June 1, 1996
 .Dt RTQUERY 8
@@ -123,9 +123,9 @@ dumps the daemon's routing table to the current tracefile.
 .Xr routed 8
 .Rs
 .%T Routing Information Protocol, RIPv1
-.%O RFC1058
+.%O RFC 1058
 .Re
 .Rs
 .%T Routing Information Protocol, RIPv2
-.%O RFC1723
+.%O RFC 1723
 .Re
diff --git a/share/man/man4/gif.4 b/share/man/man4/gif.4
index c785b3454c..d1d3743ce9 100644
--- a/share/man/man4/gif.4
+++ b/share/man/man4/gif.4
@@ -1,5 +1,5 @@
 .\"	$FreeBSD: src/share/man/man4/gif.4,v 1.3.2.11 2003/03/03 18:51:16 trhodes Exp $
-.\"	$DragonFly: src/share/man/man4/gif.4,v 1.2 2003/06/17 04:36:59 dillon Exp $
+.\"	$DragonFly: src/share/man/man4/gif.4,v 1.3 2007/11/23 23:16:37 swildner Exp $
 .\"	$KAME: gif.4,v 1.28 2001/05/18 13:15:56 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -45,7 +45,7 @@ It can tunnel IPv[46] traffic over IPv[46].
 Therefore, there can be four possible configurations.
 The behavior of
 .Nm
-is mainly based on RFC2893 IPv6-over-IPv4 configured tunnel.
+is mainly based on RFC 2893 IPv6-over-IPv4 configured tunnel.
 On
 .Nx ,
 .Nm
@@ -103,7 +103,7 @@ interface flag.
 Without
 .Dv IFF_LINK1 ,
 .Nm
-will show normal behavior, as described in RFC2893.
+will show normal behavior, as described in RFC 2893.
 This can be summarized as follows:
 .Bl -tag -width "Ingress" -offset indent
 .It Ingress
@@ -138,7 +138,7 @@ If outer ECN CE bit is
 enable ECN CE bit on the inner.
 .El
 .Pp
-Note that the ECN friendly behavior violates RFC2893.
+Note that the ECN friendly behavior violates RFC 2893.
 This should be used in mutual agreement with the peer.
 .Ss Security
 A malicious party may try to circumvent security filters by using
@@ -177,7 +177,7 @@ to 1.
 .Rs
 .%A	R. Gilligan
 .%A	E. Nordmark
-.%B	RFC2893
+.%B	RFC 2893
 .%T	Transition Mechanisms for IPv6 Hosts and Routers
 .%D	August 2000
 .%O	ftp://ftp.isi.edu/in-notes/rfc2893.txt
diff --git a/share/man/man4/inet6.4 b/share/man/man4/inet6.4
index 553273545a..770e064a43 100644
--- a/share/man/man4/inet6.4
+++ b/share/man/man4/inet6.4
@@ -1,5 +1,5 @@
 .\"	$FreeBSD: src/share/man/man4/inet6.4,v 1.4.2.9 2002/05/15 16:45:30 ume Exp $
-.\"	$DragonFly: src/share/man/man4/inet6.4,v 1.4 2006/05/26 19:39:39 swildner Exp $
+.\"	$DragonFly: src/share/man/man4/inet6.4,v 1.5 2007/11/23 23:16:37 swildner Exp $
 .\"	$KAME: inet6.4,v 1.21 2001/04/05 01:00:18 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -100,7 +100,7 @@ like link-local or site-local addresses.
 A scoped address is ambiguous to the kernel,
 if it is specified without a scope identifier.
 To manipulate scoped addresses properly from the userland,
-programs must use the advanced API defined in RFC2292.
+programs must use the advanced API defined in RFC 2292.
 A compact description of the advanced API is available in
 .Xr ip6 4 .
 If a scoped address is specified without an explicit scope,
@@ -382,7 +382,7 @@ stack implemented in the kernel.
 .It Dv IPV6CTL_USE_DEPRECATED
 .Pq ip6.use_deprecated
 Boolean: enable/disable use of deprecated address,
-specified in RFC2462 5.5.4.
+specified in RFC 2462 5.5.4.
 Defaults to on.
 .It Dv IPV6CTL_RR_PRUNE
 .Pq ip6.rr_prune
@@ -416,7 +416,7 @@ which initiates dynamic adaptation (default 128).
 .Ss Interaction between IPv4/v6 sockets
 The behavior of
 .Dv AF_INET6
-TCP/UDP socket is documented in RFC2553.
+TCP/UDP socket is documented in RFC 2553.
 Basically, it says this:
 .Bl -bullet -compact
 .It
@@ -456,7 +456,7 @@ socket and IPv6 should be routed to the
 socket.
 .El
 .Pp
-However, RFC2553 does not define the ordering constraint between calls to
+However, RFC 2553 does not define the ordering constraint between calls to
 .Xr bind 2 ,
 nor how IPv4 TCP/UDP port numbers and IPv6 TCP/UDP port numbers
 relate to each other
@@ -516,7 +516,7 @@ sockets.
 .Sh HISTORY
 The
 .Nm
-protocol interfaces are defined in RFC2553 and RFC2292.
+protocol interfaces are defined in RFC 2553 and RFC 2292.
 The implementation described herein appeared in the WIDE/KAME project.
 .Sh BUGS
 The IPv6 support is subject to change as the Internet protocols develop.
diff --git a/share/man/man4/ip.4 b/share/man/man4/ip.4
index 57f4f1f452..1ccf534da6 100644
--- a/share/man/man4/ip.4
+++ b/share/man/man4/ip.4
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)ip.4	8.2 (Berkeley) 11/30/93
 .\" $FreeBSD: src/share/man/man4/ip.4,v 1.13.2.9 2002/05/02 02:40:26 silby Exp $
-.\" $DragonFly: src/share/man/man4/ip.4,v 1.5 2007/07/14 21:48:15 swildner Exp $
+.\" $DragonFly: src/share/man/man4/ip.4,v 1.6 2007/11/23 23:16:37 swildner Exp $
 .\"
 .Dd March 3, 2001
 .Dt IP 4
@@ -83,7 +83,7 @@ The format of
 .Tn IP
 options to be sent is that specified by the
 .Tn IP
-protocol specification (RFC-791), with one exception:
+protocol specification (RFC 791), with one exception:
 the list of addresses for Source Route options must include the first-hop
 gateway at the beginning of the list of gateways.
 The first-hop gateway address will be extracted from the option list
@@ -119,7 +119,7 @@ may be used to set the minimum acceptable TTL a packet must have when
 received on a socket.
 All packets with a lower TTL are silently dropped.
 Works on already connected/connecting and listening sockets for RAW/UDP/TCP.
-It allows to implement security mechanisms described in RFC3682 (GTSM).
+It allows to implement security mechanisms described in RFC 3682 (GTSM).
 .Pp
 If the
 .Dv IP_RECVDSTADDR
diff --git a/share/man/man4/ipsec.4 b/share/man/man4/ipsec.4
index a6d4707e1b..705d6b7fe2 100644
--- a/share/man/man4/ipsec.4
+++ b/share/man/man4/ipsec.4
@@ -1,5 +1,5 @@
 .\"	$FreeBSD: src/share/man/man4/ipsec.4,v 1.3.2.10 2001/12/17 11:30:12 ru Exp $
-.\"	$DragonFly: src/share/man/man4/ipsec.4,v 1.2 2003/06/17 04:36:59 dillon Exp $
+.\"	$DragonFly: src/share/man/man4/ipsec.4,v 1.3 2007/11/23 23:16:37 swildner Exp $
 .\"	$KAME: ipsec.4,v 1.17 2001/06/27 15:25:10 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -74,7 +74,7 @@ Key management engine can be accessed from the userland by using
 sockets.
 The
 .Dv PF_KEY
-socket API is defined in RFC2367.
+socket API is defined in RFC 2367.
 .Pp
 Policy engine can be controlled by extended part of
 .Dv PF_KEY
@@ -193,26 +193,26 @@ The variables are interpreted as follows:
 If set to non-zero, the kernel clears type-of-service field in the IPv4 header
 during AH authentication data computation.
 The variable is for tweaking AH behavior to interoperate with devices that
-implement RFC1826 AH.
+implement RFC 1826 AH.
 It should be set to non-zero
 (clear the type-of-service field)
-for RFC2402 conformance.
+for RFC 2402 conformance.
 .It Li ipsec.ah_offsetmask
 During AH authentication data computation, the kernel will include
 16bit fragment offset field
 (including flag bits)
 in IPv4 header, after computing logical AND with the variable.
 The variable is for tweaking AH behavior to interoperate with devices that
-implement RFC1826 AH.
+implement RFC 1826 AH.
 It should be set to zero
 (clear the fragment offset field during computation)
-for RFC2402 conformance.
+for RFC 2402 conformance.
 .It Li ipsec.dfbit
 The variable configures the kernel behavior on IPv4 IPsec tunnel encapsulation.
 If set to 0, DF bit on the outer IPv4 header will be cleared.
 1 means that the outer DF bit is set regardless from the inner DF bit.
 2 means that the DF bit is copied from the inner header to the outer.
-The variable is supplied to conform to RFC2401 chapter 6.1.
+The variable is supplied to conform to RFC 2401 chapter 6.1.
 .It Li ipsec.ecn
 If set to non-zero, IPv4 IPsec tunnel encapsulation/decapsulation behavior will
 be friendly to ECN
diff --git a/share/man/man4/netgraph.4 b/share/man/man4/netgraph.4
index c25f2b15ea..f1bfb67bdc 100644
--- a/share/man/man4/netgraph.4
+++ b/share/man/man4/netgraph.4
@@ -34,7 +34,7 @@
 .\"          Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/netgraph.4,v 1.39.2.1 2001/12/21 09:00:50 ru Exp $
-.\" $DragonFly: src/share/man/man4/netgraph.4,v 1.11 2007/06/17 20:33:14 swildner Exp $
+.\" $DragonFly: src/share/man/man4/netgraph.4,v 1.12 2007/11/23 23:16:37 swildner Exp $
 .\" $Whistle: netgraph.4,v 1.7 1999/01/28 23:54:52 julian Exp $
 .\"
 .Dd January 19, 1999
@@ -410,7 +410,7 @@ Here are some examples of valid netgraph addresses:
 .Pp
 Consider the following set of nodes might be created for a site with
 a single physical frame relay line having two active logical DLCI channels,
-with RFC-1490 frames on DLCI 16 and PPP frames over DLCI 20:
+with RFC 1490 frames on DLCI 16 and PPP frames over DLCI 20:
 .Pp
 .Bd -literal
 [type SYNC ]                  [type FRAME]                 [type RFC1490]
diff --git a/share/man/man4/stf.4 b/share/man/man4/stf.4
index 377335397d..ff1742660a 100644
--- a/share/man/man4/stf.4
+++ b/share/man/man4/stf.4
@@ -1,5 +1,5 @@
 .\"	$FreeBSD: src/share/man/man4/stf.4,v 1.3.2.5 2002/08/28 04:46:25 brooks Exp $
-.\"	$DragonFly: src/share/man/man4/stf.4,v 1.3 2007/07/29 17:27:45 swildner Exp $
+.\"	$DragonFly: src/share/man/man4/stf.4,v 1.4 2007/11/23 23:16:37 swildner Exp $
 .\"     $KAME: stf.4,v 1.35 2001/05/02 06:24:49 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -46,7 +46,7 @@ interface supports
 .Dq 6to4
 IPv6 in IPv4 encapsulation.
 It can tunnel IPv6 traffic over IPv4, as specified in
-.Li RFC3056 .
+.Li RFC 3056 .
 .Pp
 For ordinary nodes in 6to4 site, you do not need
 .Nm
diff --git a/share/man/man7/mailaddr.7 b/share/man/man7/mailaddr.7
index cbb9bc1944..d2c962f77c 100644
--- a/share/man/man7/mailaddr.7
+++ b/share/man/man7/mailaddr.7
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)mailaddr.7	8.1 (Berkeley) 6/16/93
 .\" $FreeBSD: src/share/man/man7/mailaddr.7,v 1.6.2.1 2001/08/17 13:08:49 ru Exp $
-.\" $DragonFly: src/share/man/man7/mailaddr.7,v 1.4 2006/03/26 22:56:57 swildner Exp $
+.\" $DragonFly: src/share/man/man7/mailaddr.7,v 1.5 2007/11/23 23:16:37 swildner Exp $
 .\"
 .Dd June 16, 1993
 .Dt MAILADDR 7
@@ -137,14 +137,14 @@ can often be sent to ``user@host.CSNET'' or ``user@host.BITNET'' respectively.
 .Rs
 .%A Crocker, D. H.
 .%T Standard for the Format of Arpa Internet Text Messages
-.%O RFC822
+.%O RFC 822
 .Re
 .Sh HISTORY
 .Nm Mailaddr
 appeared in
 .Bx 4.2 .
 .Sh BUGS
-The RFC822 group syntax (``group:user1,user2,user3;'') is not supported
+The RFC 822 group syntax (``group:user1,user2,user3;'') is not supported
 except in the special case of ``group:;'' because of a conflict with old
 berknet-style addresses.
 .Pp
diff --git a/share/man/man7/tuning.7 b/share/man/man7/tuning.7
index 20684186c6..9934ff441f 100644
--- a/share/man/man7/tuning.7
+++ b/share/man/man7/tuning.7
@@ -3,7 +3,7 @@
 .\" the source tree.
 .\"
 .\" $FreeBSD: src/share/man/man7/tuning.7,v 1.1.2.30 2002/12/17 19:32:08 dillon Exp $
-.\" $DragonFly: src/share/man/man7/tuning.7,v 1.16 2007/11/07 17:42:47 dillon Exp $
+.\" $DragonFly: src/share/man/man7/tuning.7,v 1.17 2007/11/23 23:16:37 swildner Exp $
 .\"
 .Dd March 4, 2007
 .Dt TUNING 7
@@ -477,7 +477,7 @@ These extensions should be enabled and the TCP buffer size should be set
 to a value larger than 65536 in order to obtain good performance from
 certain types of network links; specifically, gigabit WAN links and
 high-latency satellite links.
-RFC1323 support is enabled by default.
+RFC 1323 support is enabled by default.
 .Pp
 The
 .Va net.inet.tcp.always_keepalive
diff --git a/usr.bin/tftp/tftp.1 b/usr.bin/tftp/tftp.1
index b1ecdf2e15..d25d50b748 100644
--- a/usr.bin/tftp/tftp.1
+++ b/usr.bin/tftp/tftp.1
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)tftp.1	8.2 (Berkeley) 4/18/94
 .\" $FreeBSD: src/usr.bin/tftp/tftp.1,v 1.4.2.7 2002/06/21 15:29:33 charnier Exp $
-.\" $DragonFly: src/usr.bin/tftp/tftp.1,v 1.4 2007/07/30 22:11:33 swildner Exp $
+.\" $DragonFly: src/usr.bin/tftp/tftp.1,v 1.5 2007/11/23 23:16:37 swildner Exp $
 .\"
 .Dd April 18, 1994
 .Dt TFTP 1
@@ -180,4 +180,4 @@ exact methods are specific to each site and therefore
 difficult to document here.
 .Pp
 Files larger than 33488896 octets (65535 blocks) cannot be transferred
-without client and server supporting blocksize negotiation (RFC1783).
+without client and server supporting blocksize negotiation (RFC 1783).
diff --git a/usr.sbin/arp/arp.4 b/usr.sbin/arp/arp.4
index 525df2e6e1..0ec169c260 100644
--- a/usr.sbin/arp/arp.4
+++ b/usr.sbin/arp/arp.4
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)arp4.4	6.5 (Berkeley) 4/18/94
 .\" $FreeBSD: src/usr.sbin/arp/arp.4,v 1.4.2.5 2003/03/12 22:08:13 trhodes Exp $
-.\" $DragonFly: src/usr.sbin/arp/arp.4,v 1.2 2003/06/17 04:29:52 dillon Exp $
+.\" $DragonFly: src/usr.sbin/arp/arp.4,v 1.3 2007/11/23 23:16:37 swildner Exp $
 .\"
 .Dd April 18, 1994
 .Dt ARP 4
@@ -134,11 +134,11 @@ routing table.  It can also occur if the kernel cannot allocate memory.
 .Rs
 .%A Plummer, D.
 .%B "An Ethernet Address Resolution Protocol"
-.%T RFC826
+.%T RFC 826
 .Re
 .Rs
 .%A Leffler, S.J.
 .%A Karels, M.J.
-.%B "Trailer Encapsulations
-.%T RFC893
+.%B "Trailer Encapsulations"
+.%T RFC 893
 .Re
diff --git a/usr.sbin/faithd/faithd.8 b/usr.sbin/faithd/faithd.8
index a900ab89c9..c5b5002176 100644
--- a/usr.sbin/faithd/faithd.8
+++ b/usr.sbin/faithd/faithd.8
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	$FreeBSD: src/usr.sbin/faithd/faithd.8,v 1.2.2.12 2003/03/12 22:08:14 trhodes Exp $
-.\"	$DragonFly: src/usr.sbin/faithd/faithd.8,v 1.8 2007/11/21 19:12:41 swildner Exp $
+.\"	$DragonFly: src/usr.sbin/faithd/faithd.8,v 1.9 2007/11/23 23:16:37 swildner Exp $
 .\"
 .Dd May 17, 1998
 .Dt FAITHD 8
@@ -388,7 +388,7 @@ on error.
 .%A Jun-ichiro itojun Hagino
 .%A Kazu Yamamoto
 .%T "An IPv6-to-IPv4 transport relay translator"
-.%B RFC3142
+.%B RFC 3142
 .%O ftp://ftp.isi.edu/in-notes/rfc3142.txt
 .%D June 2001
 .Re
diff --git a/usr.sbin/ifmcstat/ifmcstat.8 b/usr.sbin/ifmcstat/ifmcstat.8
index 7dee346fcb..7aa58a7ef7 100644
--- a/usr.sbin/ifmcstat/ifmcstat.8
+++ b/usr.sbin/ifmcstat/ifmcstat.8
@@ -28,7 +28,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	$FreeBSD: src/usr.sbin/ifmcstat/ifmcstat.8,v 1.1.2.4 2003/03/11 21:13:50 trhodes Exp $
-.\"	$DragonFly: src/usr.sbin/ifmcstat/ifmcstat.8,v 1.2 2003/06/17 04:29:55 dillon Exp $
+.\"	$DragonFly: src/usr.sbin/ifmcstat/ifmcstat.8,v 1.3 2007/11/23 23:16:37 swildner Exp $
 .\"
 .Dd May 21, 1998
 .Dt IFMCSTAT 8
@@ -55,5 +55,5 @@ Only root can use
 .%A G. Malkin
 .%A R. Minnear
 .%R IPng for IPv6
-.%N RFC2080
+.%N RFC 2080
 .Re
diff --git a/usr.sbin/inetd/inetd.8 b/usr.sbin/inetd/inetd.8
index ed9ddff504..a0965ef3ce 100644
--- a/usr.sbin/inetd/inetd.8
+++ b/usr.sbin/inetd/inetd.8
@@ -31,7 +31,7 @@
 .\"
 .\"     from: @(#)inetd.8	8.3 (Berkeley) 4/13/94
 .\" $FreeBSD: src/usr.sbin/inetd/inetd.8,v 1.46.2.13 2003/03/12 22:08:14 trhodes Exp $
-.\" $DragonFly: src/usr.sbin/inetd/inetd.8,v 1.2 2003/06/17 04:29:55 dillon Exp $
+.\" $DragonFly: src/usr.sbin/inetd/inetd.8,v 1.3 2007/11/23 23:16:37 swildner Exp $
 .\"
 .Dd February 7, 1996
 .Dt INETD 8
@@ -896,7 +896,7 @@ socket but was unable to.
 .Rs
 .%A Michael C. St. Johns
 .%T Identification Protocol
-.%O RFC1413
+.%O RFC 1413
 .Re
 .Sh HISTORY
 The
diff --git a/usr.sbin/mrouted/mrouted.8 b/usr.sbin/mrouted/mrouted.8
index d67b93022a..8b255bf36e 100644
--- a/usr.sbin/mrouted/mrouted.8
+++ b/usr.sbin/mrouted/mrouted.8
@@ -1,7 +1,7 @@
 .\"COPYRIGHT 1989 by The Board of Trustees of Leland Stanford Junior University.
 .\"
 .\" $FreeBSD: src/usr.sbin/mrouted/mrouted.8,v 1.16.2.8 2003/03/11 22:31:29 trhodes Exp $
-.\" $DragonFly: src/usr.sbin/mrouted/mrouted.8,v 1.4 2007/07/30 22:11:34 swildner Exp $
+.\" $DragonFly: src/usr.sbin/mrouted/mrouted.8,v 1.5 2007/11/23 23:16:37 swildner Exp $
 .\"
 .Dd May 8, 1995
 .Dt MROUTED 8
@@ -18,9 +18,9 @@
 The
 .Nm
 utility is an implementation of the Distance-Vector Multicast Routing
-Protocol (DVMRP), an earlier version of which is specified in RFC-1075.
+Protocol (DVMRP), an earlier version of which is specified in RFC 1075.
 It maintains topological knowledge via a distance-vector routing protocol
-(like RIP, described in RFC-1058), upon which it implements a multicast
+(like RIP, described in RFC 1058), upon which it implements a multicast
 datagram forwarding algorithm called Reverse Path Multicasting.
 .Pp
 The
diff --git a/usr.sbin/pppd/pppd.8 b/usr.sbin/pppd/pppd.8
index c1a7000b69..1d9e9d3057 100644
--- a/usr.sbin/pppd/pppd.8
+++ b/usr.sbin/pppd/pppd.8
@@ -1,6 +1,6 @@
 .\" manual page [] for pppd 2.3
 .\" $FreeBSD: src/usr.sbin/pppd/pppd.8,v 1.20.2.4 2003/03/11 22:31:30 trhodes Exp $
-.\" $DragonFly: src/usr.sbin/pppd/pppd.8,v 1.4 2007/05/17 08:19:03 swildner Exp $
+.\" $DragonFly: src/usr.sbin/pppd/pppd.8,v 1.5 2007/11/23 23:16:37 swildner Exp $
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
@@ -1134,32 +1134,32 @@ Sample pppd configuration files.
 .IR chat(8),
 .IR ppp(8)
 .TP
-.B RFC1144
+.B RFC 1144
 Jacobson, V.
 \fICompressing TCP/IP headers for low-speed serial links.\fR
 February 1990.
 .TP
-.B RFC1321
+.B RFC 1321
 Rivest, R.
 .I The MD5 Message-Digest Algorithm.
 April 1992.
 .TP
-.B RFC1332
+.B RFC 1332
 McGregor, G.
 .I PPP Internet Protocol Control Protocol (IPCP).
 May 1992.
 .TP
-.B RFC1334
+.B RFC 1334
 Lloyd, B.; Simpson, W.A.
 .I PPP authentication protocols.
 October 1992.
 .TP
-.B RFC1661
+.B RFC 1661
 Simpson, W.A.
 .I The Point\-to\-Point Protocol (PPP).
 July 1994.
 .TP
-.B RFC1662
+.B RFC 1662
 Simpson, W.A.
 .I PPP in HDLC-like Framing.
 July 1994.
diff --git a/usr.sbin/route6d/route6d.8 b/usr.sbin/route6d/route6d.8
index 012695b581..edb1d54c99 100644
--- a/usr.sbin/route6d/route6d.8
+++ b/usr.sbin/route6d/route6d.8
@@ -1,5 +1,5 @@
 .\"	$FreeBSD: src/usr.sbin/route6d/route6d.8,v 1.1.2.7 2003/03/11 22:31:32 trhodes Exp $
-.\"	$DragonFly: src/usr.sbin/route6d/route6d.8,v 1.2 2003/06/17 04:30:02 dillon Exp $
+.\"	$DragonFly: src/usr.sbin/route6d/route6d.8,v 1.3 2007/11/23 23:16:37 swildner Exp $
 .\"	$KAME: route6d.8,v 1.10 2000/11/24 11:57:18 itojun Exp $
 .\"
 .\" Copyright (c) 1996 WIDE Project. All rights reserved.
@@ -222,7 +222,7 @@ or
 .%A G. Malkin
 .%A R. Minnear
 .%T RIPng for IPv6
-.%R RFC2080
+.%R RFC 2080
 .%D January 1997
 .Re
 .\"
@@ -230,7 +230,7 @@ or
 The
 .Nm
 utility uses IPv6 advanced API,
-defined in RFC2292,
+defined in RFC 2292,
 for communicating with peers using link-local addresses.
 .Pp
 Internally
diff --git a/usr.sbin/rtadvd/rtadvd.8 b/usr.sbin/rtadvd/rtadvd.8
index ba27008d2f..badbf035cf 100644
--- a/usr.sbin/rtadvd/rtadvd.8
+++ b/usr.sbin/rtadvd/rtadvd.8
@@ -1,5 +1,5 @@
 .\"	$FreeBSD: src/usr.sbin/rtadvd/rtadvd.8,v 1.3.2.8 2003/03/11 22:31:32 trhodes Exp $
-.\"	$DragonFly: src/usr.sbin/rtadvd/rtadvd.8,v 1.3 2006/02/17 19:40:25 swildner Exp $
+.\"	$DragonFly: src/usr.sbin/rtadvd/rtadvd.8,v 1.4 2007/11/23 23:16:37 swildner Exp $
 .\"	$KAME: rtadvd.8,v 1.17 2001/02/04 05:34:38 jinmei Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -169,7 +169,7 @@ In this case,
 .Nm
 will transmit router advertisement with router lifetime 0
 to all the interfaces
-(in accordance with RFC2461 6.2.5).
+(in accordance with RFC 2461 6.2.5).
 .Sh FILES
 .Bl -tag -width Pa -compact
 .It Pa /etc/rtadvd.conf