LUDOC-5 fixed legal notice for Whamcloud modifications.

Following legal advice, this change adds context for modifications from
Whamcloud to be admitted into this CC 3.0 licensed document. Docbook includes
copyright and legalnotice elements and these have been used. The copyright
notice that was previously in the Oracle legalnotice has been moved to a
copyright element.

Signed-off-by: Richard Henwood <rhenwood@whamcloud.com>
Change-Id: I0b1584e8474a390136c052145aef5f2ba695c65a

diff --git a/index.xml b/index.xml
index e4f1519..f00ec9a 100644 (file)
--- a/index.xml
+++ b/index.xml
@@ -2,22 +2,23 @@
 <book version="5.0" xml:lang="en-US" xmlns="http://docbook.org/ns/docbook" xmlns:xl="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <info>
-      <title>Lustre 2.x Filesystem
-      
-      </title>
+      <title>Lustre 2.x Filesystem</title>
     <subtitle>Operations Manual</subtitle>
 
     <copyright>
         <year>2010</year>
         <year>2011</year>
-        <holder>Oracle and/or its affiliates.</holder>
+        <holder>Oracle and/or its affiliates. (The original version of this Operations Manual without the Whamcloud modifications.)</holder>
         </copyright>
     <copyright>
         <year>2011</year>
-        <holder>Whamcloud, Inc.</holder>
+        <holder>Whamcloud, Inc. (Whamcloud modifications to the original version of this Operations Manual.)</holder>
     </copyright>
 
-    <xi:include href="legalnotice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <legalnotice><para>Notwithstanding Whamcloud’s ownership of the copyright in the modifications to the original version of this Operations Manual, as between Whamcloud and Oracle, Oracle and/or its affiliates retain sole ownership of the copyright in the unmodified portions of this Operations Manual.</para></legalnotice>
+
+    <xi:include href="legalnoticeWhamcloud.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="legalnoticeOracle.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   </info>
 
 

diff --git a/legalnotice.xml b/legalnoticeOracle.xml
similarity index 98%
rename from legalnotice.xml
rename to legalnoticeOracle.xml
index bb53474..29f7dbd 100644 (file)
--- a/legalnotice.xml
+++ b/legalnoticeOracle.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <legalnotice xmlns="http://docbook.org/ns/docbook" xmlns:xl="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en-US">
-    <title>Important Notice</title>
 
-
-    <para>Copyright © 2011, Oracle and/or its affiliates. All rights reserved.</para>
+    <title>Important Notice from Oracle</title>
 
       <para>This software and related documentation are provided under a license agreement containing restrictions on use and disclosure and are protected by intellectual property laws. Except as expressly permitted in your license agreement or allowed by law, you may not use, copy, reproduce, translate, broadcast, modify, license, transmit, distribute, exhibit, perform, publish, or display any part, in any form, or by any means. Reverse engineering, disassembly, or decompilation of this software, unless required by law for interoperability, is prohibited.</para>
       <para>The information contained herein is subject to change without notice and is not warranted to be error-free. If you find any errors, please report them to us in writing.</para>

diff --git a/legalnoticeWhamcloud.xml b/legalnoticeWhamcloud.xml
new file mode 100644 (file)
index 0000000..eaff6f2
--- /dev/null
+++ b/legalnoticeWhamcloud.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<legalnotice xmlns="http://docbook.org/ns/docbook" xmlns:xl="http://www.w3.org/1999/xlink" version="5.0" xml:lang="en-US">
+    <title>Important Notice from Whamcloud </title>
+
+    <para>THE ORIGINAL LUSTRE 2.x FILESYSTEM: ORACLE OPERATIONS MANUAL HAS BEEN MODIFIED: THIS OPERATIONS MANUAL IS A MODIFIED VERSION OF, AND IS DERIVED FROM, THE LUSTRE 2.0 FILESYSTEM: OPERATIONS MANUAL PUBLISHED BY ORACLE AND AVAILABLE AT [WWW.LUSTRE.ORG].  THE MODIFICATIONS (collectively, the “Modifications”) HAVE BEEN MADE BY WHAMCLOUD, INC. (“Whamcloud”).  ORACLE AND ITS AFFILIATES HAVE NOT REVIEWED, APPROVED, SPONSORED, OR ENDORSED THIS MODIFIED OPERATIONS MANUAL, OR ENDORSED WHAMCLOUD, AND ORACLE AND ITS AFFILIATES ARE NOT RESPONSIBLE OR LIABLE FOR ANY MODIFICATIONS THAT WHAMCLOUD HAS MADE TO THE ORIGINAL OPERATIONS MANUAL.</para>
+
+    <para>NOTHING IN THIS MODIFIED OPERATIONS MANUAL IS INTENDED TO AFFECT THE NOTICE PROVIDED BY ORACLE BELOW IN RESPECT OF THE ORIGINAL OPERATIONS MANUAL AND SUCH ORACLE NOTICE CONTINUES TO APPLY TO THIS MODIFIED OPERATIONS MANUAL EXCEPT FOR THE MODIFICATIONS; THIS WHAMCLOUD NOTICE SHALL APPLY TO THE MODIFICATIONS.  AS BETWEEN YOU AND ORACLE: (I) NOTHING IN THIS WHAMCLOUD NOTICE IS INTENDED TO AFFECT THE TERMS OF THE ORACLE NOTICE BELOW; AND (II) IN THE EVENT OF ANY CONFLICT BETWEEN THE TERMS OF THIS WHAMCLOUD NOTICE AND THE TERMS OF THE ORACLE NOTICE, THE ORACLE NOTICE SHALL PREVAIL.
+    </para>
+
+    <para>Your use of any Whamcloud software shall be governed by separate license terms containing restrictions on use and disclosure and are protected by intellectual property laws.</para>
+
+    <para>The information contained herein is subject to change without notice and is not warranted to be error-free.  If you find any errors, please report them to us in writing.</para>
+
+    <para>Whamcloud is a trademark of Whamcloud.  Other names may be trademarks of their respective owners.</para>
+
+    <para>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 United States License. To view a copy of this license and obtain more information about Creative Commons licensing, visit Creative Commons Attribution-Share Alike 3.0 United States [http://creativecommons.org/licenses/by-sa/3.0/us] or send a letter to Creative Commons, 171 2nd Street, Suite 300, San Francisco, California 94105, USA.</para>
+
+</legalnotice>