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

Merge pull request #384 from github/oafsl

AFL and OSL corrections
This commit is contained in:
Mike Linksvayer 2016-04-03 10:08:34 -07:00
commit 3c30309948
2 changed files with 4 additions and 3 deletions

View File

@ -2,9 +2,9 @@
title: Academic Free License v3.0
source: http://opensource.org/licenses/afl-3.0
description: The Academic Free License is a variant of the Open Source License that does not require that the source code of derivative works be disclosed. It contains explicit copyright and patent grants and reserves trademark rights in the author.
description: The Academic Free License is a variant of the Open Software License that does not require that the source code of derivative works be disclosed. It contains explicit copyright and patent grants and reserves trademark rights in the author.
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Files licensed under OSL 3.0 must also include the notice "Licensed under the Academic Free License version 3.0" adjacent to the copyright notice.
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Files licensed under AFL 3.0 must also include the notice "Licensed under the Academic Free License version 3.0" adjacent to the copyright notice.
conditions:
- include-copyright

View File

@ -16,6 +16,7 @@ using:
conditions:
- include-copyright
- disclose-source
- network-use-disclose
- same-license
permissions:
@ -60,7 +61,7 @@ the following:
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
by the Licensor that are embodied in the Original Work as furnished by the
Licensor, for the duration of the patents, to make, use, sell, offer for sale,