From 9d3d0b68886252e15afc7bc4accf1365a73cea0d Mon Sep 17 00:00:00 2001 From: Murray Stokely Date: Tue, 17 Jun 2003 20:00:28 +0000 Subject: [PATCH] Add Trademark Legend to the website. Specifically acknowledge the trademarks of the Open Group and Sun Microsystems, and use a standard broad paragraph to note that other designations may be trademarks that we are unaware of. --- en/copyright/Makefile | 3 ++- en/copyright/copyright.sgml | 3 ++- en/copyright/trademarks.sgml | 26 ++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 en/copyright/trademarks.sgml diff --git a/en/copyright/Makefile b/en/copyright/Makefile index ff812f84af..7fe3fc8629 100644 --- a/en/copyright/Makefile +++ b/en/copyright/Makefile @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/copyright/Makefile,v 1.11 2001/06/14 03:09:55 dd Exp $ +# $FreeBSD: www/en/copyright/Makefile,v 1.12 2001/10/29 10:14:31 murray Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -11,6 +11,7 @@ DOCS= license.sgml DOCS+= freebsd-license.sgml DOCS+= daemon.sgml DOCS+= copyright.sgml +DOCS+= trademarks.sgml INDEXLINK= copyright.html diff --git a/en/copyright/copyright.sgml b/en/copyright/copyright.sgml index 0fa482f0c6..a4402049ad 100644 --- a/en/copyright/copyright.sgml +++ b/en/copyright/copyright.sgml @@ -1,6 +1,6 @@ - + %includes; ]> @@ -11,6 +11,7 @@

The FreeBSD Copyright

+

Trademark Legend

The BSD Copyright

The BSD Daemon

FreeBSD Ports redistribution restrictions

diff --git a/en/copyright/trademarks.sgml b/en/copyright/trademarks.sgml new file mode 100644 index 0000000000..78f5893176 --- /dev/null +++ b/en/copyright/trademarks.sgml @@ -0,0 +1,26 @@ + + + + %includes; +]> + + +&header; + +

UNIX is a registered trademark of The Open Group in the US and + other countries.

+ +

Sun, Sun Microsystems, the Sun Logo, and Java are trademarks or + registered trademarks of Sun Microsystems, Inc. in the United States + and other countries.

+ +

Many of the designations used by manufacturers and sellers to + distinguish their products are claimed as trademarks. Where those + designations appear in this book, and the FreeBSD Project was aware + of the trademark claim, the designations have been followed by the + '™' symbol.

+ +&footer; + +