Remove the requirement that redistributions in binary form reproduce

the copyright conditions in documentation from my copyright notice.
It still remains in CMU's and others' copyright notices.

1 files changed, 3 insertions, 8 deletions

diff --git a/pppd/ccp.h b/pppd/ccp.h
index a61d689..6f4a2fe 100644
--- a/pppd/ccp.h
+++ b/pppd/ccp.h
@@ -10,16 +10,11 @@
  * 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. The name(s) of the authors of this software must not be used to
+ * 2. The name(s) of the authors of this software must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission.
  *
- * 4. Redistributions of any form whatsoever must retain the following
+ * 3. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by Paul Mackerras
  *     <paulus@samba.org>".
@@ -32,7 +27,7 @@
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: ccp.h,v 1.11 2002/12/04 23:03:32 paulus Exp $
+ * $Id: ccp.h,v 1.12 2004/11/04 10:02:26 paulus Exp $
  */
 
 typedef struct ccp_options {