===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/vi/LICENSE,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- src/usr.bin/vi/LICENSE	1996/08/23 13:18:11	1.4
+++ src/usr.bin/vi/LICENSE	1996/09/17 17:18:49	1.5
@@ -1,6 +1,14 @@
+The vi program is freely redistributable.  You are welcome to copy, modify
+and share it with others under the conditions listed in this file.  If any
+company (not any individual!) finds vi sufficiently useful that you would
+have purchased it, or if any company wishes to redistribute it, contributions
+to the authors would be appreciated.
+
 /*-
  * Copyright (c) 1991, 1992, 1993, 1994
  *      The Regents of the University of California.  All rights reserved.
+ *  Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996
+ *	Keith Bostic.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,26 +37,4 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- */
-
-/*
- * Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996
- *	Keith Bostic.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following message.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following message in the
- *    documentation and/or other materials provided with the distribution.
- * 3. For permission to redistribute this program under conditions other
- *    than these, contact Keith Bostic.
- *
- * The vi program is freely redistributable.  You are welcome to copy,
- * modify and share it with others under the conditions listed in the
- * LICENSE file.  If any company (not individual!) finds vi sufficiently
- * useful that you would have purchased it, or if any company wishes to
- * redistribute it, contributions to the authors would be appreciated.
  */