summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rw-r--r--bin/cat/cat.18
-rw-r--r--bin/cat/cat.c10
-rw-r--r--bin/chmod/chflags.18
-rw-r--r--bin/chmod/chgrp.18
-rw-r--r--bin/chmod/chmod.18
-rw-r--r--bin/chmod/chmod.c10
-rw-r--r--bin/chmod/chown.88
-rw-r--r--bin/cp/cp.18
-rw-r--r--bin/cp/cp.c10
-rw-r--r--bin/cp/extern.h8
-rw-r--r--bin/cp/utils.c10
-rw-r--r--bin/csh/USD.doc/csh.18
-rw-r--r--bin/csh/USD.doc/csh.28
-rw-r--r--bin/csh/USD.doc/csh.38
-rw-r--r--bin/csh/USD.doc/csh.48
-rw-r--r--bin/csh/USD.doc/csh.a8
-rw-r--r--bin/csh/USD.doc/csh.g8
-rw-r--r--bin/csh/USD.doc/tabs8
-rw-r--r--bin/csh/alloc.c10
-rw-r--r--bin/csh/char.c10
-rw-r--r--bin/csh/char.h8
-rw-r--r--bin/csh/const.c10
-rw-r--r--bin/csh/csh.18
-rw-r--r--bin/csh/csh.c10
-rw-r--r--bin/csh/csh.h8
-rw-r--r--bin/csh/dir.c10
-rw-r--r--bin/csh/dir.h8
-rw-r--r--bin/csh/dol.c10
-rw-r--r--bin/csh/error.c10
-rw-r--r--bin/csh/exec.c10
-rw-r--r--bin/csh/exp.c10
-rw-r--r--bin/csh/extern.h8
-rw-r--r--bin/csh/file.c10
-rw-r--r--bin/csh/func.c10
-rw-r--r--bin/csh/glob.c10
-rw-r--r--bin/csh/hist.c10
-rw-r--r--bin/csh/init.c10
-rw-r--r--bin/csh/lex.c10
-rw-r--r--bin/csh/misc.c10
-rw-r--r--bin/csh/parse.c10
-rw-r--r--bin/csh/pathnames.h8
-rw-r--r--bin/csh/printf.c10
-rw-r--r--bin/csh/proc.c10
-rw-r--r--bin/csh/proc.h8
-rw-r--r--bin/csh/sem.c10
-rw-r--r--bin/csh/set.c10
-rw-r--r--bin/csh/str.c10
-rw-r--r--bin/csh/time.c10
-rw-r--r--bin/date/date.18
-rw-r--r--bin/date/date.c10
-rw-r--r--bin/date/extern.h8
-rw-r--r--bin/date/netdate.c10
-rw-r--r--bin/dd/args.c10
-rw-r--r--bin/dd/conv.c10
-rw-r--r--bin/dd/conv_tab.c10
-rw-r--r--bin/dd/dd.18
-rw-r--r--bin/dd/dd.c10
-rw-r--r--bin/dd/dd.h8
-rw-r--r--bin/dd/extern.h8
-rw-r--r--bin/dd/misc.c10
-rw-r--r--bin/dd/position.c10
-rw-r--r--bin/df/df.18
-rw-r--r--bin/df/df.c10
-rw-r--r--bin/df/ext2fs_df.c8
-rw-r--r--bin/df/ffs_df.c8
-rw-r--r--bin/df/lfs_df.c8
-rw-r--r--bin/domainname/domainname.18
-rw-r--r--bin/domainname/domainname.c10
-rw-r--r--bin/echo/echo.18
-rw-r--r--bin/echo/echo.c10
-rw-r--r--bin/ed/cbc.c10
-rw-r--r--bin/hostname/hostname.18
-rw-r--r--bin/hostname/hostname.c10
-rw-r--r--bin/kill/kill.18
-rw-r--r--bin/kill/kill.c10
-rw-r--r--bin/ksh/ksh.18
-rw-r--r--bin/ksh/ksh.1tbl8
-rw-r--r--bin/ksh/sh.18
-rw-r--r--bin/ksh/sh.1tbl8
-rw-r--r--bin/ln/ln.18
-rw-r--r--bin/ln/ln.c10
-rw-r--r--bin/ln/symlink.78
-rw-r--r--bin/ls/cmp.c10
-rw-r--r--bin/ls/extern.h8
-rw-r--r--bin/ls/ls.18
-rw-r--r--bin/ls/ls.c10
-rw-r--r--bin/ls/ls.h8
-rw-r--r--bin/ls/print.c10
-rw-r--r--bin/ls/util.c10
-rw-r--r--bin/mkdir/mkdir.18
-rw-r--r--bin/mkdir/mkdir.c10
-rw-r--r--bin/mt/mt.18
-rw-r--r--bin/mt/mt.c10
-rw-r--r--bin/mt/mt.h8
-rw-r--r--bin/mt/mtrmt.c8
-rw-r--r--bin/mt/pathnames.h8
-rw-r--r--bin/mv/mv.18
-rw-r--r--bin/mv/mv.c10
-rw-r--r--bin/mv/pathnames.h8
-rw-r--r--bin/pax/ar_io.c10
-rw-r--r--bin/pax/ar_subs.c10
-rw-r--r--bin/pax/buf_subs.c10
-rw-r--r--bin/pax/cache.c10
-rw-r--r--bin/pax/cache.h8
-rw-r--r--bin/pax/cpio.c10
-rw-r--r--bin/pax/cpio.h8
-rw-r--r--bin/pax/extern.h8
-rw-r--r--bin/pax/file_subs.c10
-rw-r--r--bin/pax/ftree.c10
-rw-r--r--bin/pax/ftree.h8
-rw-r--r--bin/pax/gen_subs.c10
-rw-r--r--bin/pax/options.c10
-rw-r--r--bin/pax/options.h8
-rw-r--r--bin/pax/pat_rep.c10
-rw-r--r--bin/pax/pat_rep.h8
-rw-r--r--bin/pax/pax.18
-rw-r--r--bin/pax/pax.c10
-rw-r--r--bin/pax/pax.h8
-rw-r--r--bin/pax/sel_subs.c10
-rw-r--r--bin/pax/sel_subs.h8
-rw-r--r--bin/pax/tables.c10
-rw-r--r--bin/pax/tables.h8
-rw-r--r--bin/pax/tar.c10
-rw-r--r--bin/pax/tar.h8
-rw-r--r--bin/pax/tty_subs.c10
-rw-r--r--bin/ps/extern.h8
-rw-r--r--bin/ps/keyword.c10
-rw-r--r--bin/ps/nlist.c10
-rw-r--r--bin/ps/print.c10
-rw-r--r--bin/ps/ps.18
-rw-r--r--bin/ps/ps.c10
-rw-r--r--bin/ps/ps.h8
-rw-r--r--bin/pwd/pwd.18
-rw-r--r--bin/pwd/pwd.c10
-rw-r--r--bin/rcp/extern.h8
-rw-r--r--bin/rcp/pathnames.h8
-rw-r--r--bin/rcp/rcp.18
-rw-r--r--bin/rcp/rcp.c8
-rw-r--r--bin/rcp/util.c10
-rw-r--r--bin/rm/rm.18
-rw-r--r--bin/rm/rm.c10
-rw-r--r--bin/rmail/rmail.88
-rw-r--r--bin/rmail/rmail.c10
-rw-r--r--bin/rmdir/rmdir.18
-rw-r--r--bin/rmdir/rmdir.c10
-rw-r--r--bin/sleep/sleep.18
-rw-r--r--bin/sleep/sleep.c10
-rw-r--r--bin/stty/cchar.c10
-rw-r--r--bin/stty/extern.h8
-rw-r--r--bin/stty/gfmt.c10
-rw-r--r--bin/stty/key.c10
-rw-r--r--bin/stty/modes.c10
-rw-r--r--bin/stty/print.c10
-rw-r--r--bin/stty/stty.18
-rw-r--r--bin/stty/stty.c10
-rw-r--r--bin/stty/stty.h8
-rw-r--r--bin/sync/sync.88
-rw-r--r--bin/sync/sync.c10
-rw-r--r--bin/test/test.18
159 files changed, 399 insertions, 1035 deletions
diff --git a/bin/cat/cat.1 b/bin/cat/cat.1
index 6baed683845..ac282346928 100644
--- a/bin/cat/cat.1
+++ b/bin/cat/cat.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cat.1,v 1.23 2003/06/01 23:50:02 millert Exp $
+.\" $OpenBSD: cat.1,v 1.24 2003/06/02 23:32:06 millert Exp $
.\" $NetBSD: cat.1,v 1.12 1995/09/27 05:38:55 cgd Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -15,11 +15,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/cat/cat.c b/bin/cat/cat.c
index 3f38cc2b5d0..1191d6fca47 100644
--- a/bin/cat/cat.c
+++ b/bin/cat/cat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cat.c,v 1.14 2002/07/04 04:26:39 deraadt Exp $ */
+/* $OpenBSD: cat.c,v 1.15 2003/06/02 23:32:06 millert Exp $ */
/* $NetBSD: cat.c,v 1.11 1995/09/07 06:12:54 jtc Exp $ */
/*
@@ -16,11 +16,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -47,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)cat.c 8.2 (Berkeley) 4/27/95";
#else
-static char rcsid[] = "$OpenBSD: cat.c,v 1.14 2002/07/04 04:26:39 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: cat.c,v 1.15 2003/06/02 23:32:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/chmod/chflags.1 b/bin/chmod/chflags.1
index 89733f093bb..427153e8f8b 100644
--- a/bin/chmod/chflags.1
+++ b/bin/chmod/chflags.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: chflags.1,v 1.2 2000/11/09 23:47:14 aaron Exp $
+.\" $OpenBSD: chflags.1,v 1.3 2003/06/02 23:32:06 millert Exp $
.\" $NetBSD: chflags.1,v 1.4 1995/08/31 22:50:22 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993, 1994
@@ -15,11 +15,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/chmod/chgrp.1 b/bin/chmod/chgrp.1
index 7d85b9e9ff8..1e0076d138f 100644
--- a/bin/chmod/chgrp.1
+++ b/bin/chmod/chgrp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: chgrp.1,v 1.4 2003/04/28 06:27:36 jmc Exp $
+.\" $OpenBSD: chgrp.1,v 1.5 2003/06/02 23:32:06 millert Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/chmod/chmod.1 b/bin/chmod/chmod.1
index 093bce23553..6a8bcea924c 100644
--- a/bin/chmod/chmod.1
+++ b/bin/chmod/chmod.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: chmod.1,v 1.25 2003/06/01 23:50:02 millert Exp $
+.\" $OpenBSD: chmod.1,v 1.26 2003/06/02 23:32:06 millert Exp $
.\" $NetBSD: chmod.1,v 1.8 1995/03/21 09:02:07 cgd Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993, 1994
@@ -15,11 +15,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/chmod/chmod.c b/bin/chmod/chmod.c
index 45162d2223f..83a9104f2ba 100644
--- a/bin/chmod/chmod.c
+++ b/bin/chmod/chmod.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chmod.c,v 1.15 2003/06/01 23:50:02 millert Exp $ */
+/* $OpenBSD: chmod.c,v 1.16 2003/06/02 23:32:06 millert Exp $ */
/* $NetBSD: chmod.c,v 1.12 1995/03/21 09:02:09 cgd Exp $ */
/*
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)chmod.c 8.8 (Berkeley) 4/1/94";
#else
-static char rcsid[] = "$OpenBSD: chmod.c,v 1.15 2003/06/01 23:50:02 millert Exp $";
+static char rcsid[] = "$OpenBSD: chmod.c,v 1.16 2003/06/02 23:32:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/chmod/chown.8 b/bin/chmod/chown.8
index fa5c994503f..e890867cae8 100644
--- a/bin/chmod/chown.8
+++ b/bin/chmod/chown.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: chown.8,v 1.4 2003/05/29 09:43:09 jmc Exp $
+.\" $OpenBSD: chown.8,v 1.5 2003/06/02 23:32:06 millert Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/cp/cp.1 b/bin/cp/cp.1
index bd685cdc8c8..c1274805855 100644
--- a/bin/cp/cp.1
+++ b/bin/cp/cp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cp.1,v 1.22 2003/06/01 23:50:02 millert Exp $
+.\" $OpenBSD: cp.1,v 1.23 2003/06/02 23:32:06 millert Exp $
.\" $NetBSD: cp.1,v 1.9 1995/07/25 19:36:45 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993, 1994
@@ -15,11 +15,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/cp/cp.c b/bin/cp/cp.c
index f0b00663cbb..9885215c49b 100644
--- a/bin/cp/cp.c
+++ b/bin/cp/cp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cp.c,v 1.25 2003/06/01 23:50:02 millert Exp $ */
+/* $OpenBSD: cp.c,v 1.26 2003/06/02 23:32:06 millert Exp $ */
/* $NetBSD: cp.c,v 1.14 1995/09/07 06:14:51 jtc Exp $ */
/*
@@ -16,11 +16,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -47,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)cp.c 8.5 (Berkeley) 4/29/95";
#else
-static char rcsid[] = "$OpenBSD: cp.c,v 1.25 2003/06/01 23:50:02 millert Exp $";
+static char rcsid[] = "$OpenBSD: cp.c,v 1.26 2003/06/02 23:32:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/cp/extern.h b/bin/cp/extern.h
index cf968368a62..8ac8f4b3936 100644
--- a/bin/cp/extern.h
+++ b/bin/cp/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.10 2003/06/01 23:50:02 millert Exp $ */
+/* $OpenBSD: extern.h,v 1.11 2003/06/02 23:32:06 millert Exp $ */
/* $NetBSD: extern.h,v 1.3 1995/03/21 09:02:16 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index b34d92ddd41..30410a3a9fb 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: utils.c,v 1.21 2003/06/01 23:50:02 millert Exp $ */
+/* $OpenBSD: utils.c,v 1.22 2003/06/02 23:32:06 millert Exp $ */
/* $NetBSD: utils.c,v 1.6 1997/02/26 14:40:51 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)utils.c 8.3 (Berkeley) 4/1/94";
#else
-static char rcsid[] = "$OpenBSD: utils.c,v 1.21 2003/06/01 23:50:02 millert Exp $";
+static char rcsid[] = "$OpenBSD: utils.c,v 1.22 2003/06/02 23:32:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/csh/USD.doc/csh.1 b/bin/csh/USD.doc/csh.1
index 19f84cc7cbb..f41c3d11861 100644
--- a/bin/csh/USD.doc/csh.1
+++ b/bin/csh/USD.doc/csh.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: csh.1,v 1.6 2003/03/09 06:04:52 david Exp $
+.\" $OpenBSD: csh.1,v 1.7 2003/06/02 23:32:07 millert Exp $
.\" $NetBSD: csh.1,v 1.3 1995/03/21 09:03:33 cgd Exp $
.\"
.\" Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/csh/USD.doc/csh.2 b/bin/csh/USD.doc/csh.2
index 0ec615ec337..5420d8a6bda 100644
--- a/bin/csh/USD.doc/csh.2
+++ b/bin/csh/USD.doc/csh.2
@@ -1,4 +1,4 @@
-.\" $OpenBSD: csh.2,v 1.6 2003/03/09 06:04:52 david Exp $
+.\" $OpenBSD: csh.2,v 1.7 2003/06/02 23:32:07 millert Exp $
.\" $NetBSD: csh.2,v 1.3 1995/03/21 09:03:35 cgd Exp $
.\"
.\" Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/csh/USD.doc/csh.3 b/bin/csh/USD.doc/csh.3
index 25ca82b6448..6e6760547df 100644
--- a/bin/csh/USD.doc/csh.3
+++ b/bin/csh/USD.doc/csh.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: csh.3,v 1.2 1996/06/23 14:19:37 deraadt Exp $
+.\" $OpenBSD: csh.3,v 1.3 2003/06/02 23:32:07 millert Exp $
.\" $NetBSD: csh.3,v 1.3 1995/03/21 09:03:38 cgd Exp $
.\"
.\" Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/csh/USD.doc/csh.4 b/bin/csh/USD.doc/csh.4
index e57535207e9..f3806be6f5b 100644
--- a/bin/csh/USD.doc/csh.4
+++ b/bin/csh/USD.doc/csh.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: csh.4,v 1.2 1996/06/23 14:19:39 deraadt Exp $
+.\" $OpenBSD: csh.4,v 1.3 2003/06/02 23:32:07 millert Exp $
.\" $NetBSD: csh.4,v 1.3 1995/03/21 09:03:39 cgd Exp $
.\"
.\" Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/csh/USD.doc/csh.a b/bin/csh/USD.doc/csh.a
index abf96db6910..e4a820de2cf 100644
--- a/bin/csh/USD.doc/csh.a
+++ b/bin/csh/USD.doc/csh.a
@@ -1,4 +1,4 @@
-.\" $OpenBSD: csh.a,v 1.3 1998/04/25 00:57:35 deraadt Exp $
+.\" $OpenBSD: csh.a,v 1.4 2003/06/02 23:32:07 millert Exp $
.\" $NetBSD: csh.a,v 1.3 1995/03/21 09:03:41 cgd Exp $
.\"
.\" Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/csh/USD.doc/csh.g b/bin/csh/USD.doc/csh.g
index 2d336e2d395..d06ecbf4214 100644
--- a/bin/csh/USD.doc/csh.g
+++ b/bin/csh/USD.doc/csh.g
@@ -1,4 +1,4 @@
-.\" $OpenBSD: csh.g,v 1.4 1998/09/24 07:08:38 pjanzen Exp $
+.\" $OpenBSD: csh.g,v 1.5 2003/06/02 23:32:07 millert Exp $
.\" $NetBSD: csh.g,v 1.3 1995/03/21 09:03:42 cgd Exp $
.\"
.\" Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/csh/USD.doc/tabs b/bin/csh/USD.doc/tabs
index 5e9a89b58f2..d176705de26 100644
--- a/bin/csh/USD.doc/tabs
+++ b/bin/csh/USD.doc/tabs
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tabs,v 1.2 1996/06/23 14:19:41 deraadt Exp $
+.\" $OpenBSD: tabs,v 1.3 2003/06/02 23:32:07 millert Exp $
.\" $NetBSD: tabs,v 1.3 1995/03/21 09:03:45 cgd Exp $
.\"
.\" Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/csh/alloc.c b/bin/csh/alloc.c
index 4d13c86a133..43544659b10 100644
--- a/bin/csh/alloc.c
+++ b/bin/csh/alloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: alloc.c,v 1.7 2002/02/19 19:39:35 millert Exp $ */
+/* $OpenBSD: alloc.c,v 1.8 2003/06/02 23:32:06 millert Exp $ */
/* $NetBSD: alloc.c,v 1.6 1995/03/21 09:02:23 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)alloc.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: alloc.c,v 1.7 2002/02/19 19:39:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: alloc.c,v 1.8 2003/06/02 23:32:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/csh/char.c b/bin/csh/char.c
index b8af36fa07c..8cf8bfa0435 100644
--- a/bin/csh/char.c
+++ b/bin/csh/char.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: char.c,v 1.2 1996/06/23 14:19:12 deraadt Exp $ */
+/* $OpenBSD: char.c,v 1.3 2003/06/02 23:32:06 millert Exp $ */
/* $NetBSD: char.c,v 1.6 1995/03/21 09:02:26 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)char.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: char.c,v 1.2 1996/06/23 14:19:12 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: char.c,v 1.3 2003/06/02 23:32:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/csh/char.h b/bin/csh/char.h
index fbbe1db375c..dcfad3ea953 100644
--- a/bin/csh/char.h
+++ b/bin/csh/char.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: char.h,v 1.3 1997/07/23 14:36:47 kstailey Exp $ */
+/* $OpenBSD: char.h,v 1.4 2003/06/02 23:32:06 millert Exp $ */
/* $NetBSD: char.h,v 1.6 1995/03/21 09:02:29 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/csh/const.c b/bin/csh/const.c
index 3ceac4a89b1..b5bb162f99e 100644
--- a/bin/csh/const.c
+++ b/bin/csh/const.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: const.c,v 1.4 2002/06/09 05:47:27 todd Exp $ */
+/* $OpenBSD: const.c,v 1.5 2003/06/02 23:32:06 millert Exp $ */
/* $NetBSD: const.c,v 1.6 1995/03/21 09:02:31 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)const.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: const.c,v 1.4 2002/06/09 05:47:27 todd Exp $";
+static char rcsid[] = "$OpenBSD: const.c,v 1.5 2003/06/02 23:32:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/csh/csh.1 b/bin/csh/csh.1
index 1826c01fb06..9468a25dbaf 100644
--- a/bin/csh/csh.1
+++ b/bin/csh/csh.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: csh.1,v 1.45 2003/05/29 12:14:08 jmc Exp $
+.\" $OpenBSD: csh.1,v 1.46 2003/06/02 23:32:06 millert Exp $
.\" $NetBSD: csh.1,v 1.10 1995/03/21 09:02:35 cgd Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -12,11 +12,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/csh/csh.c b/bin/csh/csh.c
index 0bdd06737bd..24b4664ff5d 100644
--- a/bin/csh/csh.c
+++ b/bin/csh/csh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: csh.c,v 1.19 2003/01/08 06:54:16 deraadt Exp $ */
+/* $OpenBSD: csh.c,v 1.20 2003/06/02 23:32:06 millert Exp $ */
/* $NetBSD: csh.c,v 1.14 1995/04/29 23:21:28 mycroft Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)csh.c 8.2 (Berkeley) 10/12/93";
#else
-static char rcsid[] = "$OpenBSD: csh.c,v 1.19 2003/01/08 06:54:16 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: csh.c,v 1.20 2003/06/02 23:32:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/csh/csh.h b/bin/csh/csh.h
index 48740805a3c..956ff61314f 100644
--- a/bin/csh/csh.h
+++ b/bin/csh/csh.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: csh.h,v 1.12 2003/05/12 04:11:18 jsyn Exp $ */
+/* $OpenBSD: csh.h,v 1.13 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: csh.h,v 1.9 1995/03/21 09:02:40 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/csh/dir.c b/bin/csh/dir.c
index d691c4eddf8..1b7da733457 100644
--- a/bin/csh/dir.c
+++ b/bin/csh/dir.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dir.c,v 1.10 2003/05/08 19:52:56 vincent Exp $ */
+/* $OpenBSD: dir.c,v 1.11 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: dir.c,v 1.9 1995/03/21 09:02:42 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)dir.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: dir.c,v 1.10 2003/05/08 19:52:56 vincent Exp $";
+static char rcsid[] = "$OpenBSD: dir.c,v 1.11 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/csh/dir.h b/bin/csh/dir.h
index d9fed20242a..552357e1027 100644
--- a/bin/csh/dir.h
+++ b/bin/csh/dir.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dir.h,v 1.2 1996/06/23 14:19:18 deraadt Exp $ */
+/* $OpenBSD: dir.h,v 1.3 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: dir.h,v 1.6 1995/03/21 09:02:44 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/csh/dol.c b/bin/csh/dol.c
index 9e215b220c6..50c4906d470 100644
--- a/bin/csh/dol.c
+++ b/bin/csh/dol.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dol.c,v 1.11 2003/01/08 06:54:16 deraadt Exp $ */
+/* $OpenBSD: dol.c,v 1.12 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: dol.c,v 1.8 1995/09/27 00:38:38 jtc Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)dol.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: dol.c,v 1.11 2003/01/08 06:54:16 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: dol.c,v 1.12 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/csh/error.c b/bin/csh/error.c
index e54f9a7a395..7c63907cbe2 100644
--- a/bin/csh/error.c
+++ b/bin/csh/error.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: error.c,v 1.4 2002/02/19 19:39:35 millert Exp $ */
+/* $OpenBSD: error.c,v 1.5 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: err.c,v 1.6 1995/03/21 09:02:47 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: error.c,v 1.4 2002/02/19 19:39:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: error.c,v 1.5 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/csh/exec.c b/bin/csh/exec.c
index b97bb1ad5f1..a193a5b64dd 100644
--- a/bin/csh/exec.c
+++ b/bin/csh/exec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec.c,v 1.11 2003/01/08 06:54:16 deraadt Exp $ */
+/* $OpenBSD: exec.c,v 1.12 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: exec.c,v 1.9 1996/09/30 20:03:54 christos Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)exec.c 8.3 (Berkeley) 5/23/95";
#else
-static char rcsid[] = "$OpenBSD: exec.c,v 1.11 2003/01/08 06:54:16 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: exec.c,v 1.12 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/csh/exp.c b/bin/csh/exp.c
index fa41415703b..9e1849f4a9e 100644
--- a/bin/csh/exp.c
+++ b/bin/csh/exp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exp.c,v 1.5 2002/02/19 19:39:35 millert Exp $ */
+/* $OpenBSD: exp.c,v 1.6 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: exp.c,v 1.6 1995/03/21 09:02:51 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)exp.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: exp.c,v 1.5 2002/02/19 19:39:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: exp.c,v 1.6 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/csh/extern.h b/bin/csh/extern.h
index 21d13b6df0b..37d617722f5 100644
--- a/bin/csh/extern.h
+++ b/bin/csh/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.11 2003/05/12 21:42:01 jsyn Exp $ */
+/* $OpenBSD: extern.h,v 1.12 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: extern.h,v 1.8 1996/10/31 23:50:54 christos Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/csh/file.c b/bin/csh/file.c
index 585da7c9b71..29baa161929 100644
--- a/bin/csh/file.c
+++ b/bin/csh/file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: file.c,v 1.13 2003/01/08 06:54:16 deraadt Exp $ */
+/* $OpenBSD: file.c,v 1.14 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: file.c,v 1.11 1996/11/08 19:34:37 christos Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)file.c 8.2 (Berkeley) 3/19/94";
#else
-static char rcsid[] = "$OpenBSD: file.c,v 1.13 2003/01/08 06:54:16 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: file.c,v 1.14 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/csh/func.c b/bin/csh/func.c
index c76cdf3e312..fff5f0e21bf 100644
--- a/bin/csh/func.c
+++ b/bin/csh/func.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: func.c,v 1.16 2003/05/12 23:26:16 jsyn Exp $ */
+/* $OpenBSD: func.c,v 1.17 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: func.c,v 1.11 1996/02/09 02:28:29 christos Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)func.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: func.c,v 1.16 2003/05/12 23:26:16 jsyn Exp $";
+static char rcsid[] = "$OpenBSD: func.c,v 1.17 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/csh/glob.c b/bin/csh/glob.c
index 0837a4a259d..70b95ef0f89 100644
--- a/bin/csh/glob.c
+++ b/bin/csh/glob.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: glob.c,v 1.9 2003/01/08 06:54:16 deraadt Exp $ */
+/* $OpenBSD: glob.c,v 1.10 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: glob.c,v 1.10 1995/03/21 09:03:01 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)glob.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: glob.c,v 1.9 2003/01/08 06:54:16 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: glob.c,v 1.10 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/csh/hist.c b/bin/csh/hist.c
index 856c7e3488b..8fe1a008615 100644
--- a/bin/csh/hist.c
+++ b/bin/csh/hist.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hist.c,v 1.5 2002/02/19 19:39:35 millert Exp $ */
+/* $OpenBSD: hist.c,v 1.6 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: hist.c,v 1.7 1995/03/21 18:35:44 mycroft Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)hist.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: hist.c,v 1.5 2002/02/19 19:39:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: hist.c,v 1.6 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/csh/init.c b/bin/csh/init.c
index ec61f3bea0e..77a0fdb0ec5 100644
--- a/bin/csh/init.c
+++ b/bin/csh/init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init.c,v 1.4 2002/02/19 19:39:35 millert Exp $ */
+/* $OpenBSD: init.c,v 1.5 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: init.c,v 1.6 1995/03/21 09:03:05 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: init.c,v 1.4 2002/02/19 19:39:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: init.c,v 1.5 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/csh/lex.c b/bin/csh/lex.c
index 285f99a8d39..18f9695406d 100644
--- a/bin/csh/lex.c
+++ b/bin/csh/lex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lex.c,v 1.10 2003/04/15 01:17:33 deraadt Exp $ */
+/* $OpenBSD: lex.c,v 1.11 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: lex.c,v 1.9 1995/09/27 00:38:46 jtc Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)lex.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: lex.c,v 1.10 2003/04/15 01:17:33 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lex.c,v 1.11 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/csh/misc.c b/bin/csh/misc.c
index c5bb60565da..0323d83d8ab 100644
--- a/bin/csh/misc.c
+++ b/bin/csh/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.7 2002/02/19 19:39:35 millert Exp $ */
+/* $OpenBSD: misc.c,v 1.8 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: misc.c,v 1.6 1995/03/21 09:03:09 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: misc.c,v 1.7 2002/02/19 19:39:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: misc.c,v 1.8 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/csh/parse.c b/bin/csh/parse.c
index e73a134d160..58587a56c54 100644
--- a/bin/csh/parse.c
+++ b/bin/csh/parse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.c,v 1.6 2002/06/09 05:47:27 todd Exp $ */
+/* $OpenBSD: parse.c,v 1.7 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: parse.c,v 1.6 1995/03/21 09:03:10 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: parse.c,v 1.6 2002/06/09 05:47:27 todd Exp $";
+static char rcsid[] = "$OpenBSD: parse.c,v 1.7 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/csh/pathnames.h b/bin/csh/pathnames.h
index 2ce50d8e563..715aa85dabd 100644
--- a/bin/csh/pathnames.h
+++ b/bin/csh/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.2 1996/06/23 14:19:27 deraadt Exp $ */
+/* $OpenBSD: pathnames.h,v 1.3 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.6 1995/03/21 09:03:13 cgd Exp $ */
/*
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/csh/printf.c b/bin/csh/printf.c
index b87c375138d..f903c9e05a4 100644
--- a/bin/csh/printf.c
+++ b/bin/csh/printf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: printf.c,v 1.12 2003/05/14 20:47:32 jsyn Exp $ */
+/* $OpenBSD: printf.c,v 1.13 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: printf.c,v 1.6 1995/03/21 09:03:15 cgd Exp $ */
/*
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -46,7 +42,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)printf.c 8.1 (Berkeley) 7/20/93";
#else
-static char rcsid[] = "$OpenBSD: printf.c,v 1.12 2003/05/14 20:47:32 jsyn Exp $";
+static char rcsid[] = "$OpenBSD: printf.c,v 1.13 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/csh/proc.c b/bin/csh/proc.c
index 0342b70b25f..12a66a1073e 100644
--- a/bin/csh/proc.c
+++ b/bin/csh/proc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.c,v 1.17 2003/04/07 22:45:59 tedu Exp $ */
+/* $OpenBSD: proc.c,v 1.18 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: proc.c,v 1.9 1995/04/29 23:21:33 mycroft Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)proc.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: proc.c,v 1.17 2003/04/07 22:45:59 tedu Exp $";
+static char rcsid[] = "$OpenBSD: proc.c,v 1.18 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/csh/proc.h b/bin/csh/proc.h
index 7a9d3721164..511a3c73bc4 100644
--- a/bin/csh/proc.h
+++ b/bin/csh/proc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc.h,v 1.2 1996/06/23 14:19:29 deraadt Exp $ */
+/* $OpenBSD: proc.h,v 1.3 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: proc.h,v 1.7 1995/04/29 23:21:35 mycroft Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/csh/sem.c b/bin/csh/sem.c
index bbd00553d21..e53650b03eb 100644
--- a/bin/csh/sem.c
+++ b/bin/csh/sem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sem.c,v 1.13 2003/04/15 01:17:33 deraadt Exp $ */
+/* $OpenBSD: sem.c,v 1.14 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: sem.c,v 1.9 1995/09/27 00:38:50 jtc Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)sem.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: sem.c,v 1.13 2003/04/15 01:17:33 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: sem.c,v 1.14 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/csh/set.c b/bin/csh/set.c
index ad6864c79f9..a76a272c0eb 100644
--- a/bin/csh/set.c
+++ b/bin/csh/set.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: set.c,v 1.8 2003/01/08 06:54:16 deraadt Exp $ */
+/* $OpenBSD: set.c,v 1.9 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: set.c,v 1.8 1995/03/21 18:35:52 mycroft Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)set.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: set.c,v 1.8 2003/01/08 06:54:16 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: set.c,v 1.9 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/csh/str.c b/bin/csh/str.c
index d3f63ccfea2..45802a11c67 100644
--- a/bin/csh/str.c
+++ b/bin/csh/str.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: str.c,v 1.11 2003/05/12 20:54:49 jsyn Exp $ */
+/* $OpenBSD: str.c,v 1.12 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: str.c,v 1.6 1995/03/21 09:03:24 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)str.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: str.c,v 1.11 2003/05/12 20:54:49 jsyn Exp $";
+static char rcsid[] = "$OpenBSD: str.c,v 1.12 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/csh/time.c b/bin/csh/time.c
index e1071abff96..ec0765c254f 100644
--- a/bin/csh/time.c
+++ b/bin/csh/time.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: time.c,v 1.8 2002/02/19 19:39:35 millert Exp $ */
+/* $OpenBSD: time.c,v 1.9 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: time.c,v 1.7 1995/03/21 13:55:25 mycroft Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: time.c,v 1.8 2002/02/19 19:39:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: time.c,v 1.9 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/date/date.1 b/bin/date/date.1
index dc62b001de2..5f558e5905c 100644
--- a/bin/date/date.1
+++ b/bin/date/date.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: date.1,v 1.36 2003/05/29 12:24:19 jmc Exp $
+.\" $OpenBSD: date.1,v 1.37 2003/06/02 23:32:07 millert Exp $
.\" $NetBSD: date.1,v 1.12 1996/03/12 04:32:37 phil Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -15,11 +15,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/date/date.c b/bin/date/date.c
index 7c4a5c5f331..0ad378231b8 100644
--- a/bin/date/date.c
+++ b/bin/date/date.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: date.c,v 1.23 2002/07/04 04:26:39 deraadt Exp $ */
+/* $OpenBSD: date.c,v 1.24 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: date.c,v 1.11 1995/09/07 06:21:05 jtc Exp $ */
/*
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)date.c 8.2 (Berkeley) 4/28/95";
#else
-static char rcsid[] = "$OpenBSD: date.c,v 1.23 2002/07/04 04:26:39 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: date.c,v 1.24 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/date/extern.h b/bin/date/extern.h
index a2587249e22..460069121e3 100644
--- a/bin/date/extern.h
+++ b/bin/date/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.3 2002/02/16 21:27:06 millert Exp $ */
+/* $OpenBSD: extern.h,v 1.4 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: extern.h,v 1.3 1995/03/21 09:03:52 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/date/netdate.c b/bin/date/netdate.c
index 3e242428312..88d046fb72e 100644
--- a/bin/date/netdate.c
+++ b/bin/date/netdate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netdate.c,v 1.14 2002/07/04 04:26:39 deraadt Exp $ */
+/* $OpenBSD: netdate.c,v 1.15 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: netdate.c,v 1.10 1995/09/07 06:21:06 jtc Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)netdate.c 8.2 (Berkeley) 4/28/95";
#else
-static char rcsid[] = "$OpenBSD: netdate.c,v 1.14 2002/07/04 04:26:39 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: netdate.c,v 1.15 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/dd/args.c b/bin/dd/args.c
index 015f8187550..641348c361b 100644
--- a/bin/dd/args.c
+++ b/bin/dd/args.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: args.c,v 1.12 2002/02/16 21:27:06 millert Exp $ */
+/* $OpenBSD: args.c,v 1.13 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: args.c,v 1.7 1996/03/01 01:18:58 jtc Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -42,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)args.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: args.c,v 1.12 2002/02/16 21:27:06 millert Exp $";
+static char rcsid[] = "$OpenBSD: args.c,v 1.13 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/dd/conv.c b/bin/dd/conv.c
index d0ae1e860ad..9688d9b46c3 100644
--- a/bin/dd/conv.c
+++ b/bin/dd/conv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conv.c,v 1.8 2001/08/07 14:39:27 hugh Exp $ */
+/* $OpenBSD: conv.c,v 1.9 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: conv.c,v 1.6 1996/02/20 19:29:02 jtc Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -42,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)conv.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: conv.c,v 1.8 2001/08/07 14:39:27 hugh Exp $";
+static char rcsid[] = "$OpenBSD: conv.c,v 1.9 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/dd/conv_tab.c b/bin/dd/conv_tab.c
index e2c90720d08..05e5c0e7896 100644
--- a/bin/dd/conv_tab.c
+++ b/bin/dd/conv_tab.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conv_tab.c,v 1.3 1996/06/23 14:19:46 deraadt Exp $ */
+/* $OpenBSD: conv_tab.c,v 1.4 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: conv_tab.c,v 1.7 1996/02/20 19:29:03 jtc Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -42,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)conv_tab.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: conv_tab.c,v 1.3 1996/06/23 14:19:46 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: conv_tab.c,v 1.4 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/dd/dd.1 b/bin/dd/dd.1
index f7e466436e5..1dabeae892b 100644
--- a/bin/dd/dd.1
+++ b/bin/dd/dd.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: dd.1,v 1.13 2003/03/12 20:12:35 deraadt Exp $
+.\" $OpenBSD: dd.1,v 1.14 2003/06/02 23:32:07 millert Exp $
.\" $NetBSD: dd.1,v 1.5 1995/03/21 09:04:04 cgd Exp $
.\"
.\" Copyright (c) 1990, 1993
@@ -15,11 +15,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/dd/dd.c b/bin/dd/dd.c
index 54188437728..5d9afb3a993 100644
--- a/bin/dd/dd.c
+++ b/bin/dd/dd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dd.c,v 1.12 2002/02/16 21:27:06 millert Exp $ */
+/* $OpenBSD: dd.c,v 1.13 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: dd.c,v 1.6 1996/02/20 19:29:06 jtc Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -48,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)dd.c 8.5 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: dd.c,v 1.12 2002/02/16 21:27:06 millert Exp $";
+static char rcsid[] = "$OpenBSD: dd.c,v 1.13 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/dd/dd.h b/bin/dd/dd.h
index df82a5c17db..a74d5a6a6aa 100644
--- a/bin/dd/dd.h
+++ b/bin/dd/dd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dd.h,v 1.4 2001/08/07 14:39:27 hugh Exp $ */
+/* $OpenBSD: dd.h,v 1.5 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: dd.h,v 1.4 1995/03/21 09:04:08 cgd Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/dd/extern.h b/bin/dd/extern.h
index 6beb89ce3b9..fe173545894 100644
--- a/bin/dd/extern.h
+++ b/bin/dd/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.5 2002/02/16 21:27:06 millert Exp $ */
+/* $OpenBSD: extern.h,v 1.6 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: extern.h,v 1.7 1996/02/20 19:29:07 jtc Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/dd/misc.c b/bin/dd/misc.c
index 9f321ec76fa..bd648d83c05 100644
--- a/bin/dd/misc.c
+++ b/bin/dd/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.11 2002/05/29 02:09:39 hugh Exp $ */
+/* $OpenBSD: misc.c,v 1.12 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: misc.c,v 1.4 1995/03/21 09:04:10 cgd Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -42,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: misc.c,v 1.11 2002/05/29 02:09:39 hugh Exp $";
+static char rcsid[] = "$OpenBSD: misc.c,v 1.12 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/dd/position.c b/bin/dd/position.c
index 26e52f328fc..715f0444b29 100644
--- a/bin/dd/position.c
+++ b/bin/dd/position.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: position.c,v 1.5 2002/10/28 18:06:39 millert Exp $ */
+/* $OpenBSD: position.c,v 1.6 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: position.c,v 1.4 1995/03/21 09:04:12 cgd Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -42,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)position.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: position.c,v 1.5 2002/10/28 18:06:39 millert Exp $";
+static char rcsid[] = "$OpenBSD: position.c,v 1.6 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/df/df.1 b/bin/df/df.1
index d33d3ef4d9b..2531ed03e93 100644
--- a/bin/df/df.1
+++ b/bin/df/df.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: df.1,v 1.30 2003/05/29 12:58:53 jmc Exp $
+.\" $OpenBSD: df.1,v 1.31 2003/06/02 23:32:07 millert Exp $
.\" $NetBSD: df.1,v 1.12 1995/12/05 02:42:45 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -12,11 +12,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/df/df.c b/bin/df/df.c
index 7971348c80d..1927e7c2163 100644
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: df.c,v 1.34 2003/05/26 18:02:32 ian Exp $ */
+/* $OpenBSD: df.c,v 1.35 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: df.c,v 1.21.2.1 1995/11/01 00:06:11 jtc Exp $ */
/*
@@ -18,11 +18,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -49,7 +45,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)df.c 8.7 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: df.c,v 1.34 2003/05/26 18:02:32 ian Exp $";
+static char rcsid[] = "$OpenBSD: df.c,v 1.35 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/df/ext2fs_df.c b/bin/df/ext2fs_df.c
index 38423d2e818..e3e014e7c73 100644
--- a/bin/df/ext2fs_df.c
+++ b/bin/df/ext2fs_df.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_df.c,v 1.9 2002/07/04 04:26:39 deraadt Exp $ */
+/* $OpenBSD: ext2fs_df.c,v 1.10 2003/06/02 23:32:07 millert Exp $ */
/*
* This file is substantially derived from src/sys/ufs/ext2fs/ext2fs_vfsops.c:e2fs_statfs().
@@ -19,11 +19,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/df/ffs_df.c b/bin/df/ffs_df.c
index 4fd3e26cb15..fe24ab30969 100644
--- a/bin/df/ffs_df.c
+++ b/bin/df/ffs_df.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_df.c,v 1.8 2002/07/04 04:26:39 deraadt Exp $ */
+/* $OpenBSD: ffs_df.c,v 1.9 2003/06/02 23:32:07 millert Exp $ */
/*
* Copyright (c) 1980, 1990, 1993, 1994
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/df/lfs_df.c b/bin/df/lfs_df.c
index b57674acacf..8a050a52aee 100644
--- a/bin/df/lfs_df.c
+++ b/bin/df/lfs_df.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lfs_df.c,v 1.8 2002/07/04 04:26:39 deraadt Exp $ */
+/* $OpenBSD: lfs_df.c,v 1.9 2003/06/02 23:32:07 millert Exp $ */
/*
* This file is substantially duplicated from src/sys/ufs/lfs/lfs_vfsops.c:lfs_statfs().
@@ -16,11 +16,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/domainname/domainname.1 b/bin/domainname/domainname.1
index 397a85ab464..901611b9d63 100644
--- a/bin/domainname/domainname.1
+++ b/bin/domainname/domainname.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: domainname.1,v 1.13 2002/05/16 13:21:52 miod Exp $
+.\" $OpenBSD: domainname.1,v 1.14 2003/06/02 23:32:07 millert Exp $
.\" $NetBSD: domainname.1,v 1.7 1995/07/25 19:36:57 jtc Exp $
.\"
.\" Copyright (c) 1983, 1988, 1990, 1993
@@ -12,11 +12,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c
index d6330d4de24..e295bdeb2b1 100644
--- a/bin/domainname/domainname.c
+++ b/bin/domainname/domainname.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: domainname.c,v 1.6 2002/07/04 04:26:39 deraadt Exp $ */
+/* $OpenBSD: domainname.c,v 1.7 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: domainname.c,v 1.7 1995/03/21 09:04:22 cgd Exp $ */
/*
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)hostname.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: domainname.c,v 1.6 2002/07/04 04:26:39 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: domainname.c,v 1.7 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/echo/echo.1 b/bin/echo/echo.1
index 630d4db6039..838c99994b1 100644
--- a/bin/echo/echo.1
+++ b/bin/echo/echo.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: echo.1,v 1.12 2003/05/29 13:04:26 jmc Exp $
+.\" $OpenBSD: echo.1,v 1.13 2003/06/02 23:32:07 millert Exp $
.\" $NetBSD: echo.1,v 1.7 1995/03/21 09:04:26 cgd Exp $
.\"
.\" Copyright (c) 1990, 1993
@@ -15,11 +15,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/echo/echo.c b/bin/echo/echo.c
index f86e0f41bfd..b1633198ba8 100644
--- a/bin/echo/echo.c
+++ b/bin/echo/echo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: echo.c,v 1.5 2002/07/04 04:26:39 deraadt Exp $ */
+/* $OpenBSD: echo.c,v 1.6 2003/06/02 23:32:07 millert Exp $ */
/* $NetBSD: echo.c,v 1.6 1995/03/21 09:04:27 cgd Exp $ */
/*
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)echo.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: echo.c,v 1.5 2002/07/04 04:26:39 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: echo.c,v 1.6 2003/06/02 23:32:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c
index 61f827c0e22..9cec7f44bac 100644
--- a/bin/ed/cbc.c
+++ b/bin/ed/cbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cbc.c,v 1.9 2003/02/18 13:14:43 jmc Exp $ */
+/* $OpenBSD: cbc.c,v 1.10 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: cbc.c,v 1.9 1995/03/21 09:04:36 cgd Exp $ */
/* cbc.c: This file contains the encryption routines for the ed line editor */
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -44,7 +40,7 @@
#if 0
static char *rcsid = "@(#)cbc.c,v 1.2 1994/02/01 00:34:36 alm Exp";
#else
-static char rcsid[] = "$OpenBSD: cbc.c,v 1.9 2003/02/18 13:14:43 jmc Exp $";
+static char rcsid[] = "$OpenBSD: cbc.c,v 1.10 2003/06/02 23:32:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/hostname/hostname.1 b/bin/hostname/hostname.1
index 44e7817f494..33f9c30b1ab 100644
--- a/bin/hostname/hostname.1
+++ b/bin/hostname/hostname.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: hostname.1,v 1.15 2002/06/11 03:56:20 matthieu Exp $
+.\" $OpenBSD: hostname.1,v 1.16 2003/06/02 23:32:08 millert Exp $
.\" $NetBSD: hostname.1,v 1.11 1995/09/07 06:28:39 jtc Exp $
.\"
.\" Copyright (c) 1983, 1988, 1990, 1993
@@ -12,11 +12,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c
index 98dae83b58b..4f1a2581d1a 100644
--- a/bin/hostname/hostname.c
+++ b/bin/hostname/hostname.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hostname.c,v 1.6 2002/07/04 04:26:40 deraadt Exp $ */
+/* $OpenBSD: hostname.c,v 1.7 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: hostname.c,v 1.10 1995/09/07 06:28:40 jtc Exp $ */
/*
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)hostname.c 8.2 (Berkeley) 4/28/95";
#else
-static char rcsid[] = "$OpenBSD: hostname.c,v 1.6 2002/07/04 04:26:40 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: hostname.c,v 1.7 2003/06/02 23:32:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/kill/kill.1 b/bin/kill/kill.1
index 14fabbda348..89d4657e799 100644
--- a/bin/kill/kill.1
+++ b/bin/kill/kill.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: kill.1,v 1.22 2003/03/12 20:12:35 deraadt Exp $
+.\" $OpenBSD: kill.1,v 1.23 2003/06/02 23:32:08 millert Exp $
.\" $NetBSD: kill.1,v 1.8 1995/09/07 06:30:26 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -15,11 +15,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/kill/kill.c b/bin/kill/kill.c
index f6f758d8609..a8df4a9ccb3 100644
--- a/bin/kill/kill.c
+++ b/bin/kill/kill.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kill.c,v 1.6 2002/07/04 04:26:40 deraadt Exp $ */
+/* $OpenBSD: kill.c,v 1.7 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: kill.c,v 1.11 1995/09/07 06:30:27 jtc Exp $ */
/*
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)kill.c 8.4 (Berkeley) 4/28/95";
#else
-static char rcsid[] = "$OpenBSD: kill.c,v 1.6 2002/07/04 04:26:40 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: kill.c,v 1.7 2003/06/02 23:32:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/ksh/ksh.1 b/bin/ksh/ksh.1
index 124e76c476a..6f7200cf3e1 100644
--- a/bin/ksh/ksh.1
+++ b/bin/ksh/ksh.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ksh.1,v 1.51 2003/04/28 06:27:36 jmc Exp $
+.\" $OpenBSD: ksh.1,v 1.52 2003/06/02 23:32:08 millert Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/ksh/ksh.1tbl b/bin/ksh/ksh.1tbl
index 6f676a717c8..d2d624680b2 100644
--- a/bin/ksh/ksh.1tbl
+++ b/bin/ksh/ksh.1tbl
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ksh.1tbl,v 1.51 2003/04/28 06:27:36 jmc Exp $
+.\" $OpenBSD: ksh.1tbl,v 1.52 2003/06/02 23:32:08 millert Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/ksh/sh.1 b/bin/ksh/sh.1
index 182351af8f5..7bf8d778309 100644
--- a/bin/ksh/sh.1
+++ b/bin/ksh/sh.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sh.1,v 1.32 2003/04/28 06:27:36 jmc Exp $
+.\" $OpenBSD: sh.1,v 1.33 2003/06/02 23:32:08 millert Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/ksh/sh.1tbl b/bin/ksh/sh.1tbl
index 6dee905551b..9215ec72cf1 100644
--- a/bin/ksh/sh.1tbl
+++ b/bin/ksh/sh.1tbl
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sh.1tbl,v 1.32 2003/04/28 06:27:36 jmc Exp $
+.\" $OpenBSD: sh.1tbl,v 1.33 2003/06/02 23:32:08 millert Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/ln/ln.1 b/bin/ln/ln.1
index 764acc628e2..8cc18115ac3 100644
--- a/bin/ln/ln.1
+++ b/bin/ln/ln.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ln.1,v 1.19 2003/03/12 20:12:35 deraadt Exp $
+.\" $OpenBSD: ln.1,v 1.20 2003/06/02 23:32:08 millert Exp $
.\" $NetBSD: ln.1,v 1.10 1995/07/25 19:37:04 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -15,11 +15,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/ln/ln.c b/bin/ln/ln.c
index 98a384cf1ec..71ff79ae7c0 100644
--- a/bin/ln/ln.c
+++ b/bin/ln/ln.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ln.c,v 1.9 2003/05/04 12:44:17 nino Exp $ */
+/* $OpenBSD: ln.c,v 1.10 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: ln.c,v 1.10 1995/03/21 09:06:10 cgd Exp $ */
/*
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -44,7 +40,7 @@ static const char copyright[] =
#if 0
static const char sccsid[] = "@(#)ln.c 8.2 (Berkeley) 3/31/94";
#else
-static const char rcsid[] = "$OpenBSD: ln.c,v 1.9 2003/05/04 12:44:17 nino Exp $";
+static const char rcsid[] = "$OpenBSD: ln.c,v 1.10 2003/06/02 23:32:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/ln/symlink.7 b/bin/ln/symlink.7
index d6e5dc3d15f..d7318bad5d4 100644
--- a/bin/ln/symlink.7
+++ b/bin/ln/symlink.7
@@ -1,4 +1,4 @@
-.\" $OpenBSD: symlink.7,v 1.15 2003/04/13 11:09:56 jmc Exp $
+.\" $OpenBSD: symlink.7,v 1.16 2003/06/02 23:32:08 millert Exp $
.\" $NetBSD: symlink.7,v 1.4 1996/04/25 15:44:56 mycroft Exp $
.\"
.\" Copyright (c) 1992, 1993, 1994
@@ -12,11 +12,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/ls/cmp.c b/bin/ls/cmp.c
index 2b62e7ecc4a..128d383a6e4 100644
--- a/bin/ls/cmp.c
+++ b/bin/ls/cmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmp.c,v 1.3 1997/01/03 22:36:07 millert Exp $ */
+/* $OpenBSD: cmp.c,v 1.4 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: cmp.c,v 1.10 1996/07/08 10:32:01 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)cmp.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: cmp.c,v 1.3 1997/01/03 22:36:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: cmp.c,v 1.4 2003/06/02 23:32:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/ls/extern.h b/bin/ls/extern.h
index cbde87f1ba2..7f7807a612f 100644
--- a/bin/ls/extern.h
+++ b/bin/ls/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.8 2002/02/16 21:27:07 millert Exp $ */
+/* $OpenBSD: extern.h,v 1.9 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: extern.h,v 1.5 1995/03/21 09:06:24 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index 51d11f70205..5456626b6ca 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ls.1,v 1.35 2003/05/29 19:36:58 jmc Exp $
+.\" $OpenBSD: ls.1,v 1.36 2003/06/02 23:32:08 millert Exp $
.\" $NetBSD: ls.1,v 1.14 1995/12/05 02:44:01 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1991, 1993, 1994
@@ -15,11 +15,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/ls/ls.c b/bin/ls/ls.c
index 679de192176..17eb81dec44 100644
--- a/bin/ls/ls.c
+++ b/bin/ls/ls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ls.c,v 1.18 2003/04/02 19:43:52 deraadt Exp $ */
+/* $OpenBSD: ls.c,v 1.19 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: ls.c,v 1.18 1996/07/09 09:16:29 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -47,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)ls.c 8.7 (Berkeley) 8/5/94";
#else
-static char rcsid[] = "$OpenBSD: ls.c,v 1.18 2003/04/02 19:43:52 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ls.c,v 1.19 2003/06/02 23:32:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/ls/ls.h b/bin/ls/ls.h
index 3818cdd1221..b1b7053b5aa 100644
--- a/bin/ls/ls.h
+++ b/bin/ls/ls.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ls.h,v 1.4 1999/05/01 23:54:47 deraadt Exp $ */
+/* $OpenBSD: ls.h,v 1.5 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: ls.h,v 1.7 1995/03/21 09:06:33 cgd Exp $ */
/*
@@ -16,11 +16,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/ls/print.c b/bin/ls/print.c
index ad6b3a9d31f..5736dd541b2 100644
--- a/bin/ls/print.c
+++ b/bin/ls/print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print.c,v 1.17 2002/08/01 21:49:57 deraadt Exp $ */
+/* $OpenBSD: print.c,v 1.18 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: print.c,v 1.15 1996/12/11 03:25:39 thorpej Exp $ */
/*
@@ -16,11 +16,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)print.c 8.5 (Berkeley) 7/28/94";
#else
-static char rcsid[] = "$OpenBSD: print.c,v 1.17 2002/08/01 21:49:57 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: print.c,v 1.18 2003/06/02 23:32:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/ls/util.c b/bin/ls/util.c
index 33c7ef15d3d..298a194cc83 100644
--- a/bin/ls/util.c
+++ b/bin/ls/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.c,v 1.7 2001/09/06 13:29:08 mpech Exp $ */
+/* $OpenBSD: util.c,v 1.8 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: util.c,v 1.12 1995/09/07 06:43:02 jtc Exp $ */
/*
@@ -16,11 +16,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)util.c 8.5 (Berkeley) 4/28/95";
#else
-static char rcsid[] = "$OpenBSD: util.c,v 1.7 2001/09/06 13:29:08 mpech Exp $";
+static char rcsid[] = "$OpenBSD: util.c,v 1.8 2003/06/02 23:32:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/mkdir/mkdir.1 b/bin/mkdir/mkdir.1
index 0484232c0d3..b90104dc04e 100644
--- a/bin/mkdir/mkdir.1
+++ b/bin/mkdir/mkdir.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mkdir.1,v 1.17 2003/03/12 20:12:35 deraadt Exp $
+.\" $OpenBSD: mkdir.1,v 1.18 2003/06/02 23:32:08 millert Exp $
.\" $NetBSD: mkdir.1,v 1.9 1995/07/25 19:37:13 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -15,11 +15,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c
index ec3106e206f..bdab5551512 100644
--- a/bin/mkdir/mkdir.c
+++ b/bin/mkdir/mkdir.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkdir.c,v 1.14 2002/07/04 04:26:40 deraadt Exp $ */
+/* $OpenBSD: mkdir.c,v 1.15 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: mkdir.c,v 1.14 1995/06/25 21:59:21 mycroft Exp $ */
/*
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)mkdir.c 8.2 (Berkeley) 1/25/94";
#else
-static char rcsid[] = "$OpenBSD: mkdir.c,v 1.14 2002/07/04 04:26:40 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mkdir.c,v 1.15 2003/06/02 23:32:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/mt/mt.1 b/bin/mt/mt.1
index 42b1bb8fc63..c558ce8c1c7 100644
--- a/bin/mt/mt.1
+++ b/bin/mt/mt.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mt.1,v 1.18 2003/03/14 15:00:56 jmc Exp $
+.\" $OpenBSD: mt.1,v 1.19 2003/06/02 23:32:08 millert Exp $
.\" $NetBSD: mt.1,v 1.8 1996/05/21 10:23:55 mrg Exp $
.\"
.\" Copyright (c) 1981, 1990, 1993
@@ -12,11 +12,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/mt/mt.c b/bin/mt/mt.c
index 179d6fbd622..61b59937089 100644
--- a/bin/mt/mt.c
+++ b/bin/mt/mt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mt.c,v 1.22 2003/03/14 15:00:56 jmc Exp $ */
+/* $OpenBSD: mt.c,v 1.23 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: mt.c,v 1.14.2.1 1996/05/27 15:12:11 mrg Exp $ */
/*
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)mt.c 8.2 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: mt.c,v 1.22 2003/03/14 15:00:56 jmc Exp $";
+static char rcsid[] = "$OpenBSD: mt.c,v 1.23 2003/06/02 23:32:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/mt/mt.h b/bin/mt/mt.h
index 2c6f0771bee..da24d3d4923 100644
--- a/bin/mt/mt.h
+++ b/bin/mt/mt.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mt.h,v 1.2 2002/02/16 21:27:07 millert Exp $ */
+/* $OpenBSD: mt.h,v 1.3 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: mt.h,v 1.1 1996/03/05 20:39:36 scottr Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/mt/mtrmt.c b/bin/mt/mtrmt.c
index 5dab9ea2884..c99336f4711 100644
--- a/bin/mt/mtrmt.c
+++ b/bin/mt/mtrmt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mtrmt.c,v 1.12 2002/05/27 20:28:31 deraadt Exp $ */
+/* $OpenBSD: mtrmt.c,v 1.13 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: mtrmt.c,v 1.2 1996/03/06 06:22:07 scottr Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/mt/pathnames.h b/bin/mt/pathnames.h
index 9673d321e53..733ed70b211 100644
--- a/bin/mt/pathnames.h
+++ b/bin/mt/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.1 1996/03/08 23:34:22 niklas Exp $ */
+/* $OpenBSD: pathnames.h,v 1.2 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.1 1996/03/05 20:39:40 scottr Exp $ */
/*
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/mv/mv.1 b/bin/mv/mv.1
index f3448af7520..8eac29bca1d 100644
--- a/bin/mv/mv.1
+++ b/bin/mv/mv.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mv.1,v 1.17 2003/03/12 20:12:35 deraadt Exp $
+.\" $OpenBSD: mv.1,v 1.18 2003/06/02 23:32:08 millert Exp $
.\" $NetBSD: mv.1,v 1.8 1995/03/21 09:06:51 cgd Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -15,11 +15,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index a46cbe0fd2c..33edd4a272d 100644
--- a/bin/mv/mv.c
+++ b/bin/mv/mv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mv.c,v 1.27 2003/03/21 15:49:39 millert Exp $ */
+/* $OpenBSD: mv.c,v 1.28 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: mv.c,v 1.9 1995/03/21 09:06:52 cgd Exp $ */
/*
@@ -16,11 +16,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -47,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)mv.c 8.2 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: mv.c,v 1.27 2003/03/21 15:49:39 millert Exp $";
+static char rcsid[] = "$OpenBSD: mv.c,v 1.28 2003/06/02 23:32:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/mv/pathnames.h b/bin/mv/pathnames.h
index 79ee253a501..3931d230855 100644
--- a/bin/mv/pathnames.h
+++ b/bin/mv/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.2 1996/06/23 14:20:26 deraadt Exp $ */
+/* $OpenBSD: pathnames.h,v 1.3 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.6 1995/03/21 09:06:55 cgd Exp $ */
/*
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index c44cbafb0c6..6a84dbbca20 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar_io.c,v 1.32 2003/02/03 09:06:42 jmc Exp $ */
+/* $OpenBSD: ar_io.c,v 1.33 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: ar_io.c,v 1.5 1996/03/26 23:54:13 mrg Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -42,7 +38,7 @@
#if 0
static const char sccsid[] = "@(#)ar_io.c 8.2 (Berkeley) 4/18/94";
#else
-static const char rcsid[] = "$OpenBSD: ar_io.c,v 1.32 2003/02/03 09:06:42 jmc Exp $";
+static const char rcsid[] = "$OpenBSD: ar_io.c,v 1.33 2003/06/02 23:32:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
index f152ac06eeb..74955f81c8b 100644
--- a/bin/pax/ar_subs.c
+++ b/bin/pax/ar_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar_subs.c,v 1.23 2003/02/03 09:06:43 jmc Exp $ */
+/* $OpenBSD: ar_subs.c,v 1.24 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: ar_subs.c,v 1.5 1995/03/21 09:07:06 cgd Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -42,7 +38,7 @@
#if 0
static const char sccsid[] = "@(#)ar_subs.c 8.2 (Berkeley) 4/18/94";
#else
-static const char rcsid[] = "$OpenBSD: ar_subs.c,v 1.23 2003/02/03 09:06:43 jmc Exp $";
+static const char rcsid[] = "$OpenBSD: ar_subs.c,v 1.24 2003/06/02 23:32:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index 99256d74f7f..8d7edb9db96 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buf_subs.c,v 1.16 2003/02/03 09:06:43 jmc Exp $ */
+/* $OpenBSD: buf_subs.c,v 1.17 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: buf_subs.c,v 1.5 1995/03/21 09:07:08 cgd Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -42,7 +38,7 @@
#if 0
static const char sccsid[] = "@(#)buf_subs.c 8.2 (Berkeley) 4/18/94";
#else
-static const char rcsid[] = "$OpenBSD: buf_subs.c,v 1.16 2003/02/03 09:06:43 jmc Exp $";
+static const char rcsid[] = "$OpenBSD: buf_subs.c,v 1.17 2003/06/02 23:32:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/pax/cache.c b/bin/pax/cache.c
index 258bcfd0631..8dc53df6e7c 100644
--- a/bin/pax/cache.c
+++ b/bin/pax/cache.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cache.c,v 1.13 2003/03/10 03:50:13 david Exp $ */
+/* $OpenBSD: cache.c,v 1.14 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: cache.c,v 1.4 1995/03/21 09:07:10 cgd Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -42,7 +38,7 @@
#if 0
static const char sccsid[] = "@(#)cache.c 8.1 (Berkeley) 5/31/93";
#else
-static const char rcsid[] = "$OpenBSD: cache.c,v 1.13 2003/03/10 03:50:13 david Exp $";
+static const char rcsid[] = "$OpenBSD: cache.c,v 1.14 2003/06/02 23:32:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/pax/cache.h b/bin/pax/cache.h
index 01283ef9e59..a5b1314bbdc 100644
--- a/bin/pax/cache.h
+++ b/bin/pax/cache.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cache.h,v 1.2 1996/06/23 14:20:31 deraadt Exp $ */
+/* $OpenBSD: cache.h,v 1.3 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: cache.h,v 1.3 1995/03/21 09:07:12 cgd Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c
index 88fb8fbbb7a..f5cdf759dd2 100644
--- a/bin/pax/cpio.c
+++ b/bin/pax/cpio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpio.c,v 1.14 2003/02/03 09:06:43 jmc Exp $ */
+/* $OpenBSD: cpio.c,v 1.15 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: cpio.c,v 1.5 1995/03/21 09:07:13 cgd Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -42,7 +38,7 @@
#if 0
static const char sccsid[] = "@(#)cpio.c 8.1 (Berkeley) 5/31/93";
#else
-static const char rcsid[] = "$OpenBSD: cpio.c,v 1.14 2003/02/03 09:06:43 jmc Exp $";
+static const char rcsid[] = "$OpenBSD: cpio.c,v 1.15 2003/06/02 23:32:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/pax/cpio.h b/bin/pax/cpio.h
index 3c7b76cc61b..dfbd03f21e3 100644
--- a/bin/pax/cpio.h
+++ b/bin/pax/cpio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpio.h,v 1.3 2001/05/16 03:04:56 mickey Exp $ */
+/* $OpenBSD: cpio.h,v 1.4 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: cpio.h,v 1.3 1995/03/21 09:07:15 cgd Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/pax/extern.h b/bin/pax/extern.h
index cc677925812..54d1250f2aa 100644
--- a/bin/pax/extern.h
+++ b/bin/pax/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.24 2002/10/18 15:38:11 millert Exp $ */
+/* $OpenBSD: extern.h,v 1.25 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: extern.h,v 1.5 1996/03/26 23:54:16 mrg Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c
index cee93e1d0aa..113e928efcd 100644
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: file_subs.c,v 1.22 2003/02/03 09:06:43 jmc Exp $ */
+/* $OpenBSD: file_subs.c,v 1.23 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: file_subs.c,v 1.4 1995/03/21 09:07:18 cgd Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -42,7 +38,7 @@
#if 0
static const char sccsid[] = "@(#)file_subs.c 8.1 (Berkeley) 5/31/93";
#else
-static const char rcsid[] = "$OpenBSD: file_subs.c,v 1.22 2003/02/03 09:06:43 jmc Exp $";
+static const char rcsid[] = "$OpenBSD: file_subs.c,v 1.23 2003/06/02 23:32:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/pax/ftree.c b/bin/pax/ftree.c
index eb76057571c..63d4e854763 100644
--- a/bin/pax/ftree.c
+++ b/bin/pax/ftree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ftree.c,v 1.21 2002/10/16 19:20:02 millert Exp $ */
+/* $OpenBSD: ftree.c,v 1.22 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: ftree.c,v 1.4 1995/03/21 09:07:21 cgd Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -42,7 +38,7 @@
#if 0
static const char sccsid[] = "@(#)ftree.c 8.2 (Berkeley) 4/18/94";
#else
-static const char rcsid[] = "$OpenBSD: ftree.c,v 1.21 2002/10/16 19:20:02 millert Exp $";
+static const char rcsid[] = "$OpenBSD: ftree.c,v 1.22 2003/06/02 23:32:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/pax/ftree.h b/bin/pax/ftree.h
index 5ac8ff9b9b4..0507aab1873 100644
--- a/bin/pax/ftree.h
+++ b/bin/pax/ftree.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ftree.h,v 1.3 1996/10/27 06:45:11 downsj Exp $ */
+/* $OpenBSD: ftree.h,v 1.4 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: ftree.h,v 1.3 1995/03/21 09:07:23 cgd Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
index c37cc63e893..6d2f47ce1f0 100644
--- a/bin/pax/gen_subs.c
+++ b/bin/pax/gen_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gen_subs.c,v 1.15 2002/10/16 19:20:02 millert Exp $ */
+/* $OpenBSD: gen_subs.c,v 1.16 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: gen_subs.c,v 1.5 1995/03/21 09:07:26 cgd Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -42,7 +38,7 @@
#if 0
static const char sccsid[] = "@(#)gen_subs.c 8.1 (Berkeley) 5/31/93";
#else
-static const char rcsid[] = "$OpenBSD: gen_subs.c,v 1.15 2002/10/16 19:20:02 millert Exp $";
+static const char rcsid[] = "$OpenBSD: gen_subs.c,v 1.16 2003/06/02 23:32:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/pax/options.c b/bin/pax/options.c
index d1298a7e2fd..2c7b636608e 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options.c,v 1.56 2003/02/03 09:06:43 jmc Exp $ */
+/* $OpenBSD: options.c,v 1.57 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: options.c,v 1.6 1996/03/26 23:54:18 mrg Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -42,7 +38,7 @@
#if 0
static const char sccsid[] = "@(#)options.c 8.2 (Berkeley) 4/18/94";
#else
-static const char rcsid[] = "$OpenBSD: options.c,v 1.56 2003/02/03 09:06:43 jmc Exp $";
+static const char rcsid[] = "$OpenBSD: options.c,v 1.57 2003/06/02 23:32:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/pax/options.h b/bin/pax/options.h
index d45f54afb87..6d932afa6bf 100644
--- a/bin/pax/options.h
+++ b/bin/pax/options.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: options.h,v 1.2 1996/06/23 14:20:37 deraadt Exp $ */
+/* $OpenBSD: options.h,v 1.3 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: options.h,v 1.3 1995/03/21 09:07:32 cgd Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c
index dd8ed24a614..044e796688a 100644
--- a/bin/pax/pat_rep.c
+++ b/bin/pax/pat_rep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pat_rep.c,v 1.24 2003/02/03 09:06:43 jmc Exp $ */
+/* $OpenBSD: pat_rep.c,v 1.25 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: pat_rep.c,v 1.4 1995/03/21 09:07:33 cgd Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -42,7 +38,7 @@
#if 0
static const char sccsid[] = "@(#)pat_rep.c 8.2 (Berkeley) 4/18/94";
#else
-static const char rcsid[] = "$OpenBSD: pat_rep.c,v 1.24 2003/02/03 09:06:43 jmc Exp $";
+static const char rcsid[] = "$OpenBSD: pat_rep.c,v 1.25 2003/06/02 23:32:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/pax/pat_rep.h b/bin/pax/pat_rep.h
index 9b97d41f8b9..adef65f2c03 100644
--- a/bin/pax/pat_rep.h
+++ b/bin/pax/pat_rep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pat_rep.h,v 1.3 2001/05/26 00:32:21 millert Exp $ */
+/* $OpenBSD: pat_rep.h,v 1.4 2003/06/02 23:32:08 millert Exp $ */
/* $NetBSD: pat_rep.h,v 1.3 1995/03/21 09:07:35 cgd Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index c71d18534bb..da840c9f295 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pax.1,v 1.38 2003/05/29 20:32:13 jmc Exp $
+.\" $OpenBSD: pax.1,v 1.39 2003/06/02 23:32:08 millert Exp $
.\" $NetBSD: pax.1,v 1.3 1995/03/21 09:07:37 cgd Exp $
.\"
.\" Copyright (c) 1992 Keith Muller.
@@ -16,11 +16,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/pax/pax.c b/bin/pax/pax.c
index d1a36914926..4629622bb2c 100644
--- a/bin/pax/pax.c
+++ b/bin/pax/pax.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pax.c,v 1.22 2002/10/16 19:20:02 millert Exp $ */
+/* $OpenBSD: pax.c,v 1.23 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: pax.c,v 1.5 1996/03/26 23:54:20 mrg Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -48,7 +44,7 @@ static const char copyright[] =
#if 0
static const char sccsid[] = "@(#)pax.c 8.2 (Berkeley) 4/18/94";
#else
-static const char rcsid[] = "$OpenBSD: pax.c,v 1.22 2002/10/16 19:20:02 millert Exp $";
+static const char rcsid[] = "$OpenBSD: pax.c,v 1.23 2003/06/02 23:32:09 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/pax/pax.h b/bin/pax/pax.h
index 9516c5d13f3..7b791e13e54 100644
--- a/bin/pax/pax.h
+++ b/bin/pax/pax.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pax.h,v 1.13 2002/10/18 15:38:11 millert Exp $ */
+/* $OpenBSD: pax.h,v 1.14 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: pax.h,v 1.3 1995/03/21 09:07:41 cgd Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
index 1669d2ee37c..4b3942bfb2e 100644
--- a/bin/pax/sel_subs.c
+++ b/bin/pax/sel_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sel_subs.c,v 1.15 2002/10/16 19:20:02 millert Exp $ */
+/* $OpenBSD: sel_subs.c,v 1.16 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: sel_subs.c,v 1.5 1995/03/21 09:07:42 cgd Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -42,7 +38,7 @@
#if 0
static const char sccsid[] = "@(#)sel_subs.c 8.1 (Berkeley) 5/31/93";
#else
-static const char rcsid[] = "$OpenBSD: sel_subs.c,v 1.15 2002/10/16 19:20:02 millert Exp $";
+static const char rcsid[] = "$OpenBSD: sel_subs.c,v 1.16 2003/06/02 23:32:09 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/pax/sel_subs.h b/bin/pax/sel_subs.h
index 4caaefd6d7e..b699ee83ef3 100644
--- a/bin/pax/sel_subs.h
+++ b/bin/pax/sel_subs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sel_subs.h,v 1.3 2002/10/16 15:56:42 millert Exp $ */
+/* $OpenBSD: sel_subs.h,v 1.4 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: sel_subs.h,v 1.3 1995/03/21 09:07:44 cgd Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index 6e6b02c3951..7432cb1bbf1 100644
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tables.c,v 1.19 2003/02/03 09:06:43 jmc Exp $ */
+/* $OpenBSD: tables.c,v 1.20 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: tables.c,v 1.4 1995/03/21 09:07:45 cgd Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -42,7 +38,7 @@
#if 0
static const char sccsid[] = "@(#)tables.c 8.1 (Berkeley) 5/31/93";
#else
-static const char rcsid[] = "$OpenBSD: tables.c,v 1.19 2003/02/03 09:06:43 jmc Exp $";
+static const char rcsid[] = "$OpenBSD: tables.c,v 1.20 2003/06/02 23:32:09 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/pax/tables.h b/bin/pax/tables.h
index be37f3172ea..5ba81dec13d 100644
--- a/bin/pax/tables.h
+++ b/bin/pax/tables.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tables.h,v 1.4 2002/10/16 18:40:30 millert Exp $ */
+/* $OpenBSD: tables.h,v 1.5 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: tables.h,v 1.3 1995/03/21 09:07:47 cgd Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/pax/tar.c b/bin/pax/tar.c
index 550bb08df5c..8acaa4c73dc 100644
--- a/bin/pax/tar.c
+++ b/bin/pax/tar.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tar.c,v 1.29 2002/10/18 15:38:11 millert Exp $ */
+/* $OpenBSD: tar.c,v 1.30 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: tar.c,v 1.5 1995/03/21 09:07:49 cgd Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -42,7 +38,7 @@
#if 0
static const char sccsid[] = "@(#)tar.c 8.2 (Berkeley) 4/18/94";
#else
-static const char rcsid[] = "$OpenBSD: tar.c,v 1.29 2002/10/18 15:38:11 millert Exp $";
+static const char rcsid[] = "$OpenBSD: tar.c,v 1.30 2003/06/02 23:32:09 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/pax/tar.h b/bin/pax/tar.h
index 45952b8af56..506ce5818c4 100644
--- a/bin/pax/tar.h
+++ b/bin/pax/tar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tar.h,v 1.6 2002/10/18 15:38:11 millert Exp $ */
+/* $OpenBSD: tar.h,v 1.7 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: tar.h,v 1.3 1995/03/21 09:07:51 cgd Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/pax/tty_subs.c b/bin/pax/tty_subs.c
index 7f59ad3bb34..a7ba68afa65 100644
--- a/bin/pax/tty_subs.c
+++ b/bin/pax/tty_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty_subs.c,v 1.11 2003/03/04 20:27:58 deraadt Exp $ */
+/* $OpenBSD: tty_subs.c,v 1.12 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: tty_subs.c,v 1.5 1995/03/21 09:07:52 cgd Exp $ */
/*-
@@ -17,11 +17,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -42,7 +38,7 @@
#if 0
static const char sccsid[] = "@(#)tty_subs.c 8.2 (Berkeley) 4/18/94";
#else
-static const char rcsid[] = "$OpenBSD: tty_subs.c,v 1.11 2003/03/04 20:27:58 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: tty_subs.c,v 1.12 2003/06/02 23:32:09 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/ps/extern.h b/bin/ps/extern.h
index 912f5cd5852..e906cf41662 100644
--- a/bin/ps/extern.h
+++ b/bin/ps/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.8 2002/12/19 21:29:46 mickey Exp $ */
+/* $OpenBSD: extern.h,v 1.9 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: extern.h,v 1.10 1995/05/21 13:38:27 mycroft Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index c985b569429..5f4e1879a9e 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: keyword.c,v 1.16 2002/12/19 21:29:46 mickey Exp $ */
+/* $OpenBSD: keyword.c,v 1.17 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: keyword.c,v 1.12.6.1 1996/05/30 21:25:13 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)keyword.c 8.5 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: keyword.c,v 1.16 2002/12/19 21:29:46 mickey Exp $";
+static char rcsid[] = "$OpenBSD: keyword.c,v 1.17 2003/06/02 23:32:09 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/ps/nlist.c b/bin/ps/nlist.c
index 6550b01df81..8a93777a9e5 100644
--- a/bin/ps/nlist.c
+++ b/bin/ps/nlist.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nlist.c,v 1.12 2003/05/19 05:15:39 art Exp $ */
+/* $OpenBSD: nlist.c,v 1.13 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: nlist.c,v 1.11 1995/03/21 09:08:03 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)nlist.c 8.4 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: nlist.c,v 1.12 2003/05/19 05:15:39 art Exp $";
+static char rcsid[] = "$OpenBSD: nlist.c,v 1.13 2003/06/02 23:32:09 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/ps/print.c b/bin/ps/print.c
index e91a2c1f92e..69387be61fd 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print.c,v 1.29 2003/01/05 01:39:24 deraadt Exp $ */
+/* $OpenBSD: print.c,v 1.30 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: print.c,v 1.27 1995/09/29 21:58:12 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94";
#else
-static char rcsid[] = "$OpenBSD: print.c,v 1.29 2003/01/05 01:39:24 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: print.c,v 1.30 2003/06/02 23:32:09 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index 55bce5d43d2..38baa8a50ec 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ps.1,v 1.41 2003/05/29 20:41:31 jmc Exp $
+.\" $OpenBSD: ps.1,v 1.42 2003/06/02 23:32:09 millert Exp $
.\" $NetBSD: ps.1,v 1.16 1996/03/21 01:36:28 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1991, 1993, 1994
@@ -12,11 +12,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index b9576c94f6e..2b986333766 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ps.c,v 1.31 2003/04/15 01:19:34 deraadt Exp $ */
+/* $OpenBSD: ps.c,v 1.32 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: ps.c,v 1.15 1995/05/18 20:33:25 mycroft Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)ps.c 8.4 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: ps.c,v 1.31 2003/04/15 01:19:34 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ps.c,v 1.32 2003/06/02 23:32:09 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/ps/ps.h b/bin/ps/ps.h
index 6cb0ab8814b..93e1f8d644a 100644
--- a/bin/ps/ps.h
+++ b/bin/ps/ps.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ps.h,v 1.4 2002/02/16 21:27:07 millert Exp $ */
+/* $OpenBSD: ps.h,v 1.5 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: ps.h,v 1.11 1995/09/29 21:57:03 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/pwd/pwd.1 b/bin/pwd/pwd.1
index 3b854c23bcd..911cc61639f 100644
--- a/bin/pwd/pwd.1
+++ b/bin/pwd/pwd.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pwd.1,v 1.9 2003/05/29 20:52:17 jmc Exp $
+.\" $OpenBSD: pwd.1,v 1.10 2003/06/02 23:32:09 millert Exp $
.\" $NetBSD: pwd.1,v 1.10 1995/09/07 06:47:30 jtc Exp $
.\"
.\" Copyright (c) 1990, 1993
@@ -15,11 +15,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c
index 1c90f46ad74..bca9281a279 100644
--- a/bin/pwd/pwd.c
+++ b/bin/pwd/pwd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pwd.c,v 1.8 2002/07/04 04:26:40 deraadt Exp $ */
+/* $OpenBSD: pwd.c,v 1.9 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: pwd.c,v 1.7 1995/03/21 09:08:18 cgd Exp $ */
/*
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)pwd.c 8.3 (Berkeley) 4/1/94";
#else
-static char rcsid[] = "$OpenBSD: pwd.c,v 1.8 2002/07/04 04:26:40 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: pwd.c,v 1.9 2003/06/02 23:32:09 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/rcp/extern.h b/bin/rcp/extern.h
index 4ab443f10a4..eafb8b630d2 100644
--- a/bin/rcp/extern.h
+++ b/bin/rcp/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.4 2002/02/16 21:27:07 millert Exp $ */
+/* $OpenBSD: extern.h,v 1.5 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: extern.h,v 1.2 1995/03/21 08:19:01 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/rcp/pathnames.h b/bin/rcp/pathnames.h
index bc2daa0d8d4..3735ddc4727 100644
--- a/bin/rcp/pathnames.h
+++ b/bin/rcp/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.2 1996/06/23 14:20:56 deraadt Exp $ */
+/* $OpenBSD: pathnames.h,v 1.3 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.5 1995/03/21 08:19:03 cgd Exp $ */
/*
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/rcp/rcp.1 b/bin/rcp/rcp.1
index 371f8fc7d7a..5ad0ec958ef 100644
--- a/bin/rcp/rcp.1
+++ b/bin/rcp/rcp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rcp.1,v 1.13 2002/05/06 23:34:32 millert Exp $
+.\" $OpenBSD: rcp.1,v 1.14 2003/06/02 23:32:09 millert Exp $
.\" $NetBSD: rcp.1,v 1.6 1995/07/25 19:37:25 jtc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
@@ -12,11 +12,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/rcp/rcp.c b/bin/rcp/rcp.c
index 825ab1bd557..241b2f27a60 100644
--- a/bin/rcp/rcp.c
+++ b/bin/rcp/rcp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcp.c,v 1.34 2003/04/13 18:04:41 deraadt Exp $ */
+/* $OpenBSD: rcp.c,v 1.35 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: rcp.c,v 1.9 1995/03/21 08:19:06 cgd Exp $ */
/*
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/rcp/util.c b/bin/rcp/util.c
index 2e007c30b18..f2cd0b80b12 100644
--- a/bin/rcp/util.c
+++ b/bin/rcp/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.c,v 1.11 2002/07/04 04:26:40 deraadt Exp $ */
+/* $OpenBSD: util.c,v 1.12 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: util.c,v 1.2 1995/03/21 08:19:08 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)util.c 8.2 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: util.c,v 1.11 2002/07/04 04:26:40 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: util.c,v 1.12 2003/06/02 23:32:09 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/rm/rm.1 b/bin/rm/rm.1
index 2fa6f6b121c..1033fa7320a 100644
--- a/bin/rm/rm.1
+++ b/bin/rm/rm.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rm.1,v 1.22 2003/05/30 08:37:08 jmc Exp $
+.\" $OpenBSD: rm.1,v 1.23 2003/06/02 23:32:09 millert Exp $
.\" $NetBSD: rm.1,v 1.8 1995/07/25 19:37:30 jtc Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
@@ -15,11 +15,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index c2afef9a3d1..3b8e11d582d 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rm.c,v 1.14 2003/01/11 11:03:53 hugh Exp $ */
+/* $OpenBSD: rm.c,v 1.15 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: rm.c,v 1.19 1995/09/07 06:48:50 jtc Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)rm.c 8.8 (Berkeley) 4/27/95";
#else
-static char rcsid[] = "$OpenBSD: rm.c,v 1.14 2003/01/11 11:03:53 hugh Exp $";
+static char rcsid[] = "$OpenBSD: rm.c,v 1.15 2003/06/02 23:32:09 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/rmail/rmail.8 b/bin/rmail/rmail.8
index 2924c51346f..8752ca85059 100644
--- a/bin/rmail/rmail.8
+++ b/bin/rmail/rmail.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rmail.8,v 1.14 2002/11/09 00:41:30 fgsch Exp $
+.\" $OpenBSD: rmail.8,v 1.15 2003/06/02 23:32:09 millert Exp $
.\" $NetBSD: rmail.8,v 1.8 1995/03/21 07:08:21 cgd Exp $
.\"
.\" Copyright (c) 1983, 1990 The Regents of the University of California.
@@ -12,11 +12,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/rmail/rmail.c b/bin/rmail/rmail.c
index 7e220b17ce5..b6fb334934b 100644
--- a/bin/rmail/rmail.c
+++ b/bin/rmail/rmail.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rmail.c,v 1.14 2003/03/13 09:09:24 deraadt Exp $ */
+/* $OpenBSD: rmail.c,v 1.15 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: rmail.c,v 1.8 1995/09/07 06:51:50 jtc Exp $ */
/*
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)rmail.c 8.3 (Berkeley) 5/15/95";
#else
-static char rcsid[] = "$OpenBSD: rmail.c,v 1.14 2003/03/13 09:09:24 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rmail.c,v 1.15 2003/06/02 23:32:09 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/rmdir/rmdir.1 b/bin/rmdir/rmdir.1
index 9b6be161a71..63c9b1512f2 100644
--- a/bin/rmdir/rmdir.1
+++ b/bin/rmdir/rmdir.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rmdir.1,v 1.14 2003/03/12 20:12:36 deraadt Exp $
+.\" $OpenBSD: rmdir.1,v 1.15 2003/06/02 23:32:09 millert Exp $
.\" $NetBSD: rmdir.1,v 1.10 1995/07/25 19:37:35 jtc Exp $
.\"
.\" Copyright (c) 1990, 1993
@@ -15,11 +15,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/rmdir/rmdir.c b/bin/rmdir/rmdir.c
index 223e6ed919f..2973461ec5a 100644
--- a/bin/rmdir/rmdir.c
+++ b/bin/rmdir/rmdir.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rmdir.c,v 1.7 2002/07/04 04:26:40 deraadt Exp $ */
+/* $OpenBSD: rmdir.c,v 1.8 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: rmdir.c,v 1.13 1995/03/21 09:08:31 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)rmdir.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: rmdir.c,v 1.7 2002/07/04 04:26:40 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rmdir.c,v 1.8 2003/06/02 23:32:09 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/sleep/sleep.1 b/bin/sleep/sleep.1
index cd470caaef0..b395be5d50b 100644
--- a/bin/sleep/sleep.1
+++ b/bin/sleep/sleep.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sleep.1,v 1.12 2000/04/12 21:47:47 aaron Exp $
+.\" $OpenBSD: sleep.1,v 1.13 2003/06/02 23:32:09 millert Exp $
.\" $NetBSD: sleep.1,v 1.9 1995/07/25 19:37:43 jtc Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
@@ -15,11 +15,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/sleep/sleep.c b/bin/sleep/sleep.c
index 3e60279d944..c479135861d 100644
--- a/bin/sleep/sleep.c
+++ b/bin/sleep/sleep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sleep.c,v 1.15 2002/09/06 18:16:59 deraadt Exp $ */
+/* $OpenBSD: sleep.c,v 1.16 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: sleep.c,v 1.8 1995/03/21 09:11:11 cgd Exp $ */
/*
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)sleep.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: sleep.c,v 1.15 2002/09/06 18:16:59 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: sleep.c,v 1.16 2003/06/02 23:32:09 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/stty/cchar.c b/bin/stty/cchar.c
index 16db3d8f4ca..d02d3f008ef 100644
--- a/bin/stty/cchar.c
+++ b/bin/stty/cchar.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cchar.c,v 1.8 1998/11/18 23:26:13 deraadt Exp $ */
+/* $OpenBSD: cchar.c,v 1.9 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: cchar.c,v 1.10 1996/05/07 18:20:05 jtc Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)cchar.c 8.5 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: cchar.c,v 1.8 1998/11/18 23:26:13 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: cchar.c,v 1.9 2003/06/02 23:32:09 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/stty/extern.h b/bin/stty/extern.h
index 205353c9c43..beb5e1c1cc9 100644
--- a/bin/stty/extern.h
+++ b/bin/stty/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.5 2002/02/16 21:27:08 millert Exp $ */
+/* $OpenBSD: extern.h,v 1.6 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: extern.h,v 1.8 1996/05/07 18:20:06 jtc Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/stty/gfmt.c b/bin/stty/gfmt.c
index c06f5ef18f1..460196162b1 100644
--- a/bin/stty/gfmt.c
+++ b/bin/stty/gfmt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gfmt.c,v 1.4 1997/09/01 18:30:33 deraadt Exp $ */
+/* $OpenBSD: gfmt.c,v 1.5 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: gfmt.c,v 1.10 1996/05/07 18:20:08 jtc Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)gfmt.c 8.6 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: gfmt.c,v 1.4 1997/09/01 18:30:33 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: gfmt.c,v 1.5 2003/06/02 23:32:09 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/stty/key.c b/bin/stty/key.c
index 23f9dc4e489..f5808071cac 100644
--- a/bin/stty/key.c
+++ b/bin/stty/key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: key.c,v 1.10 2002/02/16 21:27:08 millert Exp $ */
+/* $OpenBSD: key.c,v 1.11 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: key.c,v 1.11 1995/09/07 06:57:11 jtc Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)key.c 8.4 (Berkeley) 2/20/95";
#else
-static char rcsid[] = "$OpenBSD: key.c,v 1.10 2002/02/16 21:27:08 millert Exp $";
+static char rcsid[] = "$OpenBSD: key.c,v 1.11 2003/06/02 23:32:09 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/stty/modes.c b/bin/stty/modes.c
index 965e881f779..bd2afe40995 100644
--- a/bin/stty/modes.c
+++ b/bin/stty/modes.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: modes.c,v 1.5 1999/10/26 22:53:52 deraadt Exp $ */
+/* $OpenBSD: modes.c,v 1.6 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: modes.c,v 1.9 1996/05/07 18:20:09 jtc Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)modes.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: modes.c,v 1.5 1999/10/26 22:53:52 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: modes.c,v 1.6 2003/06/02 23:32:09 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/stty/print.c b/bin/stty/print.c
index f22b12b291d..f3a3c3589ae 100644
--- a/bin/stty/print.c
+++ b/bin/stty/print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print.c,v 1.9 2002/02/16 21:27:08 millert Exp $ */
+/* $OpenBSD: print.c,v 1.10 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: print.c,v 1.11 1996/05/07 18:20:10 jtc Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94";
#else
-static char rcsid[] = "$OpenBSD: print.c,v 1.9 2002/02/16 21:27:08 millert Exp $";
+static char rcsid[] = "$OpenBSD: print.c,v 1.10 2003/06/02 23:32:09 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/stty/stty.1 b/bin/stty/stty.1
index 9d47f4128d0..5473078fa9b 100644
--- a/bin/stty/stty.1
+++ b/bin/stty/stty.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: stty.1,v 1.28 2003/05/30 08:44:14 jmc Exp $
+.\" $OpenBSD: stty.1,v 1.29 2003/06/02 23:32:09 millert Exp $
.\" $NetBSD: stty.1,v 1.10 1995/09/07 06:57:14 jtc Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
@@ -15,11 +15,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/stty/stty.c b/bin/stty/stty.c
index a83918ce4dd..98970a68136 100644
--- a/bin/stty/stty.c
+++ b/bin/stty/stty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: stty.c,v 1.9 2001/09/06 13:29:08 mpech Exp $ */
+/* $OpenBSD: stty.c,v 1.10 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: stty.c,v 1.11 1995/03/21 09:11:30 cgd Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)stty.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: stty.c,v 1.9 2001/09/06 13:29:08 mpech Exp $";
+static char rcsid[] = "$OpenBSD: stty.c,v 1.10 2003/06/02 23:32:09 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/stty/stty.h b/bin/stty/stty.h
index 1a4d5dd7b65..1332c73e6ac 100644
--- a/bin/stty/stty.h
+++ b/bin/stty/stty.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stty.h,v 1.3 1996/06/23 14:21:53 deraadt Exp $ */
+/* $OpenBSD: stty.h,v 1.4 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: stty.h,v 1.7 1996/05/07 18:20:11 jtc Exp $ */
/*-
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
diff --git a/bin/sync/sync.8 b/bin/sync/sync.8
index 6e04c324b01..7e495992cab 100644
--- a/bin/sync/sync.8
+++ b/bin/sync/sync.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sync.8,v 1.9 1999/08/17 14:04:02 aaron Exp $
+.\" $OpenBSD: sync.8,v 1.10 2003/06/02 23:32:09 millert Exp $
.\" $NetBSD: sync.8,v 1.6 1995/03/21 09:11:35 cgd Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
@@ -12,11 +12,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"
diff --git a/bin/sync/sync.c b/bin/sync/sync.c
index cdf02b2c492..557f592b0b9 100644
--- a/bin/sync/sync.c
+++ b/bin/sync/sync.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sync.c,v 1.4 2002/07/04 04:26:40 deraadt Exp $ */
+/* $OpenBSD: sync.c,v 1.5 2003/06/02 23:32:09 millert Exp $ */
/* $NetBSD: sync.c,v 1.7 1995/03/21 09:11:37 cgd Exp $ */
/*
@@ -13,11 +13,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)sync.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: sync.c,v 1.4 2002/07/04 04:26:40 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: sync.c,v 1.5 2003/06/02 23:32:09 millert Exp $";
#endif
#endif /* not lint */
diff --git a/bin/test/test.1 b/bin/test/test.1
index 33422650852..92952fc3404 100644
--- a/bin/test/test.1
+++ b/bin/test/test.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: test.1,v 1.14 2003/03/07 06:30:38 david Exp $
+.\" $OpenBSD: test.1,v 1.15 2003/06/02 23:32:09 millert Exp $
.\" $NetBSD: test.1,v 1.6 1995/03/21 07:04:03 cgd Exp $
.\"
.\" Copyright (c) 1991, 1993
@@ -15,11 +15,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 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.
.\"