Index: head/usr.bin/ypcat/ypcat.1
===================================================================
--- head/usr.bin/ypcat/ypcat.1	(revision 287424)
+++ head/usr.bin/ypcat/ypcat.1	(revision 287425)
@@ -1,74 +1,74 @@
 .\" Copyright (c) 1993 Winning Strategies, Inc.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. All advertising materials mentioning features or use of this software
 .\"    must display the following acknowledgement:
 .\"      This product includes software developed by Winning Strategies, Inc.
 .\" 4. The name of the author may not be used to endorse or promote products
 .\"    derived from this software without specific prior written permission
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 .\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 .\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 .\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 .\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 .\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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.
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 3, 1993
+.Dd September 3, 2015
 .Dt YPCAT 1
 .Os
 .Sh NAME
 .Nm ypcat
-.Nd "print the values of all keys in a YP database"
+.Nd print the values of all keys in a NIS database
 .Sh SYNOPSIS
 .Nm
 .Op Fl kt
 .Op Fl d Ar domainname
 .Ar mapname
 .Nm
 .Fl x
 .Sh DESCRIPTION
 The
 .Nm
 utility prints out the values of all keys from the
-.Tn YP
+.Tn NIS
 database specified by
 .Ar mapname ,
 which may be a map name or a map nickname.
 .Pp
 The options are as follows:
 .Bl -tag -width indent
 .It Fl d Ar domainname
 Specify a domain other than the default domain.
 .It Fl k
 Display map keys.
 This option is useful with maps in which the values are null or the key
 is not part of the value.
 .It Fl t
 Inhibit translation of map nicknames
 to their corresponding map names.
 .It Fl x
 Display the map nickname table.
 .El
 .Sh SEE ALSO
 .Xr domainname 1 ,
 .Xr ypmatch 1 ,
 .Xr yp 8 ,
 .Xr ypbind 8 ,
 .Xr ypset 8
 .Sh AUTHORS
 .An Theo De Raadt Aq Mt deraadt@theos.com .
Index: head/usr.bin/ypmatch/ypmatch.1
===================================================================
--- head/usr.bin/ypmatch/ypmatch.1	(revision 287424)
+++ head/usr.bin/ypmatch/ypmatch.1	(revision 287425)
@@ -1,75 +1,75 @@
 .\" Copyright (c) 1993 Winning Strategies, Inc.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. All advertising materials mentioning features or use of this software
 .\"    must display the following acknowledgement:
 .\"      This product includes software developed by Winning Strategies, Inc.
 .\" 4. The name of the author may not be used to endorse or promote products
 .\"    derived from this software without specific prior written permission
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 .\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 .\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 .\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 .\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 .\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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.
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 3, 1993
+.Dd September 3, 2015
 .Dt YPMATCH 1
 .Os
 .Sh NAME
 .Nm ypmatch
-.Nd "print the values of one or more keys in a YP database"
+.Nd print the values of one or more keys in a NIS database
 .Sh SYNOPSIS
 .Nm
 .Op Fl kt
 .Op Fl d Ar domainname
 .Ar key ...
 .Ar mapname
 .Nm
 .Fl x
 .Sh DESCRIPTION
 The
 .Nm
 utility prints out the values of one or more keys from the
-.Tn YP
+.Tn NIS
 database specified by
 .Ar mapname ,
 which may be a map name or a map nickname.
 .Pp
 The options are as follows:
 .Bl -tag -width indent
 .It Fl d Ar domainname
 Specify a domain other than the default domain.
 .It Fl k
 Display map keys.
 This option is useful with maps in which the values are null or the key
 is not part of the value.
 .It Fl t
 Inhibit translation of map nicknames
 to their corresponding map names.
 .It Fl x
 Display the map nickname table.
 .El
 .Sh SEE ALSO
 .Xr domainname 1 ,
 .Xr ypcat 1 ,
 .Xr yp 8 ,
 .Xr ypbind 8 ,
 .Xr ypset 8
 .Sh AUTHORS
 .An Theo De Raadt Aq Mt deraadt@theos.com .
Index: head/usr.bin/ypwhich/ypwhich.1
===================================================================
--- head/usr.bin/ypwhich/ypwhich.1	(revision 287424)
+++ head/usr.bin/ypwhich/ypwhich.1	(revision 287425)
@@ -1,103 +1,103 @@
 .\"	$NetBSD: ypwhich.1,v 1.3 1996/05/13 02:43:46 thorpej Exp $
 .\"
 .\" Copyright (c) 1994 Christopher G. Demetriou
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. All advertising materials mentioning features or use of this software
 .\"    must display the following acknowledgement:
 .\"      This product includes software developed by Christopher G. Demetriou.
 .\" 3. The name of the author may not be used to endorse or promote products
 .\"    derived from this software without specific prior written permission
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 .\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 .\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
 .\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
 .\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 .\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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.
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 23, 1994
+.Dd September 3, 2015
 .Dt YPWHICH 1
 .Os
 .Sh NAME
 .Nm ypwhich
-.Nd return hostname of YP server of map master
+.Nd return hostname of NIS server of map master
 .Sh SYNOPSIS
 .Nm
 .Op Fl d Ar domain
 .Oo
 .Op Fl t
 .Fl m Oo Ar mname Oc | Ar host
 .Oc
 .Nm
 .Fl x
 .Sh DESCRIPTION
 The
 .Nm
 utility tells which
-.Tn YP
+.Tn NIS
 server supplies
-.Tn YP
+.Tn NIS
 services to a client, or which is the master for a map.
 If invoked without arguments, it gives the
-.Tn YP
+.Tn NIS
 server for the local machine.
 If
 .Ar host
 is specified, that machine is queried to find out
 which
-.Tn YP
+.Tn NIS
 server it is using.
 .Pp
 The options are as follows:
 .Bl -tag -width indent
 .It Fl d Ar domain
 Specify a domain other than the default domain.
 .It Fl t
 Inhibit translation of map nicknames
 to their corresponding map names.
 .It Fl m Op Ar mname
 Find the master
-.Tn YP
+.Tn NIS
 server for the named map.
 No
 .Ar host
 may be specified with the
 .Fl m
 option.
 The
 .Ar mname
 argument
 can be a map name or nickname.
 If
 .Ar mname
 is omitted,
 .Nm
 will produce a list of available maps.
 .It Fl x
 Display the map nickname table.
 .El
 .Sh SEE ALSO
 .Xr domainname 1 ,
 .Xr ypcat 1 ,
 .Xr ypmatch 1 ,
 .Xr yp 8 ,
 .Xr ypbind 8 ,
 .Xr yppoll 8 ,
 .Xr ypset 8
 .Sh AUTHORS
 .An Theo De Raadt
Index: head/usr.sbin/ypset/ypset.8
===================================================================
--- head/usr.sbin/ypset/ypset.8	(revision 287424)
+++ head/usr.sbin/ypset/ypset.8	(revision 287425)
@@ -1,88 +1,88 @@
 .\"
 .\" Copyright (c) 1994 Jason R. Thorpe
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. All advertising materials mentioning features or use of this software
 .\"    must display the following acknowledgement:
 .\"	This product includes software developed by Jason Thorpe.
 .\" 4. Neither the name of the author 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 AUTHOR ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" 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.
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 04, 2015
+.Dd September 3, 2015
 .Dt YPSET 8
 .Os
 .Sh NAME
 .Nm ypset
 .Nd tell
 .Xr ypbind 8
-which YP server process to use
+which NIS server process to use
 .Sh SYNOPSIS
 .Nm
 .Op Fl h Ar host
 .Op Fl d Ar domain
 .Ar server
 .Sh DESCRIPTION
 The
 .Nm
 utility tells the
 .Xr ypbind 8
-process on the current machine which YP server process to communicate with.
+process on the current machine which NIS server process to communicate with.
 If
 .Ar server
-is down or is not running a YP server process, it is not discovered until
-a YP client process attempts to access a YP map, at which time
+is down or is not running a NIS server process, it is not discovered until
+a NIS client process attempts to access a NIS map, at which time
 .Xr ypbind 8
 tests the binding and takes appropriate action.
 .Pp
 The
 .Nm
 utility
-is most useful for binding a YP client that is not on the same broadcast
-network as the closest YP server, but can also be used for debugging
-a local network's YP configuration, testing specific YP client
+is most useful for binding a NIS client that is not on the same broadcast
+network as the closest NIS server, but can also be used for debugging
+a local network's NIS configuration, testing specific NIS client
 programs, or binding to a specific server when there are many servers on
-the local network supplying YP maps.
+the local network supplying NIS maps.
 .Pp
 The options are as follows:
 .Bl -tag -width indent
 .It Fl d Ar domain
-Use the YP domain
+Use the NIS domain
 .Ar domain
 instead of the default domain as returned by
 .Xr domainname 1 .
 .It Fl h Ar host
-Set the YP binding on
+Set the NIS binding on
 .Ar host
 instead of the local machine.
 .El
 .Sh SEE ALSO
 .Xr domainname 1 ,
 .Xr ypcat 1 ,
 .Xr ypmatch 1 ,
 .Xr yp 8 ,
 .Xr ypbind 8
 .Sh AUTHORS
 .An Theo De Raadt