diff --git a/en/copyright/Makefile b/en/copyright/Makefile index 577205fc18..177a038185 100644 --- a/en/copyright/Makefile +++ b/en/copyright/Makefile @@ -1,38 +1,39 @@ -# $FreeBSD: www/en/copyright/Makefile,v 1.13 2003/06/17 20:00:28 murray Exp $ +# $FreeBSD: www/en/copyright/Makefile,v 1.14 2004/06/09 17:30:32 ceri Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" .endif .if exists(../Makefile.inc) .include "../Makefile.inc" .endif DOCS= copyright.sgml DOCS+= daemon.sgml +DOCS+= freebsd-doc-license.sgml DOCS+= freebsd-license.sgml DOCS+= license.sgml DOCS+= trademarks.sgml INDEXLINK= copyright.html CVS_READONLY?= YES CVS_OPT+= -Q .if !empty(CVS_READONLY) CVS_OPT+= -R .endif DATA+= COPYING COPYING.LIB ${LEGAL} # FreeBSD Ports redistribution restrictions LEGAL= LEGAL LEGAL_FILE= ports/LEGAL CLEANFILES+= ${LEGAL} .if defined(NOPORTSCVS) ${LEGAL}: $${PORTSBASE}/${LEGAL_FILE} ${CP} ${PORTSBASE}/${LEGAL_FILE} ${LEGAL} .else ${LEGAL}: ${CVS} ${CVS_OPT} co -p ${LEGAL_FILE} > ${.TARGET} .endif .include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/en/copyright/copyright.sgml b/en/copyright/copyright.sgml index f4bf332b64..bdc1637f6f 100644 --- a/en/copyright/copyright.sgml +++ b/en/copyright/copyright.sgml @@ -1,24 +1,25 @@ - + %includes; ]> &header;

The FreeBSD Copyright

+

The FreeBSD Documentation License

Trademark Legend

The BSD Copyright

The BSD Daemon

FreeBSD Ports redistribution restrictions

GNU GENERAL PUBLIC LICENSE

GNU LIBRARY GENERAL PUBLIC LICENSE

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

Copyright 1994-2004 + The FreeBSD Project. + All rights reserved.

+ +

Redistribution and use in source (SGML DocBook) and 'compiled' + forms (SGML, HTML, PDF, PostScript, RTF and so forth) with or without + modification, are permitted provided that the following conditions are + met:

+ +
    +
  1. +

    Redistributions of source code (SGML DocBook) must retain the + above copyright notice, this list of conditions and the following + disclaimer as the first lines of this file unmodified.

    +
    2. + +
  2. +

    Redistributions in compiled form (transformed to other DTDs, + converted to PDF, PostScript, RTF and other formats) 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. +
+ +

THIS DOCUMENTATION IS PROVIDED BY THE FREEBSD DOCUMENTATION + 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 FREEBSD DOCUMENTATION PROJECT 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 DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + DAMAGE.

+ + Legal Home +&footer; + +