Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CC0 1.1 w/o gendered pronouns #1149

Merged
merged 3 commits into from Sep 9, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions README.md
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions config/apache.conf
Expand Up @@ -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
Expand Down Expand Up @@ -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]
Expand Down
4 changes: 4 additions & 0 deletions config/creativecommons.org.conf
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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]
Expand Down
2 changes: 2 additions & 0 deletions config/default-ssl.conf
Expand Up @@ -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
Expand Down Expand Up @@ -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]
Expand Down
2 changes: 2 additions & 0 deletions config/livechooser/000-default.conf
Expand Up @@ -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
Expand Down Expand Up @@ -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]
Expand Down
6 changes: 6 additions & 0 deletions config/livelicenses/000-default.conf
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docroot/includes/errata.js
Expand Up @@ -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. */
Expand Down
86 changes: 86 additions & 0 deletions docroot/legalcode/zero-assert_1.1_us.html
@@ -0,0 +1,86 @@
<!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=
"https://creativecommons.org/includes/deed3.css" media="screen" />
<link rel="stylesheet" type="text/css" href=
"https://creativecommons.org/includes/deed3-print.css" media=
"print" />

<link rel="stylesheet"
href="http://labs.creativecommons.org/licenses/@@/cc/labs.css"
type="text/css" />

<!--[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>

<div id="labs-corner"></div>

<p align="center" id="header"><a href=
"https://creativecommons.org/">Creative Commons</a></p>

<div id="deed" class="green">
<div id="deed-head">
<div id="cc-logo">
<img src=
"https://creativecommons.org/images/deed/cc-logo.jpg" alt=
"" />
</div>

<h1><span>Creative Commons Legal Code</span></h1>

<div id="deed-license">
<h2>CC&empty; Public Domain Assertion 1.0 United States</h2>
</div>
</div>

<div id="deed-main">
<div id="deed-main-content">
<img src=
"https://creativecommons.org/images/international/us.png"
alt="" />

<blockquote>
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES
NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE
DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE
COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE
INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES
RESULTING FROM ITS USE.
</blockquote>

<h3><em>Assertion</em></h3>
<p>
The person who has associated a work with this document (the "Work") asserts that they (the "Asserter") have taken reasonable steps to verify the copyright status of the Work under US law.
</p>
<p>
The Asserter hereby asserts that to the best of their knowledge, there are no copyrights in connection with the Work (the "Assertion").
</p>
<p>
The Asserter understands and acknowledges that their good faith efforts to verify the copyright status of the Work may not shield the Asserter from claims of liability arising from the Assertion.
<p>
The Asserter understands and acknowledges that Creative Commons is not a party to the Assertion and has no duty or obligation with respect to the Assertion or use of the Work.
</p>
</div>
</div>

<div id="deed-foot">
<p id="footer"><a href="./">« Back to Commons Deed</a></p>
</div>
</div>
</body>
</html>
TimidRobot marked this conversation as resolved.
Show resolved Hide resolved
87 changes: 87 additions & 0 deletions docroot/legalcode/zero-waive_1.1_us.html
@@ -0,0 +1,87 @@
<!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=
"https://creativecommons.org/includes/deed3.css" media="screen" />
<link rel="stylesheet" type="text/css" href=
"https://creativecommons.org/includes/deed3-print.css" media=
"print" />

<link rel="stylesheet"
href="http://labs.creativecommons.org/licenses/@@/cc/labs.css"
type="text/css" />

<!--[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>

<div id="labs-corner"></div>

<p align="center" id="header"><a href=
"https://creativecommons.org/">Creative Commons</a></p>

<div id="deed" class="green">
<div id="deed-head">
<div id="cc-logo">
<img src=
"https://creativecommons.org/images/deed/cc-logo.jpg" alt=
"" />
</div>

<h1><span>Creative Commons Legal Code</span></h1>

<div id="deed-license">
<h2>CC&empty; Public Domain Affirmation and Waiver 1.0 United States</h2>
</div>
</div>

<div id="deed-main">
<div id="deed-main-content">
<img src=
"https://creativecommons.org/images/international/us.png"
alt="" />

<blockquote>
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES
NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE
DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE
COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE
INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES
RESULTING FROM ITS USE.
</blockquote>

<h3><em>Affirmation and Waiver</em></h3>
<p>
The person who has associated a work with this document (the "Work") affirms that they (the "Affirmer") are the/an author or owner of the Work. The Work may be any work of authorship, including a database.
</p>
<p>
The Affirmer hereby fully, permanently and irrevocably waives and relinquishes all of their copyright and related or neighboring legal rights in the Work available under any federal or state law, treaty or contract, including but not limited to moral rights, publicity and privacy rights, rights protecting against unfair competition and any rights protecting the extraction, dissemination and reuse of data, whether such rights are present or future, vested or contingent (the "Waiver"). The Affirmer makes the Waiver for the benefit of the public at large and to the detriment of the Affirmer's heirs or successors.
</p>
<p>
The Affirmer understands and intends that the Waiver has the effect of eliminating and entirely removing from the Affirmer's control all the copyright and related or neighboring legal rights previously held by the Affirmer in the Work, to that extent making the Work freely available to the public for any and all uses and purposes without restriction of any kind, including commercial use and uses in media and formats or by methods that have not yet been invented or conceived. Should the Waiver for any reason be judged legally ineffective in any jurisdiction, the Affirmer hereby grants a free, full, permanent, irrevocable, nonexclusive and worldwide license for all their copyright and related or neighboring legal rights in the Work.
</p>
<p>
The Affirmer understands and acknowledges that Creative Commons is not a party to the Waiver and has no duty or obligation with respect to the Waiver or use of the Work.
</p>
</div>
</div>

<div id="deed-foot">
<p id="footer"><a href="./">« Back to Commons Deed</a></p>
</div>
</div>
</body>
</html>
TimidRobot marked this conversation as resolved.
Show resolved Hide resolved