remove trailing whitespace, some Nm cleanup

13 files changed, 131 insertions, 131 deletions

diff --git a/usr.sbin/named/man/dig.1 b/usr.sbin/named/man/dig.1
index 5fe3fdd39af..8735ee4164a 100644
--- a/usr.sbin/named/man/dig.1
+++ b/usr.sbin/named/man/dig.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dig.1,v 1.12 1999/06/05 01:29:39 aaron Exp $
+.\"	$OpenBSD: dig.1,v 1.13 1999/06/05 22:17:34 aaron Exp $
 .\" $From: dig.1,v 8.2 1997/06/01 20:34:33 vixie Exp $
 .\"
 .\" ++Copyright++ 1993
@@ -85,7 +85,7 @@
 .Op Fl envset
 .Op Fl stick | Fl nostick
 .Oo
-.Cm + Ns Ar keyword Ns 
+.Cm + Ns Ar keyword Ns
 .Oo
 .Cm \= Ns Ar value
 .Oc
@@ -109,11 +109,11 @@ accessible from the command line.
 The usual simple use of
 .Nm
 will take the form:
-.Bd -filled -offset indent 
-.Ic dig 
-.Cm @ Ns Ar server 
-.Ar domain 
-.Ar query-type 
+.Bd -filled -offset indent
+.Ic dig
+.Cm @ Ns Ar server
+.Ar domain
+.Ar query-type
 .Ar query-class
 .Ed
 where:
@@ -134,7 +134,7 @@ dot-notation address. Alternatively, if there is a server
 at your disposal somewhere, all that is required is that
 .Pa /etc/resolv.conf
 be present and indicate where the default
-name servers reside, so that 
+name servers reside, so that
 .Ar server
 itself can be
 resolved. See
@@ -233,8 +233,8 @@ is used to included an argument that is simply not
 parsed. This may be useful if running
 .Nm
 in batch
-mode. Instead of resolving every 
-.Cm @ Ns Ar server-domain-name 
+mode. Instead of resolving every
+.Cm @ Ns Ar server-domain-name
 in a list of queries, you can avoid the overhead of doing
 so, and still have the domain name on the command line
 as a reference. Example:
@@ -380,7 +380,7 @@ subsequent lines (i.e. they are not restored to the
 .Dq sticky
 default).
 .\" .El
-.It Xo Cm + Ns Ar keyword Ns 
+.It Xo Cm + Ns Ar keyword Ns
 .Op = Ns Ar value
 .Xc
 .Dq Li "+"
@@ -392,8 +392,8 @@ of these are the same parameters accepted by
 .Xr nslookup 8 .
 .\" If an option requires a parameter, the form is as
 .\" follows:
-.\" .Bd -ragged -offset indent 
-.\" .Cm + Ns Ar keyword Ns 
+.\" .Bd -ragged -offset indent
+.\" .Cm + Ns Ar keyword Ns
 .\" .Oo
 .\" .Cm \= Ns Ar value
 .\" .Oc
@@ -444,9 +444,9 @@ pfand=#		bitwise and print flags with #
 pfor=#		bitwise or print flags with #
 .fi
 .sp 1
-The 
+The
 .Ar retry
-and 
+and
 .Ar time
 keywords affect the retransmission strategy used by resolver
 library when sending datagram queries. The algorithm is as follows:
diff --git a/usr.sbin/named/man/dnsquery.1 b/usr.sbin/named/man/dnsquery.1
index 76503379595..7c18ea3be92 100644
--- a/usr.sbin/named/man/dnsquery.1
+++ b/usr.sbin/named/man/dnsquery.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dnsquery.1,v 1.4 1997/07/03 09:26:13 deraadt Exp $
+.\"	$OpenBSD: dnsquery.1,v 1.5 1999/06/05 22:17:33 aaron Exp $
 .TH DNSQUERY 1 "10 March 1990"
 .UC 6
 .SH NAME
@@ -11,10 +11,10 @@ dnsquery \- query domain name servers using resolver
 .I type]
 [-c
 .I class]
-[-r 
-.I retry] 
-[-p 
-.I retry_period] 
+[-r
+.I retry]
+[-p
+.I retry_period]
 [-d] [-s] [-v] host
 .SH DESCRIPTION
 The
@@ -32,8 +32,8 @@ are treated without case-sensitivity.
 .SH OPTIONS
 .TP 1i
 .B \-n
-The nameserver to be used in the query.  Nameservers can appear as either 
-Internet addresses of the form w.x.y.z or can appear as domain names.  
+The nameserver to be used in the query.  Nameservers can appear as either
+Internet addresses of the form w.x.y.z or can appear as domain names.
 (default: as specified in /etc/resolv.conf)
 .TP 1i
 .B \-t
@@ -139,7 +139,7 @@ The name of the host (or domain) of interest.
 .br
 <resolv.h>		list of resolver flags
 .SH "SEE ALSO"
-nslookup(1), nstest(1), nsquery(1), 
+nslookup(1), nstest(1), nsquery(1),
 named(8), resolver(3)
 .SH DIAGNOSTICS
 If the resolver fails to answer the query and debugging has not been
diff --git a/usr.sbin/named/man/gethostbyname.3 b/usr.sbin/named/man/gethostbyname.3
index d6d2977a041..cf39542924a 100644
--- a/usr.sbin/named/man/gethostbyname.3
+++ b/usr.sbin/named/man/gethostbyname.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gethostbyname.3,v 1.2 1997/03/12 10:42:13 downsj Exp $
+.\"	$OpenBSD: gethostbyname.3,v 1.3 1999/06/05 22:17:35 aaron Exp $
 .\" Copyright (c) 1983, 1987 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -61,7 +61,7 @@ following structure describing an internet host
 referenced by name or by address, respectively.
 This structure contains either the information obtained from the name server,
 .IR named (8),
-or broken-out fields from a line in 
+or broken-out fields from a line in
 .IR /etc/hosts .
 If the local name server is not running these routines do a lookup in
 .IR /etc/hosts .
@@ -133,7 +133,7 @@ If the
 .I stayopen
 flag is non-zero,
 this sets the option to send all queries to the name server using TCP
-and to retain the connection after each call to 
+and to retain the connection after each call to
 .I gethostbyname
 or
 .IR gethostbyaddr .
@@ -143,7 +143,7 @@ Otherwise, queries are performed using UDP datagrams.
 closes the TCP connection.
 .SH DIAGNOSTICS
 .PP
-Error return status from 
+Error return status from
 .I gethostbyname
 and
 .I gethostbyaddr
@@ -180,8 +180,8 @@ A retry at some later time may succeed.
 Some unexpected server failure was encountered.
 This is a non-recoverable error.
 .IP NO_DATA \w'HOST_NOT_FOUND'u+2n
-The requested name is valid but does not have an IP address; 
-this is not a temporary error.  
+The requested name is valid but does not have an IP address;
+this is not a temporary error.
 This means that the name is known to the name server but there is no address
 associated with this name.
 Another type of request to the name server using this domain name
@@ -203,7 +203,7 @@ are redefined,
 when
 .IR libc
 is built to use only the routines to lookup in
-.IR /etc/hosts 
+.IR /etc/hosts
 and not the name server.
 .PP
 .I Gethostent
@@ -211,7 +211,7 @@ reads the next line of
 .IR /etc/hosts ,
 opening the file if necessary.
 .PP
-.I Sethostent 
+.I Sethostent
 is redefined to open and rewind the file.  If the
 .I stayopen
 argument is non-zero,
diff --git a/usr.sbin/named/man/getnetent.3 b/usr.sbin/named/man/getnetent.3
index fa9cfedddfc..44c30bad46c 100644
--- a/usr.sbin/named/man/getnetent.3
+++ b/usr.sbin/named/man/getnetent.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getnetent.3,v 1.3 1998/06/15 17:56:16 mickey Exp $
+.\"	$OpenBSD: getnetent.3,v 1.4 1999/06/05 22:17:36 aaron Exp $
 .\" $From: getnetent.3,v 8.2 1996/05/09 05:59:10 vixie Exp $
 .TH getnetent 3
 .SH NAME
@@ -31,8 +31,8 @@ subroutines
 each return a pointer to an object with the
 following structure
 containing the broken-out
-fields of a line in the 
-.I networks 
+fields of a line in the
+.I networks
 database.
 .RS
 .PP
@@ -65,20 +65,20 @@ order.
 .PP
 If the
 .I stayopen
-flag on a 
+flag on a
 .I setnetent
 subroutine is NULL, the
 .I networks
 database is opened.  Otherwise the
 .I setnetent
-has the effect of rewinding the 
-.I networks 
+has the effect of rewinding the
+.I networks
 database.
 The
 .I endnetent
 may be called to
-close the 
-.I networks 
+close the
+.I networks
 database when processing is complete.
 .PP
 The
@@ -97,7 +97,7 @@ number is found
 The
 .I getnetent
 subroutine keeps a pointer in the database, allowing
-successive calls to be used 
+successive calls to be used
 to search the entire file.
 .PP
 A call to
diff --git a/usr.sbin/named/man/host.1 b/usr.sbin/named/man/host.1
index 500d721969b..299dc8fe7d5 100644
--- a/usr.sbin/named/man/host.1
+++ b/usr.sbin/named/man/host.1
@@ -1,16 +1,16 @@
-.\"	$OpenBSD: host.1,v 1.2 1997/03/12 10:42:14 downsj Exp $
+.\"	$OpenBSD: host.1,v 1.3 1999/06/05 22:17:37 aaron Exp $
 .\"
 .\"	@(#)host.1              e07@nikhef.nl (Eric Wassenaar) 961010
 .\"
 .TH host 1 "961010"
 .SH NAME
 host \- query nameserver about domain names and zones
-.SH SYNOPSIS 
+.SH SYNOPSIS
 .na
 .nf
-\fBhost\fP [\fB\-v\fP] [\fB\-a\fP] [\fB\-t\fP \fIquerytype\fP] [\fIoptions\fP]  \fIname\fP  [\fIserver\fP] 
+\fBhost\fP [\fB\-v\fP] [\fB\-a\fP] [\fB\-t\fP \fIquerytype\fP] [\fIoptions\fP]  \fIname\fP  [\fIserver\fP]
 .br
-\fBhost\fP [\fB\-v\fP] [\fB\-a\fP] [\fB\-t\fP \fIquerytype\fP] [\fIoptions\fP]  \fB\-l\fP \fIzone\fP  [\fIserver\fP] 
+\fBhost\fP [\fB\-v\fP] [\fB\-a\fP] [\fB\-t\fP \fIquerytype\fP] [\fIoptions\fP]  \fB\-l\fP \fIzone\fP  [\fIserver\fP]
 .br
 \fBhost\fP [\fB\-v\fP] [\fIoptions\fP] \fB\-H\fP [\fB\-D\fP] [\fB\-E\fP] [\fB\-G\fP] \fIzone\fP
 .br
@@ -21,7 +21,7 @@ host \- query nameserver about domain names and zones
 \fBhost\fP [\fIoptions\fP] \fB\-x\fP [\fIname\fP ...]
 .br
 \fBhost\fP [\fIoptions\fP] \fB\-X\fP \fIserver\fP [\fIname\fP ...]
-.SH DESCRIPTION 
+.SH DESCRIPTION
 .I host
 looks for information about Internet hosts and domain names.
 It gets this information from a set of interconnected servers
diff --git a/usr.sbin/named/man/hostname.7 b/usr.sbin/named/man/hostname.7
index 46e40bf5960..f86dc6ff391 100644
--- a/usr.sbin/named/man/hostname.7
+++ b/usr.sbin/named/man/hostname.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hostname.7,v 1.2 1997/03/12 10:42:14 downsj Exp $
+.\"	$OpenBSD: hostname.7,v 1.3 1999/06/05 22:17:38 aaron Exp $
 .\" Copyright (c) 1987 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -52,11 +52,11 @@ the file, the substituted name is looked up with no further processing.
 .PP
 If there is at least one dot in the name, then the name is first tried as
 is.  The number of dots to cause this action is configurable by setting the
-threshold using the ``\fIndots\fP'' option in 
+threshold using the ``\fIndots\fP'' option in
 .I /etc/resolv.conf
 (default: \fI1\fP).  If the name ends with a dot, the trailing dot is
 removed, and the remaining name is looked up (regardless of the setting of
-the 'ndots' option) and no further processing is done. 
+the 'ndots' option) and no further processing is done.
 .PP
 If the input name does not end with a trailing dot, it is looked up by
 searching through a list of domains until a match is found.  If neither the
@@ -66,7 +66,7 @@ file or the ``\s-1LOCALDOMAIN\s+1'' environment variable is used, then the
 search list of domains contains only the full domain specified by the domain
 option (in
 .IR /etc/resolv.conf )
-or the domain used in the local hostname (see 
+or the domain used in the local hostname (see
 .IR hostname (1)
 and
 .IR resolver (5)).
@@ -85,7 +85,7 @@ example, if the ``\fIsearch\fP'' option contained
 	\fICS.Berkeley.EDU CChem.Berkeley.EDU Berkeley.EDU\fP
 .br
 then the partial hostname (e.g., ``\fIlithium\fP'') will be tried with each
-domainname appended (in the same order specified).  The resulting hostnames 
+domainname appended (in the same order specified).  The resulting hostnames
 that would be tried are:
 .nf
 	\fIlithium.CS.Berkeley.EDU\fP
diff --git a/usr.sbin/named/man/named-xfer.8 b/usr.sbin/named/man/named-xfer.8
index 62023c12710..5b5646bb39b 100644
--- a/usr.sbin/named/man/named-xfer.8
+++ b/usr.sbin/named/man/named-xfer.8
@@ -1,9 +1,9 @@
-.\"	$OpenBSD: named-xfer.8,v 1.4 1998/05/31 17:35:10 millert Exp $
+.\"	$OpenBSD: named-xfer.8,v 1.5 1999/06/05 22:17:39 aaron Exp $
 .\" ++Copyright++ 1985
 .\" -
 .\" Copyright (c) 1985
 .\"    The Regents of the University of California.  All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -19,7 +19,7 @@
 .\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,14 +33,14 @@
 .\" SUCH DAMAGE.
 .\" -
 .\" Portions Copyright (c) 1993 by Digital Equipment Corporation.
-.\" 
+.\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
 .\" copyright notice and this permission notice appear in all copies, and that
 .\" the name of Digital Equipment Corporation not be used in advertising or
 .\" publicity pertaining to distribution of the document or software without
 .\" specific, written prior permission.
-.\" 
+.\"
 .\" THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
 .\" WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
 .\" OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
diff --git a/usr.sbin/named/man/named.8 b/usr.sbin/named/man/named.8
index bc7b02272ba..4cc84afe780 100644
--- a/usr.sbin/named/man/named.8
+++ b/usr.sbin/named/man/named.8
@@ -1,9 +1,9 @@
-.\"	$OpenBSD: named.8,v 1.8 1999/06/05 04:16:05 aaron Exp $
+.\"	$OpenBSD: named.8,v 1.9 1999/06/05 22:17:40 aaron Exp $
 .\" ++Copyright++ 1985
 .\" -
 .\" Copyright (c) 1985
 .\"    The Regents of the University of California.  All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -19,7 +19,7 @@
 .\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,14 +33,14 @@
 .\" SUCH DAMAGE.
 .\" -
 .\" Portions Copyright (c) 1993 by Digital Equipment Corporation.
-.\" 
+.\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
 .\" copyright notice and this permission notice appear in all copies, and that
 .\" the name of Digital Equipment Corporation not be used in advertising or
 .\" publicity pertaining to distribution of the document or software without
 .\" specific, written prior permission.
-.\" 
+.\"
 .\" THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
 .\" WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
 .\" OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -149,7 +149,7 @@ Any additional argument is taken as the name of the boot file.
 If multiple boot files are specified, only the last is used.
 .PP
 The boot file contains information about where the name server is to get
-its initial data.  
+its initial data.
 Lines in the boot file cannot be continued on subsequent lines.
 The following is a small example:
 .in +2m
@@ -249,7 +249,7 @@ in your ``xfrnets'' directives.  This directive may also be given as
 .LP
 The ``include'' directive (not shown) can be used to process the contents
 of some other file as though they appeared in place of the ``include''
-directive.  This is useful if you have a lot of zones or if you have 
+directive.  This is useful if you have a lot of zones or if you have
 logical groupings of zones which are maintained by different people.
 The ``include'' directive takes one argument, that being the name of the
 file whose contents are to be included.  No quotes are necessary around
@@ -351,7 +351,7 @@ The
 .I opt_class
 field is the object address type; currently only one type is supported,
 .BR IN ,
-for objects connected to the DARPA Internet. 
+for objects connected to the DARPA Internet.
 The
 .I type
 field contains one of the following tokens; the data expected in the
@@ -467,7 +467,7 @@ Toggles logging of all incoming queries via syslog(8)
 /var/named/named.stats	nameserver statistics data
 .fi
 .SH "SEE ALSO"
-kill(1), gethostbyname(3), signal(2), 
+kill(1), gethostbyname(3), signal(2),
 resolver(3), resolver(5), hostname(7),
 RFC 882, RFC 883, RFC 973, RFC 974, RFC 1033, RFC 1034, RFC 1035, RFC 1123,
 \fIName Server Operations Guide for \s-1BIND\s+1\fR
diff --git a/usr.sbin/named/man/named.reload.8 b/usr.sbin/named/man/named.reload.8
index 921a4d5c742..64279aa3721 100644
--- a/usr.sbin/named/man/named.reload.8
+++ b/usr.sbin/named/man/named.reload.8
@@ -1,9 +1,9 @@
-.\"	$OpenBSD: named.reload.8,v 1.2 1997/03/12 10:42:16 downsj Exp $
+.\"	$OpenBSD: named.reload.8,v 1.3 1999/06/05 22:17:42 aaron Exp $
 .\" ++Copyright++ 1987, 1993
 .\" -
 .\" Copyright (c) 1987, 1993
 .\"    The Regents of the University of California.  All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -19,7 +19,7 @@
 .\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,14 +33,14 @@
 .\" SUCH DAMAGE.
 .\" -
 .\" Portions Copyright (c) 1993 by Digital Equipment Corporation.
-.\" 
+.\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
 .\" copyright notice and this permission notice appear in all copies, and that
 .\" the name of Digital Equipment Corporation not be used in advertising or
 .\" publicity pertaining to distribution of the document or software without
 .\" specific, written prior permission.
-.\" 
+.\"
 .\" THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
 .\" WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
 .\" OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
diff --git a/usr.sbin/named/man/named.restart.8 b/usr.sbin/named/man/named.restart.8
index ade45493188..b1f62597993 100644
--- a/usr.sbin/named/man/named.restart.8
+++ b/usr.sbin/named/man/named.restart.8
@@ -1,9 +1,9 @@
-.\"	$OpenBSD: named.restart.8,v 1.2 1997/03/12 10:42:17 downsj Exp $
+.\"	$OpenBSD: named.restart.8,v 1.3 1999/06/05 22:17:43 aaron Exp $
 .\" ++Copyright++ 1987, 1993
 .\" -
 .\" Copyright (c) 1987, 1993
 .\"    The Regents of the University of California.  All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -19,7 +19,7 @@
 .\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,14 +33,14 @@
 .\" SUCH DAMAGE.
 .\" -
 .\" Portions Copyright (c) 1993 by Digital Equipment Corporation.
-.\" 
+.\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
 .\" copyright notice and this permission notice appear in all copies, and that
 .\" the name of Digital Equipment Corporation not be used in advertising or
 .\" publicity pertaining to distribution of the document or software without
 .\" specific, written prior permission.
-.\" 
+.\"
 .\" THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
 .\" WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
 .\" OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
diff --git a/usr.sbin/named/man/ndc.8 b/usr.sbin/named/man/ndc.8
index 514aa1dfd5c..045c935f688 100644
--- a/usr.sbin/named/man/ndc.8
+++ b/usr.sbin/named/man/ndc.8
@@ -1,7 +1,7 @@
-.\"	$OpenBSD: ndc.8,v 1.3 1997/06/10 20:04:33 deraadt Exp $
+.\"	$OpenBSD: ndc.8,v 1.4 1999/06/05 22:17:44 aaron Exp $
 .\" Copyright (c) 1994
 .\"    The Regents of the University of California.  All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -17,7 +17,7 @@
 .\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/usr.sbin/named/man/nslookup.8 b/usr.sbin/named/man/nslookup.8
index 6195b3b7720..f69cc7147e9 100644
--- a/usr.sbin/named/man/nslookup.8
+++ b/usr.sbin/named/man/nslookup.8
@@ -1,10 +1,10 @@
-.\"	$OpenBSD: nslookup.8,v 1.3 1999/05/12 13:26:53 aaron Exp $
+.\"	$OpenBSD: nslookup.8,v 1.4 1999/06/05 22:17:45 aaron Exp $
 .\"
 .\" ++Copyright++ 1985, 1989
 .\" -
 .\" Copyright (c) 1985, 1989
 .\"    The Regents of the University of California.  All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -20,7 +20,7 @@
 .\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -34,14 +34,14 @@
 .\" SUCH DAMAGE.
 .\" -
 .\" Portions Copyright (c) 1993 by Digital Equipment Corporation.
-.\" 
+.\"
 .\" Permission to use, copy, modify, and distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
 .\" copyright notice and this permission notice appear in all copies, and that
 .\" the name of Digital Equipment Corporation not be used in advertising or
 .\" publicity pertaining to distribution of the document or software without
 .\" specific, written prior permission.
-.\" 
+.\"
 .\" THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
 .\" WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
 .\" OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
@@ -61,21 +61,21 @@
 nslookup \- query Internet name servers interactively
 .SH SYNOPSIS
 .B nslookup
-[ 
+[
 .I \-option ...
 ]
 [
 .I host-to-find
 | \- [
 .I server
-]] 
+]]
 .SH DESCRIPTION
 .I Nslookup
-is a program to query Internet domain name servers. 
+is a program to query Internet domain name servers.
 Nslookup has two modes: interactive and non-interactive.
 Interactive mode allows the user to query name servers for
-information about various hosts and domains or to print a list of hosts 
-in a domain. 
+information about various hosts and domains or to print a list of hosts
+in a domain.
 Non-interactive mode is used to print just the name and requested information
 for a host or domain.
 .sp 1
@@ -87,13 +87,13 @@ when no arguments are given (the default name server will be used),
 when the first argument is a hyphen (\-) and the second argument
 is the host name or Internet address of a name server.
 .LP
-Non-interactive mode is used when the name or Internet address 
+Non-interactive mode is used when the name or Internet address
 of the host to be looked up
 is given as the first argument. The optional second argument specifies
 the host name or address of a name server.
 .LP
 The options listed under the ``set'' command below can be specified in
-the .nslookuprc file in the user's home directory if they are listed 
+the .nslookuprc file in the user's home directory if they are listed
 one per line. Options can also be specified
 on the command line if they precede the arguments and are prefixed with
 a hyphen. For example, to change the default query type to host information,
@@ -105,29 +105,29 @@ and the initial timeout to 10 seconds, type:
 Commands may be interrupted at any time by typing a control-C.
 To exit, type a control-D (EOF) or type exit.
 The command line length must be less than 256 characters.
-To treat a built-in command as a host name, 
-precede it with an escape character (\e). 
+To treat a built-in command as a host name,
+precede it with an escape character (\e).
 \fBN.B.\fP an unrecognized command will be interpreted as a host name.
 .sp .5v
 .IP "\fIhost\fP [\fIserver\fP]"
 Look up information for \fIhost\fP using the current default server
 or using \fIserver\fP if specified.
-If \fIhost\fP is an Internet address and the query type is A or PTR, the 
+If \fIhost\fP is an Internet address and the query type is A or PTR, the
 name of the host is returned.
-If \fIhost\fP is a name and does not have a trailing period, the default 
+If \fIhost\fP is a name and does not have a trailing period, the default
 domain name is appended to the name. (This behavior depends on the state of the
-\fBset\fP options \fBdomain\fP, \fBsrchlist\fP, 
+\fBset\fP options \fBdomain\fP, \fBsrchlist\fP,
 \fBdefname\fP, and \fBsearch\fP).
-To look up a host not in the current domain, append a period to 
+To look up a host not in the current domain, append a period to
 the name.
 .sp 1
 .IP "\fBserver\fP \fIdomain\fP"
 .ns
 .IP "\fBlserver\fP \fIdomain\fP"
-Change the default server to \fIdomain\fP. 
-\fBLserver\fP uses the initial server to look up 
+Change the default server to \fIdomain\fP.
+\fBLserver\fP uses the initial server to look up
 information about \fIdomain\fP while \fBserver\fP
-uses the current default server. 
+uses the current default server.
 If an authoritative answer can't be found, the names of servers
 that might have the answer are returned.
 .sp 1
@@ -140,11 +140,11 @@ The name of the root server can be changed with the \fBset root\fP command.
 .IP "\fBfinger\fP [\fIname\fP] [\fB>\fP \fIfilename\fP]"
 .ns
 .IP "\fBfinger\fP [\fIname\fP] [\fB>>\fP \fIfilename\fP]"
-Connects with the finger server on the current host. 
+Connects with the finger server on the current host.
 The current host is defined when a previous lookup for a host
-was successful and returned address information (see the 
+was successful and returned address information (see the
 \fBset querytype=A\fP command).
-\fIName\fP is optional. 
+\fIName\fP is optional.
 \fB>\fP and \fB>>\fP can be used to redirect output in the
 usual manner.
 .sp 1
@@ -153,14 +153,14 @@ usual manner.
 .IP "\fBls\fR [\fIoption\fR] \fIdomain\fR [\fB>>\fR \fIfilename\fR]"
 List the information available for \fIdomain\fP, optionally creating
 or appending to \fIfilename\fP.
-The default output contains host names and their Internet addresses. 
-.I Option 
+The default output contains host names and their Internet addresses.
+.I Option
 can be one of the following:
 .RS
 .IP "\fB\-t \fIquerytype\fP" 4
 lists all records of the specified type (see \fIquerytype\fP below).
 .IP \fB\-a\fP 4
-lists aliases of hosts in the domain. 
+lists aliases of hosts in the domain.
 synonym for \fB\-t\ \ CNAME\fP.
 .IP \fB\-d\fP 4
 lists all records for the domain.
@@ -177,7 +177,7 @@ When output is directed to a file, hash marks are printed for every
 .RE
 .sp 1
 .IP "\fBview\fP \fIfilename\fP"
-Sorts and lists the output of previous \fBls\fP command(s) with 
+Sorts and lists the output of previous \fBls\fP command(s) with
 \fImore\fP(1).
 .sp 1
 .ne 4
@@ -223,17 +223,17 @@ Essentially all fields of every packet are printed.
 .br
 (Default = nod2)
 .IP "\fBdomain=\fIname\fR"
-Change the default domain name to \fIname\fP. 
+Change the default domain name to \fIname\fP.
 The default domain name is appended to a lookup request depending on the
 state of the \fBdefname\fP and \fBsearch\fP options.
-The domain search list contains the parents of the default domain if it has 
-at least two components in its name. 
+The domain search list contains the parents of the default domain if it has
+at least two components in its name.
 For example, if the default domain
 is CC.Berkeley.EDU, the search list is CC.Berkeley.EDU and Berkeley.EDU.
 Use the \fBset srchlist\fP command to specify a different list.
 Use the \fBset all\fP command to display the list.
 .br
-(Default = value from hostname, /etc/resolv.conf or LOCALDOMAIN, 
+(Default = value from hostname, /etc/resolv.conf or LOCALDOMAIN,
 abbreviation = do)
 .IP "\fBsrchlist=\fIname1/name2/...\fR"
 Change the default domain name to \fIname1\fP and the domain search list
@@ -248,22 +248,22 @@ This command overrides the
 default domain name and search list of the \fBset domain\fP command.
 Use the \fBset all\fP command to display the list.
 .br
-(Default = value based on hostname, /etc/resolv.conf or LOCALDOMAIN, 
+(Default = value based on hostname, /etc/resolv.conf or LOCALDOMAIN,
 abbreviation = srchl)
 .IP "\fB[no]defname\fP"
-If set, append the default domain name to a single-component lookup request 
+If set, append the default domain name to a single-component lookup request
 (i.e., one that does not contain a period).
 .br
 (Default = defname, abbreviation = [no]def)
 .IP "\fB[no]search\fP"
-If the lookup request contains at least one period but doesn't end 
-with a trailing period, 
+If the lookup request contains at least one period but doesn't end
+with a trailing period,
 append the domain names in the domain search list
 to the request until an answer is received.
 .br
 (Default = search, abbreviation = [no]sea)
 .IP "\fBport=\fIvalue\fR"
-Change the default TCP/UDP name server port to \fIvalue\fP. 
+Change the default TCP/UDP name server port to \fIvalue\fP.
 .br
 (Default = 53, abbreviation = po)
 .IP "\fBquerytype=\fIvalue\fR"
@@ -275,7 +275,7 @@ Change the type of information query to one of:
 .IP A 10
 the host's Internet address.
 .IP CNAME  10
-the canonical name for an alias. 
+the canonical name for an alias.
 .IP HINFO 10
 the host CPU and operating system type.
 .IP MINFO 10
@@ -296,7 +296,7 @@ the user information.
 .IP WKS 10
 the supported well-known services.
 .P
-Other types (ANY, AXFR, MB, MD, MF, NULL) are described in the 
+Other types (ANY, AXFR, MB, MD, MF, NULL) are described in the
 RFC-1035 document.
 .br
 (Default = A, abbreviations = q, ty)
@@ -307,22 +307,22 @@ information.
 .br
 (Default = recurse, abbreviation = [no]rec)
 .IP \fBretry=\fInumber\fR
-Set the number of retries to \fInumber\fP. 
-When a reply to a request is not received within a certain 
-amount of time (changed with \fBset timeout\fP), 
-the timeout period is doubled and the request is resent. 
+Set the number of retries to \fInumber\fP.
+When a reply to a request is not received within a certain
+amount of time (changed with \fBset timeout\fP),
+the timeout period is doubled and the request is resent.
 The retry value controls how many times a request is resent before giving up.
 .br
 (Default = 4, abbreviation = ret)
 .IP \fBroot=\fIhost\fR
 Change the name of the root server to \fIhost\fP. This
-affects the \fBroot\fP command. 
+affects the \fBroot\fP command.
 .br
 (Default = ns.internic.net., abbreviation = ro)
 .IP \fBtimeout=\fInumber\fR
-Change the initial timeout interval 
-for waiting for a reply 
-to \fInumber\fP seconds. 
+Change the initial timeout interval
+for waiting for a reply
+to \fInumber\fP seconds.
 Each retry doubles the timeout period.
 .br
 (Default = 5 seconds, abbreviation = ti)
@@ -340,7 +340,7 @@ If the lookup request was not successful, an error message is printed.
 Possible errors are:
 .IP "Timed out" 5
 The server did not respond to a request after a certain amount of
-time (changed with \fBset timeout=\fIvalue\fR) 
+time (changed with \fBset timeout=\fIvalue\fR)
 and a certain number of retries (changed with \fBset retry=\fIvalue\fR).
 .IP "No response from server" 5
 No name server is running on the server machine.
@@ -353,9 +353,9 @@ The host or domain name does not exist.
 .IP "Connection refused" 5
 .ns
 .IP "Network is unreachable" 5
-The connection to the name or finger server could not be made 
+The connection to the name or finger server could not be made
 at the current time.
-This error commonly occurs with \fBls\fP and \fBfinger\fP requests. 
+This error commonly occurs with \fBls\fP and \fBfinger\fP requests.
 .IP "Server failure" 5
 The name server found an internal inconsistency in its database
 and could not return a valid answer.
@@ -367,7 +367,7 @@ It may indicate an error in \fInslookup\fP.
 .sp 1
 .SH FILES
 .ta \w'/usr/share/misc/nslookup.helpXXX'u
-/etc/resolv.conf	initial domain name and 
+/etc/resolv.conf	initial domain name and
 	name server addresses.
 .br
 $HOME/.nslookuprc	user's initial options.
@@ -379,7 +379,7 @@ HOSTALIASES	file containing host aliases.
 .br
 LOCALDOMAIN	overrides default domain.
 .SH SEE ALSO
-resolver(3), resolver(5), named(8), 
+resolver(3), resolver(5), named(8),
 .br
 RFC-1034  ``Domain Names \- Concepts and Facilities''
 .br
diff --git a/usr.sbin/named/man/resolver.3 b/usr.sbin/named/man/resolver.3
index ff9984c5eb0..791817b8ddb 100644
--- a/usr.sbin/named/man/resolver.3
+++ b/usr.sbin/named/man/resolver.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: resolver.3,v 1.4 1999/05/12 13:26:53 aaron Exp $
+.\"	$OpenBSD: resolver.3,v 1.5 1999/06/05 22:17:45 aaron Exp $
 .\" Copyright (c) 1985, 1995 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -335,6 +335,6 @@ parameter.
 .SH "SEE ALSO"
 gethostbyname(3), named(8), resolver(5), hostname(7),
 .br
-RFC1032, RFC1033, RFC1034, RFC1035, RFC974, 
+RFC1032, RFC1033, RFC1034, RFC1035, RFC974,
 .br
 SMM:11 Name Server Operations Guide for BIND