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

Generalize software->licensed material in permission/condition/limitiation descriptions

Fixes #743
This commit is contained in:
Mike Linksvayer 2020-07-24 12:52:33 -07:00
parent cadd29303e
commit fa93f75daf

View File

@ -1,14 +1,14 @@
permissions: permissions:
- description: This software and derivatives may be used for commercial purposes. - description: This licensed material and derivatives may be used for commercial purposes.
label: Commercial use label: Commercial use
tag: commercial-use tag: commercial-use
- description: This software may be modified. - description: This licensed material may be modified.
label: Modification label: Modification
tag: modifications tag: modifications
- description: This software may be distributed. - description: This licensed material may be distributed.
label: Distribution label: Distribution
tag: distribution tag: distribution
- description: This software may be used and modified in private. - description: This licensed material may be used and modified in private.
label: Private use label: Private use
tag: private-use tag: private-use
- description: This license provides an express grant of patent rights from contributors. - description: This license provides an express grant of patent rights from contributors.
@ -16,28 +16,28 @@ permissions:
tag: patent-use tag: patent-use
conditions: conditions:
- description: A copy of the license and copyright notice must be included with the software. - description: A copy of the license and copyright notice must be included with the licensed material.
label: License and copyright notice label: License and copyright notice
tag: include-copyright tag: include-copyright
- description: A copy of the license and copyright notice must be included with the software in source form, but is not required for binaries. - description: A copy of the license and copyright notice must be included with the licensed material in source form, but is not required for binaries.
label: License and copyright notice for source label: License and copyright notice for source
tag: include-copyright--source tag: include-copyright--source
- description: Changes made to the code must be documented. - description: Changes made to the code must be documented.
label: State changes label: State changes
tag: document-changes tag: document-changes
- description: Source code must be made available when the software is distributed. - description: Source code must be made available when the licensed material is distributed.
label: Disclose source label: Disclose source
tag: disclose-source tag: disclose-source
- description: Users who interact with the software via network are given the right to receive a copy of the source code. - description: Users who interact with the licensed material via network are given the right to receive a copy of the source code.
label: Network use is distribution label: Network use is distribution
tag: network-use-disclose tag: network-use-disclose
- description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used. - description: Modifications must be released under the same license when distributing the licensed material. In some cases a similar or related license may be used.
label: Same license label: Same license
tag: same-license tag: same-license
- description: Modifications of existing files must be released under the same license when distributing the software. In some cases a similar or related license may be used. - description: Modifications of existing files must be released under the same license when distributing the licensed material. In some cases a similar or related license may be used.
label: Same license (file) label: Same license (file)
tag: same-license--file tag: same-license--file
- description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used, or this condition may not apply to works that use the software as a library. - description: Modifications must be released under the same license when distributing the licensed material. In some cases a similar or related license may be used, or this condition may not apply to works that use the licensed material as a library.
label: Same license (library) label: Same license (library)
tag: same-license--library tag: same-license--library