written by Bill Joy; add Berkeley copyright

SCCS-vsn: usr.bin/colcrt/colcrt.1 6.3
SCCS-vsn: usr.bin/colcrt/colcrt.c 5.3
SCCS-vsn: usr.bin/expand/expand.1 6.3
SCCS-vsn: usr.bin/expand/expand.c 5.2
SCCS-vsn: usr.bin/unexpand/unexpand.c 5.2
SCCS-vsn: usr.bin/soelim/soelim.1 6.3
SCCS-vsn: usr.bin/soelim/soelim.c 5.2

diff --git a/usr/src/usr.bin/colcrt/colcrt.1 b/usr/src/usr.bin/colcrt/colcrt.1
index b62e4cb..23f85b6 100644 (file)
--- a/usr/src/usr.bin/colcrt/colcrt.1
+++ b/usr/src/usr.bin/colcrt/colcrt.1
@@ -1,8 +1,19 @@
-.\" Copyright (c) 1980 Regents of the University of California.
-.\" All rights reserved.  The Berkeley software License Agreement
-.\" specifies the terms and conditions for redistribution.
+.\" Copyright (c) 1980 The Regents of the University of California.
+.\" All rights reserved.

 .\"
 .\"

-.\"    @(#)colcrt.1    6.2 (Berkeley) %G%
+.\" 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+.\"
+.\"    @(#)colcrt.1    6.3 (Berkeley) %G%

 .\"
 .TH COLCRT 1 ""
 .UC
 .\"
 .TH COLCRT 1 ""
 .UC

diff --git a/usr/src/usr.bin/colcrt/colcrt.c b/usr/src/usr.bin/colcrt/colcrt.c
index 006d518..cd2b8a3 100644 (file)
--- a/usr/src/usr.bin/colcrt/colcrt.c
+++ b/usr/src/usr.bin/colcrt/colcrt.c
@@ -1,18 +1,29 @@
 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1980 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #ifndef lint
 char copyright[] =
  */
 
 #ifndef lint
 char copyright[] =

-"@(#) Copyright (c) 1980 Regents of the University of California.\n\
+"@(#) Copyright (c) 1980 The Regents of the University of California.\n\

  All rights reserved.\n";
  All rights reserved.\n";

-#endif not lint
+#endif /* not lint */

 
 #ifndef lint
 
 #ifndef lint

-static char sccsid[] = "@(#)colcrt.c   5.2 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)colcrt.c   5.3 (Berkeley) %G%";
+#endif /* not lint */

 
 #include <stdio.h>
 /*
 
 #include <stdio.h>
 /*

diff --git a/usr/src/usr.bin/expand/expand.1 b/usr/src/usr.bin/expand/expand.1
index 93bc963..06c2aa3 100644 (file)
--- a/usr/src/usr.bin/expand/expand.1
+++ b/usr/src/usr.bin/expand/expand.1
@@ -1,8 +1,19 @@
-.\" Copyright (c) 1980 Regents of the University of California.
-.\" All rights reserved.  The Berkeley software License Agreement
-.\" specifies the terms and conditions for redistribution.
+.\" Copyright (c) 1980 The Regents of the University of California.
+.\" All rights reserved.

 .\"
 .\"

-.\"    @(#)expand.1    6.2 (Berkeley) %G%
+.\" 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+.\"
+.\"    @(#)expand.1    6.3 (Berkeley) %G%

 .\"
 .TH EXPAND 1 ""
 .UC 4
 .\"
 .TH EXPAND 1 ""
 .UC 4

diff --git a/usr/src/usr.bin/expand/expand.c b/usr/src/usr.bin/expand/expand.c
index 05f06b7..08c01d3 100644 (file)
--- a/usr/src/usr.bin/expand/expand.c
+++ b/usr/src/usr.bin/expand/expand.c
@@ -1,18 +1,29 @@
 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1980 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #ifndef lint
 char copyright[] =
  */
 
 #ifndef lint
 char copyright[] =

-"@(#) Copyright (c) 1980 Regents of the University of California.\n\
+"@(#) Copyright (c) 1980 The Regents of the University of California.\n\

  All rights reserved.\n";
  All rights reserved.\n";

-#endif not lint
+#endif /* not lint */

 
 #ifndef lint
 
 #ifndef lint

-static char sccsid[] = "@(#)expand.c   5.1 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)expand.c   5.2 (Berkeley) %G%";
+#endif /* not lint */

 
 #include <stdio.h>
 /*
 
 #include <stdio.h>
 /*

diff --git a/usr/src/usr.bin/soelim/soelim.1 b/usr/src/usr.bin/soelim/soelim.1
index eefdca2..a457122 100644 (file)
--- a/usr/src/usr.bin/soelim/soelim.1
+++ b/usr/src/usr.bin/soelim/soelim.1
@@ -1,8 +1,19 @@
-.\" Copyright (c) 1980 Regents of the University of California.
-.\" All rights reserved.  The Berkeley software License Agreement
-.\" specifies the terms and conditions for redistribution.
+.\" Copyright (c) 1980 The Regents of the University of California.
+.\" All rights reserved.

 .\"
 .\"

-.\"    @(#)soelim.1    6.2 (Berkeley) %G%
+.\" 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+.\"
+.\"    @(#)soelim.1    6.3 (Berkeley) %G%

 .\"
 .TH SOELIM 1 ""
 .UC
 .\"
 .TH SOELIM 1 ""
 .UC

diff --git a/usr/src/usr.bin/soelim/soelim.c b/usr/src/usr.bin/soelim/soelim.c
index 665fe42..13d9085 100644 (file)
--- a/usr/src/usr.bin/soelim/soelim.c
+++ b/usr/src/usr.bin/soelim/soelim.c
@@ -1,18 +1,29 @@
 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1980 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #ifndef lint
 char copyright[] =
  */
 
 #ifndef lint
 char copyright[] =

-"@(#) Copyright (c) 1980 Regents of the University of California.\n\
+"@(#) Copyright (c) 1980 The Regents of the University of California.\n\

  All rights reserved.\n";
  All rights reserved.\n";

-#endif not lint
+#endif /* not lint */

 
 #ifndef lint
 
 #ifndef lint

-static char sccsid[] = "@(#)soelim.c   5.1 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)soelim.c   5.2 (Berkeley) %G%";
+#endif /* not lint */

 
 #include <stdio.h>
 /*
 
 #include <stdio.h>
 /*

diff --git a/usr/src/usr.bin/unexpand/unexpand.c b/usr/src/usr.bin/unexpand/unexpand.c
index 516540f..908f315 100644 (file)
--- a/usr/src/usr.bin/unexpand/unexpand.c
+++ b/usr/src/usr.bin/unexpand/unexpand.c
@@ -1,18 +1,29 @@
 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1980 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
 #ifndef lint
 char copyright[] =
  */
 
 #ifndef lint
 char copyright[] =

-"@(#) Copyright (c) 1980 Regents of the University of California.\n\
+"@(#) Copyright (c) 1980 The Regents of the University of California.\n\

  All rights reserved.\n";
  All rights reserved.\n";

-#endif not lint
+#endif /* not lint */

 
 #ifndef lint
 
 #ifndef lint

-static char sccsid[] = "@(#)unexpand.c 5.1 (Berkeley) %G%";
-#endif not lint
+static char sccsid[] = "@(#)unexpand.c 5.2 (Berkeley) %G%";
+#endif /* not lint */

 
 /*
  * unexpand - put tabs into a file replacing blanks
 
 /*
  * unexpand - put tabs into a file replacing blanks