Branch 'f12-temp' - en-US/fedora-release-notes.omf.in en-US/Legal.xml en-US/Revision_History.xml

[John J. McDonough]

 en-US/Legal.xml                   |    2 +-
 en-US/Revision_History.xml        |   13 +++++++++++++
 en-US/fedora-release-notes.omf.in |    6 +++---
 3 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 20e439e3b87b4e65c1335cd269c64e8c3f989a5e
Author: John J. McDonough <jjmcd at fedoraproject.org>
Date:   Fri Nov 20 21:18:56 2009 -0500

    Update license in Legal.xml

diff --git a/en-US/Legal.xml b/en-US/Legal.xml
index 4c41d3d..69c0ddf 100644
--- a/en-US/Legal.xml
+++ b/en-US/Legal.xml
@@ -10,7 +10,7 @@
 	<section id="sect-Release_Notes-Legal_Information-License">
 		<title>License</title>
 		<para>
-			The Fedora License Agreement is included with each release. A reference version is available on the Fedora Project website: <ulink type="http" url="http://fedoraproject.org/wiki/Legal/Licenses/LicenseAgreement">http://fedoraproject.org/wiki/Legal/Licenses/LicenseAgreement</ulink> This document is licensed under the terms of the Open Publication License v1.0 without options: <ulink type="http" url="http://fedoraproject.org/wiki/Legal/Licenses/OPL">http://fedoraproject.org/wiki/Legal/Licenses/OPL</ulink>
+			The Fedora License Agreement is included with each release. A reference version is available on the Fedora Project website: <ulink type="http" url="http://fedoraproject.org/wiki/Legal/Licenses/LicenseAgreement">http://fedoraproject.org/wiki/Legal/Licenses/LicenseAgreement</ulink> The text of and illustrations in this document are licensed by Red Hat under a Creative Commons Attribution-Share Alike 3.0 Unported license ("CC-BY-SA"). An explanation of CC-BY-SA is available at <ulink type="http" url="http://creativecommons.org/licenses/by-sa/3.0/" />. The original authors of this document, and Red Hat, designate the Fedora Project as the "Attribution Party" for purposes of CC-BY-SA. In accordance with CC-BY-SA, if you distribute this document or an adaptation of it, you must provide the URL for the original version.
 		</para>
 	</section>
 	
diff --git a/en-US/Revision_History.xml b/en-US/Revision_History.xml
index 2a15d65..23d6f59 100644
--- a/en-US/Revision_History.xml
+++ b/en-US/Revision_History.xml
@@ -10,6 +10,19 @@
     <itemizedlist>
       <listitem>
 	<para>
+	  0.11
+	  Fri 20 Nov 2009
+	  John McDonough
+	  <email>jjmcd at fedoraproject.org</email>
+	  <simplelist>
+	    <member>
+	      Update license in Legal appendix
+	    </member>
+	  </simplelist>
+	</para>
+      </listitem>
+      <listitem>
+	<para>
 	  0.10
 	  Fri 20 Nov 2009
 	  Rüdiger Landmann
diff --git a/en-US/fedora-release-notes.omf.in b/en-US/fedora-release-notes.omf.in
index ca8601d..7218a84 100644
--- a/en-US/fedora-release-notes.omf.in
+++ b/en-US/fedora-release-notes.omf.in
@@ -20,7 +20,7 @@
       description="fedora-release-notes- at RELEASE@"/>
     <subject category="General|Linux|Distributions|Other"/>
     <description>
-      This document details the release notes for Fedora 11.
+      This document details the release notes for Fedora @RELEASE at .
     </description>
     <type>
       About
@@ -29,7 +29,7 @@
     <identifier url="file:///usr/share/gnome/help/fedora-release-notes/@LANG@/Release_Notes.xml"/>
     <language code="@LANGC@"/>
     <relation seriesid="7a5d3ea2-2a1e-11da-86a3-8ea47a4bb227"/>
-    <rights type="OPL" license="http://opencontent.org/openpub/"
-      license.version="1.0"/>
+    <rights type="CC-BY-SA" license="http://creativecommons.org/licenses/by-sa/3.0/"
+      license.version="3.0"/>
   </resource>
 </omf>