sync copyright with /usr/share/examples/etc/bsd-style-copyright

2 files changed, 9 insertions, 31 deletions

diff --git a/usr.sbin/kbdmap/kbdmap.1 b/usr.sbin/kbdmap/kbdmap.1
index c6f8fe3..b4995df 100644
--- a/usr.sbin/kbdmap/kbdmap.1
+++ b/usr.sbin/kbdmap/kbdmap.1
@@ -1,6 +1,5 @@
-.\"
-.\" Copyright (c) March 1995 Wolfram Schneider. All rights reserved.
-.\" Alle Rechte vorbehalten. Es gilt das kontinentaleuropäische Urheberrecht.
+.\" Copyright (c) March 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
+.\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -10,11 +9,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 Wolfram Schneider
-.\" 4. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -28,14 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-
-.\"
-.\" kbdmap/vidfont - front end for syscons 
-.\"
-.\"   E-Mail: Wolfram Schneider <wosch@cs.tu-berlin.de>
-.\"
-.\" $Id: kbdmap.1,v 1.4 1996/08/16 13:26:44 wosch Exp $
-.\"
+.\" $Id: kbdmap.1,v 1.5 1996/08/23 00:56:08 mpp Exp $
 
 .Dd Mar 25, 1995
 .Dt KBDMAP 1
@@ -148,5 +135,5 @@ command appeared in
 
 .Sh AUTHOR
 Wolfram Schneider
-.Aq wosch@cs.tu-berlin.de ,
-Germany.
+.Aq wosch@FreeBSD.org ,
+Berlin.
diff --git a/usr.sbin/kbdmap/kbdmap.pl b/usr.sbin/kbdmap/kbdmap.pl
index 35cefab..c7d3b96 100644
--- a/usr.sbin/kbdmap/kbdmap.pl
+++ b/usr.sbin/kbdmap/kbdmap.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
-# Copyright (c) March 1995 Wolfram Schneider. All rights reserved.
-# Alle Rechte vorbehalten. Es gilt das kontinentaleuropäische Urheberrecht.
+# Copyright (c) March 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
+# All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -11,11 +11,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 Wolfram Schneider
-# 4. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -29,14 +24,10 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-
-#
 # kbdmap/vidfont - front end for syscons
 #
-#   E-Mail: Wolfram Schneider <wosch@cs.tu-berlin.de>
-#
-# $Id: kbdmap.pl,v 1.2 1995/04/05 08:09:24 jkh Exp $
-#
+# $Id: kbdmap.pl,v 1.3 1996/08/16 13:26:44 wosch Exp $
+
 
 # simple test if syscons works
 $x11 = system("kbdcontrol -d >/dev/null");