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.

Sign up for GitHub

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.0 accommodation for text used in ~30k repos on github.com #489

Merged
merged 8 commits into from
Apr 5, 2018
Merged

CC0-1.0 accommodation for text used in ~30k repos on github.com #489

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2ccf970
CC0-1.0 accommodation for text used in ~30k repos on github.com
mlinksva Nov 25, 2017
72644ef
optional->alt for non-canonical "For more info..."
mlinksva Nov 27, 2017
cf4506c
keep title changes separate, in #487
mlinksva Nov 27, 2017
4c25251
really backout title changes
mlinksva Nov 27, 2017
e82e34d
Finally go with @wking's initial suggestion, now that I understand it :)
mlinksva Nov 27, 2017
32396ac
Merge branch 'master' into patch-4
mlinksva Jan 27, 2018
fa51ba4
escape < in attribute
mlinksva Jan 27, 2018
f18f377
wrap alt with empty default in optional?
mlinksva Jan 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/CC0-1.0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
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.</p>
</optional>

<p>Statement of Purpose</p>
<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")
Expand Down Expand Up @@ -61,7 +61,7 @@
in paragraph 4(a), below;
</item>
<item>
<bullet>v.</bullet>
<bullet>v.</bullet>
rights protecting the extraction, dissemination, use and reuse of data in a Work;
</item>
<item>
Expand Down Expand Up @@ -147,6 +147,7 @@
</list>
</item>
</list>
<optional><alt match="For more information, please see &lt;http://creativecommons.org/publicdomain/zero/1.0/>" name="upstreamLink"></alt></optional>
</text>
</license>
</SPDXLicenseCollection>