yank to 5.1, new copyright; att/bsd/shared

SCCS-vsn: usr.bin/vis/foldit.c 5.1
SCCS-vsn: usr.bin/vis/vis.1 5.1
SCCS-vsn: usr.bin/vis/vis.c 5.1

diff --git a/usr/src/usr.bin/vis/foldit.c b/usr/src/usr.bin/vis/foldit.c
index eeed5db..5ea1312 100644 (file)
--- a/usr/src/usr.bin/vis/foldit.c
+++ b/usr/src/usr.bin/vis/foldit.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)foldit.c   1.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)foldit.c   5.1 (Berkeley) %G%";

 #endif /* not lint */
 
 foldit(chunk, col, max)
 #endif /* not lint */
 
 foldit(chunk, col, max)

diff --git a/usr/src/usr.bin/vis/vis.1 b/usr/src/usr.bin/vis/vis.1
index 1d39dbb..1d12367 100644 (file)
--- a/usr/src/usr.bin/vis/vis.1
+++ b/usr/src/usr.bin/vis/vis.1
@@ -1,19 +1,9 @@
 .\" Copyright (c) 1989 The Regents of the University of California.
 .\" All rights reserved.
 .\"
 .\" Copyright (c) 1989 The Regents of the University of California.
 .\" All rights reserved.
 .\"

-.\" Redistribution and use in source and binary forms are permitted
-.\" provided that the above copyright notice and this paragraph are
-.\" duplicated in all such forms and that any documentation,
-.\" advertising materials, and other materials related to such
-.\" distribution and use acknowledge that the software was developed
-.\" by the University of California, Berkeley.  The name of the
-.\" University may not be used to endorse or promote products derived
-.\" from this software without specific prior written permission.
-.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+.\" %sccs.include.redist.roff%

 .\"
 .\"

-.\"    @(#)vis.1       1.2 (Berkeley) %G%
+.\"    @(#)vis.1       5.1 (Berkeley) %G%

 .\"
 .TH VIS 1 ""
 .UC 7
 .\"
 .TH VIS 1 ""
 .UC 7

diff --git a/usr/src/usr.bin/vis/vis.c b/usr/src/usr.bin/vis/vis.c
index c72c3a7..c22479b 100644 (file)
--- a/usr/src/usr.bin/vis/vis.c
+++ b/usr/src/usr.bin/vis/vis.c
@@ -1,18 +1,8 @@
-/*
+/*-

  * Copyright (c) 1989 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1989 The Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%

  */
 
 #ifndef lint
  */
 
 #ifndef lint


@@ -22,7 +12,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)vis.c      1.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)vis.c      5.1 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <stdio.h>
 #endif /* not lint */
 
 #include <stdio.h>