providing MLINKS for shell builtins makes little sense: what we had was out

of date for ever (no ksh builtins), and since we have two shells, pointing
to one page or the other is never going to work; so remove MLINKS for
csh(1); the cd(1) and wait(1) pages (also builtins); and update any trailing
Xr's;

please, there are tools like whence, man, and locate for finding this stuff;

ok deraadt miod

7 files changed, 13 insertions, 243 deletions

diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index 4e04f99d595..e7423991dde 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 2005/05/24 22:25:46 millert Exp $
+#	$OpenBSD: Makefile,v 1.9 2008/01/11 20:16:02 jmc Exp $
 #
 # C Shell with process control; VM/UNIX VAX Makefile
 # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
@@ -14,10 +14,6 @@ SRCS=	alloc.c char.c const.c csh.c dir.c dol.c error.c exec.c exp.c file.c \
 	func.c glob.c hist.c init.c lex.c misc.c parse.c proc.c \
 	sem.c set.c str.c time.c
 
-MLINKS=	csh.1 limit.1 csh.1 alias.1 csh.1 bg.1 csh.1 dirs.1 csh.1 fg.1 \
-	csh.1 foreach.1 csh.1 history.1 csh.1 jobs.1 csh.1 popd.1 \
-	csh.1 pushd.1 csh.1 rehash.1 csh.1 repeat.1 csh.1 suspend.1 \
-	csh.1 stop.1 csh.1 source.1 csh.1 unlimit.1
 CLEANFILES+=error.h const.h
 
 .if (${MACHINE_ARCH} == "vax")
diff --git a/bin/pwd/pwd.1 b/bin/pwd/pwd.1
index cb70b870f6d..94986421524 100644
--- a/bin/pwd/pwd.1
+++ b/bin/pwd/pwd.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pwd.1,v 1.13 2007/05/31 19:19:15 jmc Exp $
+.\"	$OpenBSD: pwd.1,v 1.14 2008/01/11 20:16:02 jmc Exp $
 .\"	$NetBSD: pwd.1,v 1.10 1995/09/07 06:47:30 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)pwd.1	8.2 (Berkeley) 4/28/95
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: January 11 2008 $
 .Dt PWD 1
 .Os
 .Sh NAME
@@ -60,7 +60,6 @@ The
 .Nm
 utility exits 0 on success or >0 if an error occurred.
 .Sh SEE ALSO
-.Xr cd 1 ,
 .Xr csh 1 ,
 .Xr ksh 1 ,
 .Xr sh 1 ,
diff --git a/share/man/man1/Makefile b/share/man/man1/Makefile
index 6b762f8efec..77ef537cd8e 100644
--- a/share/man/man1/Makefile
+++ b/share/man/man1/Makefile
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.3 2004/02/21 01:07:34 espie Exp $
+#	$OpenBSD: Makefile,v 1.4 2008/01/11 20:16:02 jmc Exp $
 #	$NetBSD: Makefile,v 1.4 1994/12/22 10:48:04 cgd Exp $
 
-MAN=	cd.1 intro.1 wait.1 gcc-local.1
+MAN=	intro.1 gcc-local.1
 
 .include <bsd.prog.mk>
 
diff --git a/share/man/man1/cd.1 b/share/man/man1/cd.1
deleted file mode 100644
index 25a80653d3a..00000000000
--- a/share/man/man1/cd.1
+++ /dev/null
@@ -1,128 +0,0 @@
-.\"	$OpenBSD: cd.1,v 1.15 2007/05/31 19:19:48 jmc Exp $
-.\"	$NetBSD: cd.1,v 1.2 1994/11/30 08:34:59 jtc Exp $
-.\"
-.\" Copyright (c) 1980, 1990, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the Institute of Electrical and Electronics Engineers, Inc.
-.\"
-.\" 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. 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
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS 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.
-.\"
-.\"     @(#)cd.1	8.1 (Berkeley) 6/5/93
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt CD 1
-.Os
-.Sh NAME
-.Nm cd
-.Nd change working directory
-.Sh SYNOPSIS
-.Nm cd
-.Op Ar directory
-.Sh DESCRIPTION
-.Ar directory
-is an absolute or relative pathname which becomes the new working directory.
-The interpretation of a relative pathname by
-.Nm
-depends on the
-.Ev CDPATH
-environment variable (see below).
-For an explanation of the directory hierarchy,
-see
-.Xr hier 7 .
-.Pp
-Note that
-.Nm
-is implemented as a built-in shell command and not as a stand-alone program.
-Because each process has its own working directory, a separate
-.Nm
-utility would have no effect (it would change the directory and exit,
-leaving the working directory in the parent unchanged).
-Different shells may implement
-.Nm
-with features different from those described here.
-Please consult the manual for your specific shell.
-.Pp
-The
-.Nm
-command exits 0 on success or >0 if an error occurred.
-.Sh ENVIRONMENT
-The following environment variables affect the execution of
-.Nm cd :
-.Bl -tag -width indent
-.It Ev CDPATH
-If the
-.Ar directory
-operand does not begin with a slash
-.Pq Sq /
-character, and the first component is not dot
-.Pq Ql \&.
-or dot-dot
-.Pq Ql .. ,
-.Nm
-searches for the directory relative to each colon-separated directory named
-in the
-.Ev CDPATH
-variable, in the order listed.
-The new working directory is set to the first matching directory found.
-An empty string in place of a directory pathname represents the current
-directory.
-If the new working directory was derived from
-.Ev CDPATH ,
-it will be printed to the standard output.
-See
-.Xr sh 1
-for details.
-Users of
-.Xr csh 1
-use the variable
-.Ev cdpath
-instead.
-.It Ev HOME
-If
-.Nm
-is invoked without arguments and the
-.Ev HOME
-environment variable exists and contains a directory name, that directory
-becomes the new working directory.
-.El
-.Pp
-See
-.Xr environ 7
-for more information on environment variables.
-.Sh SEE ALSO
-.Xr csh 1 ,
-.Xr pwd 1 ,
-.Xr sh 1 ,
-.Xr chdir 2 ,
-.Xr environ 7 ,
-.Xr hier 7
-.Sh STANDARDS
-The
-.Nm
-command is expected to be
-.St -p1003.2
-compatible.
diff --git a/share/man/man1/wait.1 b/share/man/man1/wait.1
deleted file mode 100644
index 0940074b4ee..00000000000
--- a/share/man/man1/wait.1
+++ /dev/null
@@ -1,95 +0,0 @@
-.\"	$OpenBSD: wait.1,v 1.8 2007/05/31 19:19:48 jmc Exp $
-.\"	$NetBSD: wait.1,v 1.2 1994/11/30 08:35:03 jtc Exp $
-.\"
-.\" Copyright (c) 1991, 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:
-.\" 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. 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
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS 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.
-.\"
-.\"     @(#)wait.1	8.1 (Berkeley) 6/5/93
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt WAIT 1
-.Os
-.Sh NAME
-.Nm wait
-.Nd await process completion
-.Sh SYNOPSIS
-.Nm wait
-.Op Ar pid
-.Sh DESCRIPTION
-If invoked with no arguments, the
-.Nm
-utility waits until all existing child processes in the background
-have terminated.
-.Pp
-Available operands:
-.Bl -tag -width Ds
-.It Ar pid
-If a
-.Ar pid
-operand is specified, and it is the process ID of a
-background child process that still exists, the
-.Nm
-utility waits until that process has completed and consumes its status
-information, without consuming the status information of any other process.
-.Pp
-If a
-.Ar pid
-operand is specified that is not the process ID of
-a child background process that still exists,
-.Nm
-exits without waiting for any processes to complete.
-.El
-.Pp
-The
-.Nm
-utility exits with one of the following values:
-.Bl -tag -width Ds
-.It \&0
-The
-.Nm
-utility was invoked with no operands and all of the existing background
-child processes have terminated, or the process specified by the
-.Ar pid
-operand exited normally with 0 as its exit status.
-.It \&>\&0
-The specified process did not exist and its exit status information was not
-available, or its exit status information was available and it terminated with
-a non-zero exit status.
-.El
-.Pp
-If the specified process terminated abnormally due to the receipt of a signal,
-the exit status information of
-.Nm
-contains that termination status as well.
-.Sh SEE ALSO
-.Xr wait 2
-.Sh STANDARDS
-The
-.Nm
-command is expected to be
-.St -p1003.2
-compatible.
diff --git a/usr.bin/lndir/lndir.1 b/usr.bin/lndir/lndir.1
index 3ad5e643aa7..58111cbe187 100644
--- a/usr.bin/lndir/lndir.1
+++ b/usr.bin/lndir/lndir.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: lndir.1,v 1.22 2007/05/31 19:20:12 jmc Exp $
+.\" $OpenBSD: lndir.1,v 1.23 2008/01/11 20:16:02 jmc Exp $
 .\"
 .\" Copyright (c) 1997, Jason Downs.  All rights reserved.
 .\"
@@ -51,7 +51,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from the X Consortium.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: January 11 2008 $
 .Dt LNDIR 1
 .Os
 .Sh NAME
@@ -87,9 +87,8 @@ files.
 .Pp
 This scheme has the advantage that if you update the source, you need not
 propagate the change to the other architectures by hand, since all
-source in all shadow directories are symlinks to the real thing: just
-.Xr cd 1
-to the shadow directory and recompile away.
+source in all shadow directories are symlinks to the real thing:
+just change working directory to the shadow directory and recompile away.
 .Pp
 The
 .Ar todir
diff --git a/usr.bin/patch/patch.1 b/usr.bin/patch/patch.1
index 219b29fac52..c2c6855d513 100644
--- a/usr.bin/patch/patch.1
+++ b/usr.bin/patch/patch.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: patch.1,v 1.20 2007/05/31 19:20:14 jmc Exp $
+.\"	$OpenBSD: patch.1,v 1.21 2008/01/11 20:16:02 jmc Exp $
 .\" Copyright 1986, Larry Wall
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -19,7 +19,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: January 11 2008 $
 .Dt PATCH 1
 .Os
 .Sh NAME
@@ -128,9 +128,8 @@ and the argument.
 .Xc
 Causes
 .Nm
-to interpret the next argument as a directory, and
-.Xr cd 1
-to it before doing anything else.
+to interpret the next argument as a directory,
+and change working directory to it before doing anything else.
 .It Fl E , Fl Fl remove-empty-files
 Causes
 .Nm