BSD 4_3_Reno release

[unix-history] / usr / src / sys / vaxbi / bivar.h

diff --git a/usr/src/sys/vaxbi/bivar.h b/usr/src/sys/vaxbi/bivar.h
index dcc6644..c08b6d0 100644 (file)
--- a/usr/src/sys/vaxbi/bivar.h
+++ b/usr/src/sys/vaxbi/bivar.h
@@ -5,19 +5,22 @@
  * This code is derived from software contributed to Berkeley by
  * Chris Torek.
  *
  * This code is derived from software contributed to Berkeley by
  * Chris Torek.
  *

- * 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.
+ * Redistribution is only permitted until one year after the first shipment
+ * of 4.4BSD by the Regents.  Otherwise, redistribution and use in source and
+ * binary forms are permitted provided that: (1) source distributions retain
+ * this entire copyright notice and comment, and (2) distributions including
+ * binaries display the following acknowledgement:  This product includes
+ * software developed by the University of California, Berkeley and its
+ * contributors'' in the documentation or other materials provided with the
+ * distribution and in all advertising materials mentioning features or use
+ * of this software.  Neither the name of the University nor the names of
+ * its contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  *
  *

- *     @(#)bivar.h     7.2 (Berkeley) 7/9/88
+ *     @(#)bivar.h     7.3 (Berkeley) 6/28/90

  */
 
 /*
  */
 
 /*