update CC licenses from creativecommons.org/licenses

marytts · Nov 13, 2013 · 06f1a5c · 06f1a5c
1 parent b94c3bd
commit 06f1a5c
Show file tree

Hide file tree

Showing 4 changed files with 122 additions and 32 deletions.
diff --git a/doc/licenses/by-nc-sa-3.0.html b/doc/licenses/by-nc-sa-3.0.html
@@ -1,30  1,61 @@
 <html>
 <body>
 
-<h1>Creative Commons License: Attribution-Noncommercial-Share Alike 3.0 Unported</h1>
 <h1>Creative Commons License Attribution-NonCommercial-ShareAlike 3.0 Unported (CC BY-NC-SA 3.0)</h1>
 <p>
 This is a human-readable summary of the Legal Code.
 </p>
 <p>
 You are free:
 <ul>
   <li>
-    to Share - to copy, distribute and transmit the work
     to Share &mdash; to copy, distribute and transmit the work
   </li>
   <li>
-    to Remix - to adapt the work
     to Remix &mdash; to adapt the work
   </li>
 </ul>
 </p>
 <p>
 Under the following conditions:
 <ul>
-<li>
-      Attribution - You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).
-</li>
-<li>
-      Noncommercial - You may not use this work for commercial purposes.
-</li>
-<li>
-      Share Alike - If you alter, transform, or build upon this work, you may distribute the resulting work only under the same or similar license to this one.
-</li>
   <li>
     Attribution &mdash; You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).
   </li>
   <li>
     Noncommercial &mdash; You may not use this work for commercial purposes.
   </li>
   <li>
     Share Alike &mdash; If you alter, transform, or build upon this work, you may distribute the resulting work only under the same or similar license to this one.
   </li>
 </ul>
 </p>
 <p>
 With the understanding that:
 <ul>
   <li>
     Waiver &mdash; Any of the above conditions can be waived if you get permission from the copyright holder.
   </li>
   <li>
     Public Domain &mdash; Where the work or any of its elements is in the public domain under applicable law, that status is in no way affected by the license.
   </li>
   <li>
     Other Rights &mdash; In no way are any of the following rights affected by the license:
     <ul>
       <li>
         Your fair dealing or fair use rights, or other applicable copyright exceptions and limitations;
       </li>
       <li>
         The author's moral rights;
       </li>
       <li>
         Rights other persons may have either in the work itself or in how the work is used, such as publicity or privacy rights.
       </li>
     </ul>
   </li>
   <li>
     Notice &mdash; For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link to this web page.
   </li>
 </ul>
 </p>
 <p>

diff --git a/doc/licenses/by-nc-sa-3.0.txt b/doc/licenses/by-nc-sa-3.0.txt
@@ -1,16  1,28 @@
-Creative Commons License Attribution-Noncommercial-Share Alike 3.0 Unported
 Creative Commons License Attribution-NonCommercial-ShareAlike 3.0 Unported (CC BY-NC-SA 3.0)
 
 This is a human-readable summary of the Legal Code.
 
 You are free:
 
-    * to Share - to copy, distribute and transmit the work
-    * to Remix - to adapt the work
     to Share — to copy, distribute and transmit the work
     to Remix — to adapt the work
 
 Under the following conditions:
 
-      Attribution - You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).
     Attribution — You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).
 
     Noncommercial — You may not use this work for commercial purposes.
 
     Share Alike — If you alter, transform, or build upon this work, you may distribute the resulting work only under the same or similar license to this one.
 
-      Noncommercial - You may not use this work for commercial purposes.
 With the understanding that:
 
-      Share Alike - If you alter, transform, or build upon this work, you may distribute the resulting work only under the same or similar license to this one.
     Waiver — Any of the above conditions can be waived if you get permission from the copyright holder.
     Public Domain — Where the work or any of its elements is in the public domain under applicable law, that status is in no way affected by the license.
     Other Rights — In no way are any of the following rights affected by the license:
         Your fair dealing or fair use rights, or other applicable copyright exceptions and limitations;
         The author's moral rights;
         Rights other persons may have either in the work itself or in how the work is used, such as publicity or privacy rights.
     Notice — For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link to this web page.
 
-For details and the full license text, see http://creativecommons.org/licenses/by-nc-sa/3.0/
 For details and the full license text, see http://creativecommons.org/licenses/by-nc-sa/3.0/
diff --git a/doc/licenses/by-nd-3.0.html b/doc/licenses/by-nd-3.0.html
@@ -1,24  1,58 @@
 <html>
 <body>
 
-<h1>Creative Commons License: Attribution-No Derivative Works 3.0 Unported</h1>
 <h1>Creative Commons License Attribution-NoDerivs 3.0 Unported (CC BY-ND 3.0)</h1>
 <p>
 This is a human-readable summary of the Legal Code.
 </p>
 <p>
 You are free:
 <ul>
   <li>
-    to Share - to copy, distribute and transmit the work
     to Share &mdash; to copy, distribute and transmit the work
   </li>
   <li>
     to make commercial use of the work
   </li>
 </ul>
 </p>
 <p>
 Under the following conditions:
 <ul>
-<li>
-      Attribution - You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).
-</li>
-<li>
-      No Derivative Works - You may not alter, transform, or build upon this work.
-</li>
   <li>
     Attribution &mdash; You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).
   </li>
   <li>
     No Derivative Works — You may not alter, transform, or build upon this work.
   </li>
 </ul>
 </p>
 <p>
 With the understanding that:
 <ul>
   <li>
     Waiver &mdash; Any of the above conditions can be waived if you get permission from the copyright holder.
   </li>
   <li>
     Public Domain &mdash; Where the work or any of its elements is in the public domain under applicable law, that status is in no way affected by the license.
   </li>
   <li>
     Other Rights &mdash; In no way are any of the following rights affected by the license:
     <ul>
       <li>
         Your fair dealing or fair use rights, or other applicable copyright exceptions and limitations;
       </li>
       <li>
         The author's moral rights;
       </li>
       <li>
         Rights other persons may have either in the work itself or in how the work is used, such as publicity or privacy rights.
       </li>
     </ul>
   </li>
   <li>
     Notice &mdash; For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link to this web page.
   </li>
 </ul>
 </p>
 <p>

diff --git a/doc/licenses/by-nd-3.0.txt b/doc/licenses/by-nd-3.0.txt
@@ -1,13  1,26 @@
-Creative Commons License Attribution-No Derivative Works 3.0 Unported
 Creative Commons License Attribution-NoDerivs 3.0 Unported (CC BY-ND 3.0)
 
 This is a human-readable summary of the Legal Code.
 
 You are free:
 
-    * to Share - to copy, distribute and transmit the work
     to Share — to copy, distribute and transmit the work
     to make commercial use of the work
 
 Under the following conditions:
 
-      Attribution - You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).
     Attribution — You must attribute the work in the manner specified by the author or licensor (but not in any way that suggests that they endorse you or your use of the work).
 
     No Derivative Works — You may not alter, transform, or build upon this work.
 
 With the understanding that:
 
-      No Derivative Works - You may not alter, transform, or build upon this work.
     Waiver — Any of the above conditions can be waived if you get permission from the copyright holder.
     Public Domain — Where the work or any of its elements is in the public domain under applicable law, that status is in no way affected by the license.
     Other Rights — In no way are any of the following rights affected by the license:
         Your fair dealing or fair use rights, or other applicable copyright exceptions and limitations;
         The author's moral rights;
         Rights other persons may have either in the work itself or in how the work is used, such as publicity or privacy rights.
     Notice — For any reuse or distribution, you must make clear to others the license terms of this work. The best way to do this is with a link to this web page.
 
-For details and the full license text, see http://creativecommons.org/licenses/by-nd/3.0/
 For details and the full license text, see http://creativecommons.org/licenses/by-nd/3.0/