docs/choosealicense.com
docs/choosealicense.com
1
0
Fork 0
mirror of https://github.com/github/choosealicense.com synced 2025-01-08 20:54:34 +01:00
Code Issues Releases Wiki Activity

Merge pull request #365 from github/pd-deduplication

Browse Source 
drop "dedication" from family name, fix #289; drop double empty condition properties
This commit is contained in:
Mike Linksvayer 2016-03-09 20:21:33 -08:00
commit 86955aa184
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
_licenses/cc0-1.0.txt
View File

@ -2,7 +2,7 @@
title: Creative Commons Zero v1.0 Universal title: Creative Commons Zero v1.0 Universal
nickname: CC0 1.0 Universal nickname: CC0 1.0 Universal
redirect_from: /licenses/cc0/ redirect_from: /licenses/cc0/
family: Public Domain Dedication family: Public Domain
variant: true variant: true
source: http://creativecommons.org/publicdomain/zero/1.0/ source: http://creativecommons.org/publicdomain/zero/1.0/
@ -12,21 +12,19 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of
note: Creative Commons recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be [found on their website](https://wiki.creativecommons.org/wiki/CC0_FAQ#May_I_apply_CC0_to_computer_software.3F_If_so.2C_is_there_a_recommended_implementation.3F). note: Creative Commons recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be [found on their website](https://wiki.creativecommons.org/wiki/CC0_FAQ#May_I_apply_CC0_to_computer_software.3F_If_so.2C_is_there_a_recommended_implementation.3F).
conditions:
permissions: permissions:
- commercial-use - commercial-use
- modifications - modifications
- distribution - distribution
- private-use - private-use
conditions: []
limitations: limitations:
- no-liability - no-liability
- trademark-use - trademark-use
- patent-use - patent-use
conditions: []
hidden: false hidden: false
--- ---

8
_licenses/unlicense.txt
View File

@ -1,25 +1,23 @@
--- ---
title: The Unlicense title: The Unlicense
family: Public Domain Dedication family: Public Domain
source: http://unlicense.org/UNLICENSE source: http://unlicense.org/UNLICENSE
description: Because copyright is automatic in most countries, <a href="http://unlicense.org">the Unlicense</a> is a template to waive copyright interest in software you've written and dedicate it to the public domain. Use the Unlicense to opt out of copyright entirely. It also includes the no-warranty statement from the MIT/X11 license. description: Because copyright is automatic in most countries, <a href="http://unlicense.org">the Unlicense</a> is a template to waive copyright interest in software you've written and dedicate it to the public domain. Use the Unlicense to opt out of copyright entirely. It also includes the no-warranty statement from the MIT/X11 license.
how: Create a text file (typically named UNLICENSE or UNLICENSE.txt) in the root of your source code and copy the text of the license disclaimer into the file. how: Create a text file (typically named UNLICENSE or UNLICENSE.txt) in the root of your source code and copy the text of the license disclaimer into the file.
conditions:
permissions: permissions:
- private-use - private-use
- commercial-use - commercial-use
- modifications - modifications
- distribution - distribution
conditions: []
limitations: limitations:
- no-liability - no-liability
conditions: []
hidden: false hidden: false
--- ---