Merge pull request #1149 from ryancdotorg/master

proposed CC0 1.1 w/o gendered pronouns

Author: TimidRobot

README.md

@@ -80,7 +80,7 @@ CC BY-NC 4.0 | [Source File][cc-by-nc-source] | [Legal Code][cc-by-nc-legalcode]
 CC BY-ND 4.0 | [Source File][cc-by-nd-source] | [Legal Code][cc-by-nd-legalcode] | [Deed][cc-by-nd-deed] | [RDF][cc-by-nd-rdf]
 CC BY-SA 4.0 | [Source File][cc-by-sa-source] | [Legal Code][cc-by-sa-legalcode] | [Deed][cc-by-sa-deed] | [RDF][cc-by-sa-rdf]
 CC BY 4.0 | [Source File][cc-by-source] | [Legal Code][cc-by-legalcode] | [Deed][cc-by-deed] | [RDF][cc-by-rdf]
-CC0 1.0 | [Source File][cc-zero-source] | [Legal Code][cc-zero-legalcode] | [Deed][cc-zero-deed] | [RDF][cc-zero-rdf]
+CC0 1.1 | [Source File][cc-zero-source] | [Legal Code][cc-zero-legalcode] | [Deed][cc-zero-deed] | [RDF][cc-zero-rdf]
 
 [cc-by-nc-nd-source]: docroot/legalcode/by-nc-nd_4.0.html
 [cc-by-nc-nd-legalcode]: https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode.en
@@ -112,10 +112,10 @@ CC0 1.0 | [Source File][cc-zero-source] | [Legal Code][cc-zero-legalcode] | [Dee
 [cc-by-deed]: https://creativecommons.org/licenses/by/4.0/deed.en
 [cc-by-rdf]: https://creativecommons.org/licenses/by/4.0/rdf
 
-[cc-zero-source]: docroot/legalcode/zero_1.0.html
-[cc-zero-legalcode]: https://creativecommons.org/publicdomain/zero/1.0/legalcode.en
-[cc-zero-deed]: https://creativecommons.org/publicdomain/zero/1.0/deed.en
-[cc-zero-rdf]: https://creativecommons.org/publicdomain/zero/1.0/rdf
+[cc-zero-source]: docroot/legalcode/zero_1.1.html
+[cc-zero-legalcode]: https://creativecommons.org/publicdomain/zero/1.1/legalcode.en
+[cc-zero-deed]: https://creativecommons.org/publicdomain/zero/1.1/deed.en
+[cc-zero-rdf]: https://creativecommons.org/publicdomain/zero/1.1/rdf
 
 
 ## Installation

config/apache.conf

@@ -141,6 +141,7 @@
     # Fixes this repercussions of this bug:
     # http://code.creativecommons.org/issues/issue898
     RewriteRule ^/licenses/CC0/1.0(.*)$ /publicdomain/zero/1.0$1 [L,R=301]
+    RewriteRule ^/licenses/CC0/1.1(.*)$ /publicdomain/zero/1.1$1 [L,R=301]
 
     # Legalcode rewrites
 	# FIXME: eval whether we should use the LHS as the actual file structure so we don't need the rewrites
@@ -197,6 +198,7 @@
     RewriteRule ^/licenses/MIT/legalcode http://opensource.org/licenses/mit-license.php [L,R]
     RewriteRule ^/licenses/publicdomain/1.0(.*)$ ${proto}://${host}/licenses/publicdomain/ [L,R=301]
     RewriteRule ^/licenses/zero/1.0/(.*) /publicdomain/zero/1.0/$1 [L,R=301]
+    RewriteRule ^/licenses/zero/1.1/(.*) /publicdomain/zero/1.1/$1 [L,R=301]
     RewriteRule ^/licesne(.*)$ ${proto}://${host}/choose$1 [L,R=301]
     RewriteRule ^/public_domain ${proto}://${host}/publicdomain/ [R=301,L]
     RewriteRule ^/licenses/(.*) /ccengine-fcgi/licenses/$1 [PT,L]

config/creativecommons.org.conf

@@ -119,6 +119,7 @@
 
     # 2019 Redirects
     Redirect permanent /licenses/cc0/1.0/ /publicdomain/zero/1.0/
+    Redirect permanent /licenses/cc0/1.1/ /publicdomain/zero/1.1/
 
     # 2018 Redirects
 
@@ -338,9 +339,11 @@
     # Fixes this repercussions of this bug:
     # http://code.creativecommons.org/issues/issue898
     RewriteRule ^/licenses/CC0/1.0(.*)$ /publicdomain/zero/1.0$1 [L,R=301]
+    RewriteRule ^/licenses/CC0/1.1(.*)$ /publicdomain/zero/1.1$1 [L,R=301]
 
     # Address https://github.com/creativecommons/creativecommons.org/issues/563
     RewriteRule ^/publicdomain/zero/1.0/deed.en/$ /publicdomain/zero/1.0/deed.en [L,R=301]
+    RewriteRule ^/publicdomain/zero/1.1/deed.en/$ /publicdomain/zero/1.1/deed.en [L,R=301]
 
     # NOTE: These rewrites are needed on the license box but not on the main box
 
@@ -393,6 +396,7 @@
     #RewriteRule ^/licenses/MIT/legalcode http://opensource.org/licenses/mit-license.php [L,R]
     #RewriteRule ^/licenses/publicdomain/1.0(.*)$ http://creativecommons.org/licenses/publicdomain/ [L,R=301]
     #RewriteRule ^/licenses/zero/1.0/(.*) /publicdomain/zero/1.0/$1 [L,R=301]
+    #RewriteRule ^/licenses/zero/1.1/(.*) /publicdomain/zero/1.1/$1 [L,R=301]
     #RewriteRule ^/licesne(.*)$ http://creativecommons.org/choose$1 [L,R=301]
     #RewriteRule ^/public_domain http://creativecommons.org/publicdomain/ [R=301,L]
     # ##RewriteRule ^/licenses/(.*) /ccengine-fcgi/licenses/$1 [PT,L]

config/default-ssl.conf

@@ -140,6 +140,7 @@ AllowOverride All
     # Fixes this repercussions of this bug:
     # http://code.creativecommons.org/issues/issue898
     RewriteRule ^/licenses/CC0/1.0(.*)$ /publicdomain/zero/1.0$1 [L,R=301]
+    RewriteRule ^/licenses/CC0/1.1(.*)$ /publicdomain/zero/1.1$1 [L,R=301]
 
     # Legalcode rewrites
     	# FIXME: eval whether we should use the LHS as the actual file structure so we don't need the rewrites
@@ -196,6 +197,7 @@ AllowOverride All
     RewriteRule ^/licenses/MIT/legalcode http://opensource.org/licenses/mit-license.php [L,R]
     RewriteRule ^/licenses/publicdomain/1.0(.*)$ http://creativecommons.org/licenses/publicdomain/ [L,R=301]
     RewriteRule ^/licenses/zero/1.0/(.*) /publicdomain/zero/1.0/$1 [L,R=301]
+    RewriteRule ^/licenses/zero/1.1/(.*) /publicdomain/zero/1.1/$1 [L,R=301]
     RewriteRule ^/licesne(.*)$ http://creativecommons.org/choose$1 [L,R=301]
     RewriteRule ^/public_domain http://creativecommons.org/publicdomain/ [R=301,L]
     RewriteRule ^/licenses/(.*) /ccengine-fcgi/licenses/$1 [PT,L]

config/livechooser/000-default.conf

@@ -158,6 +158,7 @@
     # Fixes this repercussions of this bug:
     # http://code.creativecommons.org/issues/issue898
     RewriteRule ^/licenses/CC0/1.0(.*)$ /publicdomain/zero/1.0$1 [L,R=301]
+    RewriteRule ^/licenses/CC0/1.1(.*)$ /publicdomain/zero/1.1$1 [L,R=301]
 
     # Legalcode rewrites
     # FIXME: eval whether we should use the LHS as the actual file structure so we don't need the rewrites
@@ -214,6 +215,7 @@
     RewriteRule ^/licenses/MIT/legalcode http://opensource.org/licenses/mit-license.php [L,R]
     RewriteRule ^/licenses/publicdomain/1.0(.*)$ http://creativecommons.org/licenses/publicdomain/ [L,R=301]
     RewriteRule ^/licenses/zero/1.0/(.*) /publicdomain/zero/1.0/$1 [L,R=301]
+    RewriteRule ^/licenses/zero/1.1/(.*) /publicdomain/zero/1.1/$1 [L,R=301]
     RewriteRule ^/licesne(.*)$ http://creativecommons.org/choose$1 [L,R=301]
     RewriteRule ^/public_domain http://creativecommons.org/publicdomain/ [R=301,L]
     RewriteRule ^/licenses/(.*) /ccengine-fcgi/licenses/$1 [PT,L]

config/livelicenses/000-default.conf

@@ -193,16 +193,22 @@
     # Fixes this repercussions of this bug:
     # http://code.creativecommons.org/issues/issue898
     RewriteRule ^/licenses/cc0/1.0(.*)$ https://creativecommons.org/publicdomain/zero/1.0$1 [L,R=301]
+    RewriteRule ^/licenses/cc0/1.1(.*)$ https://creativecommons.org/publicdomain/zero/1.1$1 [L,R=301]
     RewriteRule ^/licenses/CC0/1.0(.*)$ https://creativecommons.org/publicdomain/zero/1.0$1 [L,R=301]
+    RewriteRule ^/licenses/CC0/1.1(.*)$ https://creativecommons.org/publicdomain/zero/1.1$1 [L,R=301]
     # And #694
     RewriteRule ^/licenses/zero/1.0/(.*)$ https://creativecommons.org/publicdomain/zero/1.0/$1 [L,R=301]
+    RewriteRule ^/licenses/zero/1.1/(.*)$ https://creativecommons.org/publicdomain/zero/1.1/$1 [L,R=301]
 
     # Address https://github.com/creativecommons/creativecommons.org/issues/563
     RewriteRule ^/publicdomain/zero/1.0/deed.en/$ https://creativecommons.org/publicdomain/zero/1.0/deed.en [L,R=301]
+    RewriteRule ^/publicdomain/zero/1.1/deed.en/$ https://creativecommons.org/publicdomain/zero/1.1/deed.en [L,R=301]
 
     # Resolve https://github.com/creativecommons/tech-support/issues/359
     RewriteRule ^/publicdomain/mark/1.0/index.php https://creativecommons.org/publicdomain/mark/1.0/ [L,R=301]
+    RewriteRule ^/publicdomain/mark/1.1/index.php https://creativecommons.org/publicdomain/mark/1.1/ [L,R=301]
     RewriteRule ^/publicdomain/zero/1.0/index.php https://creativecommons.org/publicdomain/zero/1.0/ [L,R=301]
+    RewriteRule ^/publicdomain/zero/1.1/index.php https://creativecommons.org/publicdomain/zero/1.1/ [L,R=301]
 
     # Legalcode rewrites
     # FIXME: eval whether we should use the LHS as the actual file structure so we don't need the rewrites

docroot/includes/errata.js

@@ -8,7 +8,7 @@
 
   You should have received a copy of the CC0 Public Domain Dedication along
   with this software. If not, see: 
-  http://creativecommons.org/publicdomain/zero/1.0/
+  http://creativecommons.org/publicdomain/zero/1.1/
  */
 
 /* Fancy script loader module bootstrapper thing. */

docroot/legalcode/zero_1.1.html

@@ -0,0 +1,240 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+
+  <title>Creative Commons Legal Code</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+  <meta http-equiv="content-type" content=
+  "text/html; charset=utf-8" />
+  <link rel="stylesheet" type="text/css" href=
+  "//creativecommons.org/includes/deed3.css" media="screen" />
+  <link rel="stylesheet" type="text/css" href=
+  "//creativecommons.org/includes/deed3-print.css" media=
+  "print" />
+  <!--[if lt IE 7]><link rel="stylesheet" type="text/css" href="https://creativecommons.org/includes/deed3-ie.css" media="screen" /><![endif]-->
+
+<script type="text/javascript" src=
+"https://creativecommons.org/includes/errata.js">
+</script>
+</head>
+
+<body>
+  <p align="center" id="header"><a href=
+  "//creativecommons.org/">Creative Commons</a></p>
+<!-- Legalcode Start - DO NOT DELETE -->
+  <div id="deed" class="green">
+    <div id="deed-head">
+      <div id="cc-logo">
+        <img src=
+        "//creativecommons.org/images/deed/cc-logo.jpg" alt=
+        "" />
+      </div>
+
+      <h1><span>Creative Commons Legal Code</span></h1>
+
+      <div id="deed-license">
+        <h2>CC0 1.1 Universal</h2>
+      </div>
+    </div>
+
+    <div id="deed-main">
+      <div id="deed-main-content">
+        <img src=
+        "//creativecommons.org/images/international/unported.png"
+        alt="" />
+        <div id="deed-disclaimer">
+            <div class="summary">
+        Official translations of this legal tool are available <a href="#languages">in other languages</a>.
+            </div>
+        </div>
+
+        <blockquote>
+      CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT
+      PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES
+      NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS
+      PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE
+      COMMONS MAKES NO WARRANTIES REGARDING THE USE OF THIS
+      DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND
+      DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM THE USE OF
+      THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+      HEREUNDER.
+        </blockquote>
+
+        <h3><em>Statement of Purpose</em></h3>
+
+    <p>The laws of most jurisdictions throughout the world
+    automatically confer exclusive Copyright and Related Rights
+    (defined below) upon the creator and subsequent owner(s) (each
+    and all, an "owner") of an original work of authorship and/or
+    a database (each, a "Work").</p>
+
+    <p>Certain owners wish to permanently relinquish those rights
+    to a Work for the purpose of contributing to a commons of
+    creative, cultural and scientific works ("Commons") that the
+    public can reliably and without fear of later claims of
+    infringement build upon, modify, incorporate in other works,
+    reuse and redistribute as freely as possible in any form
+    whatsoever and for any purposes, including without limitation
+    commercial purposes. These owners may contribute to the
+    Commons to promote the ideal of a free culture and the further
+    production of creative, cultural and scientific works, or to
+    gain reputation or greater distribution for their Work in part
+    through the use and efforts of others.</p>
+
+    <p>For these and/or other purposes and motivations, and
+    without any expectation of additional consideration or
+    compensation, the person associating CC0 with a Work (the
+    "Affirmer"), to the extent that they are an owner of
+    Copyright and Related Rights in the Work, voluntarily elects
+    to apply CC0 to the Work and publicly distribute the Work
+    under its terms, with knowledge of their Copyright and
+    Related Rights in the Work and the meaning and intended legal
+    effect of CC0 on those rights.</p>
+
+        <p><strong>1. Copyright and Related Rights.</strong>
+       A Work made available under CC0 may be protected by
+       copyright and related or neighboring rights ("Copyright and
+       Related Rights"). Copyright and Related Rights include, but
+       are not limited to, the following:
+    </p>
+
+        <ol type="i">
+      <li>the right to reproduce, adapt, distribute, perform,
+      display, communicate, and translate a Work;</li>
+
+      <li> moral rights retained by the original author(s) and/or
+      performer(s);</li>
+
+      <li>publicity and privacy rights pertaining to a person's
+      image or likeness depicted in a Work;</li>
+
+      <li>rights protecting against unfair competition in regards
+      to a Work, subject to the limitations in paragraph 4(a),
+      below;</li>
+
+      <li>rights protecting the extraction, dissemination, use and
+      reuse of data in a Work;</li>
+
+      <li>database rights (such as those arising under Directive
+      96/9/EC of the European Parliament and of the Council of 11
+      March 1996 on the legal protection of databases, and under
+      any national implementation thereof, including any amended
+      or successor version of such directive); and</li>
+
+      <li>other similar, equivalent or corresponding rights
+      throughout the world based on applicable law or treaty, and
+      any national implementations thereof.</li>
+
+    </ol>
+
+        <p><strong>2. Waiver.</strong> To the greatest extent
+        permitted by, but not in contravention of, applicable law,
+        Affirmer hereby overtly, fully, permanently, irrevocably and
+        unconditionally waives, abandons, and surrenders all of
+        Affirmer's Copyright and Related Rights and associated claims
+        and causes of action, whether now known or unknown (including
+        existing as well as future claims and causes of action), in
+        the Work (i) in all territories worldwide, (ii) for the
+        maximum duration provided by applicable law or treaty
+        (including future time extensions), (iii) in any current or
+        future medium and for any number of copies, and (iv) for any
+        purpose whatsoever, including without limitation commercial,
+        advertising or promotional purposes (the "Waiver"). Affirmer
+        makes the Waiver for the benefit of each member of the public
+        at large and to the detriment of Affirmer's heirs and
+        successors, fully intending that such Waiver shall not be
+        subject to revocation, rescission, cancellation, termination,
+        or any other legal or equitable action to disrupt the quiet
+        enjoyment of the Work by the public as contemplated by
+        Affirmer's express Statement of Purpose.
+    </p>
+
+        <p><strong>3. Public License Fallback.</strong> Should any
+        part of the Waiver for any reason be judged legally invalid or
+        ineffective under applicable law, then the Waiver shall be
+        preserved to the maximum extent permitted taking into account
+        Affirmer's express Statement of Purpose. In addition, to the
+        extent the Waiver is so judged Affirmer hereby grants to each
+        affected person a royalty-free, non transferable, non
+        sublicensable, non exclusive, irrevocable and unconditional
+        license to exercise Affirmer's Copyright and Related Rights
+        in the Work (i) in all territories worldwide, (ii) for the
+        maximum duration provided by applicable law or treaty
+        (including future time extensions), (iii) in any current or
+        future medium and for any number of copies, and (iv) for any
+        purpose whatsoever, including without limitation commercial,
+        advertising or promotional purposes (the "License"). The
+        License shall be deemed effective as of the date CC0 was
+        applied by Affirmer to the Work. Should any part of the
+        License for any reason be judged legally invalid or
+        ineffective under applicable law, such partial invalidity or
+        ineffectiveness shall not invalidate the remainder of the
+        License, and in such case Affirmer hereby affirms that they
+        will not (i) exercise any of their remaining
+        Copyright and Related Rights in the Work or (ii) assert any
+        associated claims and causes of action with respect to the
+        Work, in either case contrary to Affirmer's express Statement
+        of Purpose.</p>
+
+        <p><strong>4. Limitations and Disclaimers.</strong></p>
+
+        <ol type="a">
+          <li>No trademark or patent rights held by Affirmer are
+          waived, abandoned, surrendered, licensed or otherwise
+          affected by this document.</li>
+
+      <li>Affirmer offers the Work as-is and makes no
+      representations or warranties of any kind concerning the
+      Work, express, implied, statutory or otherwise, including
+      without limitation warranties of title, merchantability,
+      fitness for a particular purpose, non infringement, or the
+      absence of latent or other defects, accuracy, or the present
+      or absence of errors, whether or not discoverable, all to
+      the greatest extent permissible under applicable law.</li>
+
+      <li>Affirmer disclaims responsibility for clearing rights of
+      other persons that may apply to the Work or any use thereof,
+      including without limitation any person's Copyright and
+      Related Rights in the Work. Further, Affirmer disclaims
+      responsibility for obtaining any necessary consents,
+      permissions or other rights required for any use of the
+      Work.</li>
+
+      <li>Affirmer understands and acknowledges that Creative
+      Commons is not a party to this document and has no duty or
+      obligation with respect to this CC0 or use of the Work.</li>
+    </ol>
+<!-- Legalcode End - DO NOT DELETE -->
+    <blockquote><a id="languages"></a>Additional languages available: 
+<!-- Language Footer Start - DO NOT DELETE -->
+<a href="/publicdomain/zero/1.1/legalcode.el">Ελληνικά</a>,
+<a href="/publicdomain/zero/1.1/legalcode.es">Español</a>,
+<a href="/publicdomain/zero/1.1/legalcode.eu">euskara</a>,
+<a href="/publicdomain/zero/1.1/legalcode.fi">suomeksi</a>,
+<a href="/publicdomain/zero/1.1/legalcode.fr">français</a>,
+<a href="/publicdomain/zero/1.1/legalcode.hr">hrvatski</a>,
+<a href="/publicdomain/zero/1.1/legalcode.it">italiano</a>,
+<a href="/publicdomain/zero/1.1/legalcode.ja">日本語</a>,
+<a href="/publicdomain/zero/1.1/legalcode.ko">한국어</a>,
+<a href="/publicdomain/zero/1.1/legalcode.lt">Lietuvių</a>,
+<a href="/publicdomain/zero/1.1/legalcode.lv">latviski</a>,
+<a href="/publicdomain/zero/1.1/legalcode.nl">Nederlands</a>,
+<a href="/publicdomain/zero/1.1/legalcode.pl">polski</a>,
+<a href="/publicdomain/zero/1.1/legalcode.ro">română</a>,
+<a href="/publicdomain/zero/1.1/legalcode.sl">Slovenščina</a>,
+<a href="/publicdomain/zero/1.1/legalcode.sv">svenska</a>,
+<a href="/publicdomain/zero/1.1/legalcode.zh-Hans">中文</a>,
+<a href="/publicdomain/zero/1.1/legalcode.zh-Hant">華語</a>.
+<!-- Language Footer End - - DO NOT DELETE -->
+ Please read the <a href="/faq/#officialtranslations">FAQ</a> for more information about official translations.</blockquote>
+      </div>
+    </div>
+
+    <div id="deed-foot">
+      <p id="footer"><a href="./">« Back to Commons Deed</a></p>
+    </div>
+  </div>
+</body>
+</html>