1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 12:50:24 +01:00

Merge pull request #834 from wswartzendruber/enhancement/osl-afl-3.0-consistency

Making the OSL-3.0 and AFL-3.0 formatting consistent with each other.
This commit is contained in:
Mike Linksvayer 2021-07-05 21:44:11 -07:00 committed by GitHub
commit 24b87ca27c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions

View File

@ -33,27 +33,27 @@ authorship (the "Original Work") whose owner (the "Licensor") has placed the
following licensing notice adjacent to the copyright notice for the Original following licensing notice adjacent to the copyright notice for the Original
Work: Work:
Licensed under the Academic Free License version 3.0 Licensed under the Academic Free License version 3.0
1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free, 1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free,
non-exclusive, sublicensable license, for the duration of the copyright, to do non-exclusive, sublicensable license, for the duration of the copyright, to do
the following: the following:
a) to reproduce the Original Work in copies, either alone or as part of a a) to reproduce the Original Work in copies, either alone or as part of a
collective work; collective work;
b) to translate, adapt, alter, transform, modify, or arrange the Original b) to translate, adapt, alter, transform, modify, or arrange the Original
Work, thereby creating derivative works ("Derivative Works") based upon Work, thereby creating derivative works ("Derivative Works") based upon the
the Original Work; Original Work;
c) to distribute or communicate copies of the Original Work and c) to distribute or communicate copies of the Original Work and Derivative
Derivative Works to the public, under any license of your choice that Works to the public, under any license of your choice that does not
does not contradict the terms and conditions, including Licensor's contradict the terms and conditions, including Licensor's reserved rights
reserved rights and remedies, in this Academic Free License; and remedies, in this Academic Free License;
d) to perform the Original Work publicly; and d) to perform the Original Work publicly; and
e) to display the Original Work publicly. e) to display the Original Work publicly.
2) Grant of Patent License. Licensor grants You a worldwide, royalty-free, 2) Grant of Patent License. Licensor grants You a worldwide, royalty-free,
non-exclusive, sublicensable license, under patent claims owned or controlled non-exclusive, sublicensable license, under patent claims owned or controlled

View File

@ -41,7 +41,7 @@ authorship (the "Original Work") whose owner (the "Licensor") has placed the
following licensing notice adjacent to the copyright notice for the Original following licensing notice adjacent to the copyright notice for the Original
Work: Work:
Licensed under the Open Software License version 3.0 Licensed under the Open Software License version 3.0
1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free, 1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free,
non-exclusive, sublicensable license, for the duration of the copyright, to do non-exclusive, sublicensable license, for the duration of the copyright, to do