diff options
-rw-r--r-- | common/legalnotice-content-en.xml | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/common/legalnotice-content-en.xml b/common/legalnotice-content-en.xml index e57cad7..2f1555b 100644 --- a/common/legalnotice-content-en.xml +++ b/common/legalnotice-content-en.xml @@ -11,21 +11,12 @@ <section id="sn-legalnotice-content"> <title>Legal Notice</title> --> - <para> - Permission is granted to copy, distribute, and/or modify this document under - the terms of the GNU Free Documentation License, Version 1.2 or any later - version published by the Free Software Foundation; with no Invariant - Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the - license is available at <ulink - url="http://www.gnu.org/licenses/fdl.html">http://www.gnu.org/licenses/fdl.html</ulink>. - </para> <para> - This document may be copied and distributed in any medium, either - commercially or noncommercially, provided that the GNU Free Documentation - License (FDL), the copyright notices, and the license notice saying the GNU - FDL applies to the document are reproduced in all copies, and that you add - no other conditions whatsoever to those of the GNU FDL. + Copyright (c) 2006 by Fedora Foundation. This material may be distributed + only subject to the terms and conditions set forth in the Open Publication + License, v1.0 or later (the latest version is presently available at <ulink + url="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</ulink>)." </para> <para> @@ -47,6 +38,12 @@ </para> --> <para> + FEDORA, FEDORA PROJECT, and the Fedora Logo are trademarks of Red Hat, Inc., + are registered or pending registration in the U.S. and other countries, and + are used here under license to the Fedora Foundation. + </para> + + <para> Red Hat and the Red Hat "Shadow Man" logo are registered trademarks of Red Hat, Inc. in the United States and other countries. </para> @@ -55,4 +52,20 @@ All other trademarks and copyrights referred to are the property of their respective owners. </para> + + <para> + Documentation, as with software itself, may be subject to export control. + Read about Fedora Project export controls at <ulink + url="http://fedoraproject.org/wiki/Legal/Export">http://fedoraproject.org/wiki/Legal/Export</ulink>. + </para> <!-- </section> --> +<!-- + + + + + + + + +--> |