Skip to content

Commit

Permalink
Merge pull request #1181 from chwarr/ce-upl
Browse files Browse the repository at this point in the history
Copy edit UPL-1.0 description
  • Loading branch information
mlinksva committed Jan 22, 2024
2 parents 1827f5f + 1402141 commit 4f6d27f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion _licenses/gpl-2.0.txt
Expand Up @@ -14,7 +14,7 @@ note: The Free Software Foundation recommends taking the additional step of addi
using:
AliSQL: https://github.com/alibaba/AliSQL/blob/master/COPYING
Discourse: https://github.com/discourse/discourse/blob/master/LICENSE.txt
Joomla!: https://github.com/joomla/joomla-cms/blob/staging/LICENSE.txt
Jellyfin: https://github.com/jellyfin/jellyfin/blob/master/LICENSE

permissions:
- commercial-use
Expand Down
2 changes: 1 addition & 1 deletion _licenses/upl-1.0.txt
Expand Up @@ -2,7 +2,7 @@
title: Universal Permissive License v1.0
spdx-id: UPL-1.0

description: A permissive, OSI and FSF approved, GPL compatible license, expressly allowing attribution with just a copyright notice and a short form link rather than the full text of the license. Includes an express grant of patent rights. Licensed works and modifications may be distributed under different terms and without source code, and the patent grant may also optionally be expanded to larger works to permit use as a contributor license agreement.
description: A permissive, OSI- and FSF-approved, GPL-compatible license, expressly allowing attribution with just a copyright notice and a short form link rather than the full text of the license. Includes an express grant of patent rights. Licensed works and modifications may be distributed under different terms and without source code, and the patent grant may also optionally be expanded to larger works to permit use as a contributor license agreement.

how: Insert the license or a link to it along with a copyright notice into your source file(s), and/or 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, replacing [year] with the current year and [fullname] with the name (or names) of the copyright holders.

Expand Down

0 comments on commit 4f6d27f

Please sign in to comment.