From f6cf8665dba068d74f47f5dc579492126f884621 Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Tue, 13 Oct 1998 04:48:44 +0000 Subject: [PATCH] Add explicit reference to FreeBSD copyright vs the standard BSD copyright, which we no longer follow clauses 3 and 4 of. --- en/copyright/Makefile | 3 +- en/copyright/copyright.sgml | 9 +++--- en/copyright/freebsd-license.sgml | 53 +++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 5 deletions(-) create mode 100644 en/copyright/freebsd-license.sgml diff --git a/en/copyright/Makefile b/en/copyright/Makefile index be2913c620..6fc92a16b9 100644 --- a/en/copyright/Makefile +++ b/en/copyright/Makefile @@ -1,10 +1,11 @@ -# $Id: Makefile,v 1.4 1998-08-16 12:51:02 wosch Exp $ +# $Id: Makefile,v 1.5 1998-10-13 04:48:44 jkh Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" .endif DOCS= license.sgml +DOCS= freebsd-license.sgml DOCS+= daemon.sgml DOCS+= copyright.sgml diff --git a/en/copyright/copyright.sgml b/en/copyright/copyright.sgml index 62d0e41909..9b75ee1d90 100644 --- a/en/copyright/copyright.sgml +++ b/en/copyright/copyright.sgml @@ -1,17 +1,18 @@ - - + + %includes; ]> - + &header;

-

The FreeBSD Copyright

+

The BSD Copyright

+

The FreeBSD Copyright

The BSD Daemon

FreeBSD Ports redistribution restrictions

GNU GENERAL PUBLIC LICENSE

diff --git a/en/copyright/freebsd-license.sgml b/en/copyright/freebsd-license.sgml new file mode 100644 index 0000000000..aa0ec33b0f --- /dev/null +++ b/en/copyright/freebsd-license.sgml @@ -0,0 +1,53 @@ + + + + %includes; +]> + + + +&header; + +

Copyright 1994-1998 + FreeBSD, Inc. + 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 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. +
+ +

THIS SOFTWARE IS PROVIDED BY THE FREEBSD PROJECT + ``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. + +

The views and conclusions contained in the software and + documentation are those of the authors and should not be + interpreted as representing official policies, either + expressed or implied, of the FreeBSD Project or FreeBSD, Inc. +&footer; + +