Not actually reserving all rights.

diff --git a/morse.c b/morse.c
index 4a91f991b09f3c54a4af5a0f11fcde1e09413157..8c597cd9874cfb48a95d16fb5188980630c51af2 100644 (file)
--- a/morse.c
+++ b/morse.c
@@ -2,7 +2,6 @@
  * Copyright (c) 1988 Regents of the University of California.
  * Copyright (c) 1992 Joe Dellinger, University of Hawaii at Manoa
  * Copyright (c) 2005 Eric S. Raymond.
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/qso/QSO.c b/qso/QSO.c
index 64d1c20c05d8af263ef2203dc496bd5b2448785b..0ab534fd3ef1eabc30e408f1bb6ab9f1b3c43bd4 100644 (file)
--- a/qso/QSO.c
+++ b/qso/QSO.c
@@ -1,3 +1,32 @@
+/*
+ * Copyright (c) 1991 Paul J. Drongowski.
+ * Copyright (c) 1992 Joe Dellinger.
+ * Copyright (c) 2005 Eric S. Raymond.
+ *
+ * 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 disclaimer.
+ * 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. 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * 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.
+ */
 /*
  * Return-Path: <pjd@cadillac.siemens.com>
  * Received: from cadillac.siemens.com by montebello.soest.hawaii.edu (4.1/montebello-MX-1.9)
@@ -27,15 +56,6 @@
  * Generate QSO
  */
 
-/*
- * Author:  Paul J. Drongowski / N2OQT
- * Address: 1 Allen Court
- *          Plainsboro, New Jersey 08536
- * Date:    10 October 1991
- *
- * Copyright (c) 1991 Paul J. Drongowski
- */
-
 /*
  * When run, this program generates a single QSO. The form of the
  * QSO is similar to QSO's one would expect to hear at a code test.
@@ -80,10 +100,6 @@
  * test. This program is for practice only and should be supplemented
  * with lots of random code.
  *
- * Please note that I retain the copyright
- * to this program. You may use it for any non-commercial purposes.
- * This is roughly equivalent to "fair use."
- *
  * Always have fun!
  */