svn commit: r260047 - head/sys/dev/fb

[Ed Maste]

Author: emaste
Date: Sun Dec 29 18:44:12 2013
New Revision: 260047
URL: http://svnweb.freebsd.org/changeset/base/260047

Log:
  Clean up license text
  
  - Renumber Regents clauses
  - Remove clause 3 and 4 from TNF license, following upstream change

Modified:
  head/sys/dev/fb/boot_font.c
  head/sys/dev/fb/gallant12x22.c

Modified: head/sys/dev/fb/boot_font.c
==============================================================================
--- head/sys/dev/fb/boot_font.c	Sun Dec 29 18:34:29 2013	(r260046)
+++ head/sys/dev/fb/boot_font.c	Sun Dec 29 18:44:12 2013	(r260047)
@@ -13,13 +13,6 @@
  * 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 NetBSD
- *	Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

Modified: head/sys/dev/fb/gallant12x22.c
==============================================================================
--- head/sys/dev/fb/gallant12x22.c	Sun Dec 29 18:34:29 2013	(r260046)
+++ head/sys/dev/fb/gallant12x22.c	Sun Dec 29 18:44:12 2013	(r260047)
@@ -17,7 +17,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.
- * 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.
  *