From owner-svn-doc-projects@FreeBSD.ORG Thu Jun 21 15:43:47 2012 Return-Path: Delivered-To: svn-doc-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5BBE9106566B; Thu, 21 Jun 2012 15:43:47 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 477918FC15; Thu, 21 Jun 2012 15:43:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5LFhlvH021606; Thu, 21 Jun 2012 15:43:47 GMT (envelope-from gabor@svn.freebsd.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5LFhluJ021604; Thu, 21 Jun 2012 15:43:47 GMT (envelope-from gabor@svn.freebsd.org) Message-Id: <201206211543.q5LFhluJ021604@svn.freebsd.org> From: Gabor Kovesdan Date: Thu, 21 Jun 2012 15:43:47 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org X-SVN-Group: doc-projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r39081 - projects/sgml2xml/share/sgml X-BeenThere: svn-doc-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for doc projects trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jun 2012 15:43:47 -0000 Author: gabor Date: Thu Jun 21 15:43:46 2012 New Revision: 39081 URL: http://svn.freebsd.org/changeset/doc/39081 Log: - Merge legalnotice.sgml to trademarks.ent since the contents are related Approved by: doceng (implicit) Modified: projects/sgml2xml/share/sgml/trademarks.ent Modified: projects/sgml2xml/share/sgml/trademarks.ent ============================================================================== --- projects/sgml2xml/share/sgml/trademarks.ent Thu Jun 21 15:42:34 2012 (r39080) +++ projects/sgml2xml/share/sgml/trademarks.ent Thu Jun 21 15:43:46 2012 (r39081) @@ -423,3 +423,80 @@ Coverity, Inc."> and the FreeBSD Project was aware of the trademark claim, the designations have been followed by the ™ or the ® symbol."> + + + 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: + + + + 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. + + + + 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. + + + + + 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. + + +'> + + + + FreeBSD is a registered trademark of The FreeBSD Foundation. + + UNIX is a registered trademark of The Open Group in the US and + other countries. + + Sun, Sun Microsystems, SunOS, Solaris, + Java, JDK, and OpenJDK are trademarks + or registered trademarks of Sun Microsystems, Inc. in the United + States and other countries. + + + + Apple and QuickTime are trademarks of Apple Computer, Inc., + registered in the U.S. and other countries. + + Macromedia and Flash are trademarks or registered + trademarks of Macromedia, Inc. in the United States and/or other + countries. + + Microsoft, Windows, and Windows Media are either registered + trademarks or trademarks of Microsoft Corporation in the United + States and/or other countries. + + PartitionMagic is a registered trademark of PowerQuest + Corporation in the United States and/or 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. + +'>