svn commit: r39081 - projects/sgml2xml/share/sgml

[Gabor Kovesdan]

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.</para>">
   and the FreeBSD Project was aware of the trademark claim, the
   designations have been followed by the <quote>&trade;</quote> or the
   <quote>&reg;</quote> symbol.</para>">
+
+<!ENTITY legalnotice '
+<legalnotice id="legalnotice">
+  <para>Redistribution and use in source (SGML DocBook) and &apos;compiled&apos;
+    forms (SGML, HTML, PDF, PostScript, RTF and so forth) with or without
+    modification, are permitted provided that the following conditions are
+    met:</para>
+
+  <orderedlist>
+    <listitem>
+      <para>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.</para>
+    </listitem>
+
+    <listitem>
+      <para>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.</para>
+    </listitem>
+  </orderedlist>
+
+  <important>
+    <para>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.</para>
+  </important>
+</legalnotice>
+'>
+
+<!ENTITY trademarks '
+<legalnotice id="trademarks" role="trademarks">
+
+  <para>FreeBSD is a registered trademark of The FreeBSD Foundation.</para>
+
+  <para>UNIX is a registered trademark of The Open Group in the US and
+    other countries.</para>
+
+  <para>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.</para>
+
+<!-- Product Trademarks -->
+
+  <para>Apple and QuickTime are trademarks of Apple Computer, Inc.,
+    registered in the U.S. and other countries.</para>
+
+  <para>Macromedia and Flash are trademarks or registered
+    trademarks of Macromedia, Inc. in the United States and/or other
+    countries.</para>
+
+  <para>Microsoft, Windows, and Windows Media are either registered
+    trademarks or trademarks of Microsoft Corporation in the United
+    States and/or other countries.</para>
+
+  <para>PartitionMagic is a registered trademark of PowerQuest
+    Corporation in the United States and/or other countries.</para>
+
+  <para>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 &trade; symbol.</para>
+</legalnotice>
+'>