1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 04:40:09 +01:00

Replace copyright and license with single category

This commit is contained in:
Haacked 2013-07-10 11:32:22 -07:00
parent 8ae1c78757
commit 3c29d5da87
5 changed files with 5 additions and 11 deletions

View File

@ -4,11 +4,8 @@ rules:
required:
include-copyright:
description: Include the original copyright with the code.
label: Copyright inclusion
include-license:
description: Include the full text of the license with the code.
label: License inclusion
description: Include a copy of the license and copyright with the code.
label: License and copyright notice
document-changes:
description: Indicate significant changes made to the code.
label: State Changes

View File

@ -5,7 +5,7 @@ permalink: apache/
featured: true
description: A permissive license that also grants a license to patent claims from contributors that are necessarily infringed by the software.
description: A permissive license that also provides an express grant of patent rights from the contributor to the recipient.
note: The Apache Foundation recommends taking the additional step of adding a boilerplate notice to the header of each source file. You can find the notice at the very end of the license in the appendix.
@ -15,7 +15,6 @@ source: http://www.apache.org/licenses/LICENSE-2.0.html
required:
- include-copyright
- include-license
- document-changes
permitted:
@ -26,7 +25,6 @@ permitted:
- warranty
forbidden:
- no-warranty
- trademark-use
---

View File

@ -10,7 +10,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of
source: http://www.eclipse.org/legal/epl-v10.html
required:
- disclose-source
- include-copyright
- include-license
permitted:

View File

@ -10,7 +10,6 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of
required:
- disclose-source
- include-copyright
- include-license
permitted:
- commercial-use

View File

@ -24,4 +24,4 @@ forbidden:
---
Copyright <<year>> <<fullname>>
Copyright <<year>> <<fullname>>