From bd88d2b862404317d8be61d62afc42c6dccb7ec7 Mon Sep 17 00:00:00 2001 From: Karsten Wade Date: Mon, 20 Feb 2006 21:13:23 +0000 Subject: Updated the legal notice hacks to match the content from the more canonical legalnotice-content-en.xml. --- common/legalnotice-content-p1-en.xml | 10 ++++------ common/legalnotice-content-p2-en.xml | 9 ++++----- common/legalnotice-content-p3-en.xml | 7 +++---- common/legalnotice-content-p6-en.xml | 15 +++++++++++++++ common/legalnotice-section-en.xml | 3 +++ 5 files changed, 29 insertions(+), 15 deletions(-) create mode 100644 common/legalnotice-content-p6-en.xml diff --git a/common/legalnotice-content-p1-en.xml b/common/legalnotice-content-p1-en.xml index 5257ad2..45b2609 100644 --- a/common/legalnotice-content-p1-en.xml +++ b/common/legalnotice-content-p1-en.xml @@ -9,10 +9,8 @@ ]> - 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 http://www.gnu.org/licenses/fdl.html. + Copyright (c) 2006 by Fedora Foundation and others. This material may be + distributed only subject to the terms and conditions set forth in the Open + Publication License, v1.0, available at http://www.opencontent.org/openpub/). diff --git a/common/legalnotice-content-p2-en.xml b/common/legalnotice-content-p2-en.xml index 857ebcb..88b8778 100644 --- a/common/legalnotice-content-p2-en.xml +++ b/common/legalnotice-content-p2-en.xml @@ -9,9 +9,8 @@ ]> - 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. + Garrett LeSage created the admonition graphics (note, tip, important, caution, + and warning). Tommy Reynolds Tommy.Reynolds@MegaCoder.com + created the callout graphics. They all may be freely redistributed with + documentation produced for the Fedora Project. diff --git a/common/legalnotice-content-p3-en.xml b/common/legalnotice-content-p3-en.xml index 06118de..f4f3291 100644 --- a/common/legalnotice-content-p3-en.xml +++ b/common/legalnotice-content-p3-en.xml @@ -9,8 +9,7 @@ ]> - Garrett LeSage created the admonition graphics (note, tip, important, caution, - and warning). Tommy Reynolds Tommy.Reynolds@MegaCoder.com - created the callout graphics. They all may be freely redistributed with - documentation produced for the &PROJECT;. + 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. diff --git a/common/legalnotice-content-p6-en.xml b/common/legalnotice-content-p6-en.xml new file mode 100644 index 0000000..450f179 --- /dev/null +++ b/common/legalnotice-content-p6-en.xml @@ -0,0 +1,15 @@ + + + +%FEDORA-ENTITIES-EN; + +]> + + + Documentation, as with software itself, may be subject to export control. + Read about Fedora Project export controls at http://fedoraproject.org/wiki/Legal/Export. + diff --git a/common/legalnotice-section-en.xml b/common/legalnotice-section-en.xml index d72a2f4..81086c8 100644 --- a/common/legalnotice-section-en.xml +++ b/common/legalnotice-section-en.xml @@ -34,4 +34,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude" /> + + -- cgit