12 files changed, 22 insertions, 70 deletions
diff --git a/usr.bin/vi/LICENSE b/usr.bin/vi/LICENSE
index 5c8042e751d..bb34822f403 100644
--- a/usr.bin/vi/LICENSE
+++ b/usr.bin/vi/LICENSE
@@ -16,11 +16,7 @@ Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996
  * 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/usr.bin/vi/catalog/dump.c b/usr.bin/vi/catalog/dump.c
index 5c2d6131100..49ec8e4cf6b 100644
--- a/usr.bin/vi/catalog/dump.c
+++ b/usr.bin/vi/catalog/dump.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dump.c,v 1.2 2001/01/29 01:58:26 niklas Exp $	*/
+/*	$OpenBSD: dump.c,v 1.3 2003/06/03 02:56:21 millert 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/usr.bin/vi/docs/USD.doc/edit/edit.vindex b/usr.bin/vi/docs/USD.doc/edit/edit.vindex
index 378e9b201c2..1bc5bb1491a 100644
--- a/usr.bin/vi/docs/USD.doc/edit/edit.vindex
+++ b/usr.bin/vi/docs/USD.doc/edit/edit.vindex
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: edit.vindex,v 1.2 2001/01/29 01:58:33 niklas Exp $
+.\"	$OpenBSD: edit.vindex,v 1.3 2003/06/03 02:56:21 millert Exp $
 .\"
 .\" Copyright (c) 1980, 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/usr.bin/vi/docs/USD.doc/edit/edittut.ms b/usr.bin/vi/docs/USD.doc/edit/edittut.ms
index 27cd38df753..2d33077a3a0 100644
--- a/usr.bin/vi/docs/USD.doc/edit/edittut.ms
+++ b/usr.bin/vi/docs/USD.doc/edit/edittut.ms
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: edittut.ms,v 1.4 2001/01/29 01:58:33 niklas Exp $
+.\"	$OpenBSD: edittut.ms,v 1.5 2003/06/03 02:56:21 millert Exp $
 .\"
 .\" Copyright (c) 1980, 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/usr.bin/vi/docs/USD.doc/exref/ex.rm b/usr.bin/vi/docs/USD.doc/exref/ex.rm
index 01a907a53a7..dff75ebe110 100644
--- a/usr.bin/vi/docs/USD.doc/exref/ex.rm
+++ b/usr.bin/vi/docs/USD.doc/exref/ex.rm
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ex.rm,v 1.4 2001/01/29 01:58:34 niklas Exp $
+.\"	$OpenBSD: ex.rm,v 1.5 2003/06/03 02:56:21 millert Exp $
 .\"
 .\" Copyright (c) 1980, 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/usr.bin/vi/docs/USD.doc/exref/ex.summary b/usr.bin/vi/docs/USD.doc/exref/ex.summary
index 669acd1a697..789ebd791db 100644
--- a/usr.bin/vi/docs/USD.doc/exref/ex.summary
+++ b/usr.bin/vi/docs/USD.doc/exref/ex.summary
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ex.summary,v 1.4 2001/01/29 01:58:34 niklas Exp $
+.\"	$OpenBSD: ex.summary,v 1.5 2003/06/03 02:56:22 millert Exp $
 .\"
 .\" Copyright (c) 1980, 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/usr.bin/vi/docs/USD.doc/vi.ref/COPYRIGHT b/usr.bin/vi/docs/USD.doc/vi.ref/COPYRIGHT
index e3de97a55a0..1bc2b4678d2 100644
--- a/usr.bin/vi/docs/USD.doc/vi.ref/COPYRIGHT
+++ b/usr.bin/vi/docs/USD.doc/vi.ref/COPYRIGHT
@@ -20,11 +20,7 @@ permission from Keith Bostic.
  * 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/usr.bin/vi/docs/USD.doc/vitut/vi.apwh.ms b/usr.bin/vi/docs/USD.doc/vitut/vi.apwh.ms
index 58961f08c5e..e3a276d0fd6 100644
--- a/usr.bin/vi/docs/USD.doc/vitut/vi.apwh.ms
+++ b/usr.bin/vi/docs/USD.doc/vitut/vi.apwh.ms
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vi.apwh.ms,v 1.3 2001/01/29 01:58:36 niklas Exp $
+.\"	$OpenBSD: vi.apwh.ms,v 1.4 2003/06/03 02:56:22 millert Exp $
 .\"
 .\" Copyright (c) 1980, 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/usr.bin/vi/docs/USD.doc/vitut/vi.chars b/usr.bin/vi/docs/USD.doc/vitut/vi.chars
index 06503954c1d..ef3ff396e08 100644
--- a/usr.bin/vi/docs/USD.doc/vitut/vi.chars
+++ b/usr.bin/vi/docs/USD.doc/vitut/vi.chars
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vi.chars,v 1.3 2001/01/29 01:58:37 niklas Exp $
+.\"	$OpenBSD: vi.chars,v 1.4 2003/06/03 02:56:22 millert Exp $
 .\"
 .\" Copyright (c) 1980, 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/usr.bin/vi/docs/USD.doc/vitut/vi.in b/usr.bin/vi/docs/USD.doc/vitut/vi.in
index 1bab591c6a0..80fde7b9441 100644
--- a/usr.bin/vi/docs/USD.doc/vitut/vi.in
+++ b/usr.bin/vi/docs/USD.doc/vitut/vi.in
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vi.in,v 1.4 2001/01/29 01:58:37 niklas Exp $
+.\"	$OpenBSD: vi.in,v 1.5 2003/06/03 02:56:22 millert Exp $
 .\"
 .\" Copyright (c) 1980, 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/usr.bin/vi/docs/USD.doc/vitut/vi.summary b/usr.bin/vi/docs/USD.doc/vitut/vi.summary
index 43f4e764fbc..308a6ce0915 100644
--- a/usr.bin/vi/docs/USD.doc/vitut/vi.summary
+++ b/usr.bin/vi/docs/USD.doc/vitut/vi.summary
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vi.summary,v 1.4 2001/01/29 01:58:37 niklas Exp $
+.\"	$OpenBSD: vi.summary,v 1.5 2003/06/03 02:56:22 millert Exp $
 .\"
 .\" Copyright (c) 1980, 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/usr.bin/vi/include/bitstring.h b/usr.bin/vi/include/bitstring.h
index 4657c80bf85..f473245ea73 100644
--- a/usr.bin/vi/include/bitstring.h
+++ b/usr.bin/vi/include/bitstring.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bitstring.h,v 1.2 2001/01/29 01:58:46 niklas Exp $	*/
+/*	$OpenBSD: bitstring.h,v 1.3 2003/06/03 02:56:22 millert Exp $	*/
 
 /*
  * Copyright (c) 1989, 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.
  *