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

Merge branch 'gh-pages' into capitalization-punctuation

This commit is contained in:
Mike Linksvayer 2020-11-14 14:45:42 -08:00 committed by GitHub
commit 562cf6b629
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 7 deletions

View File

@ -14,7 +14,7 @@ note: The Apache Foundation recommends taking the additional step of adding a bo
using: using:
Kubernetes: https://github.com/kubernetes/kubernetes/blob/master/LICENSE Kubernetes: https://github.com/kubernetes/kubernetes/blob/master/LICENSE
PDF.js: https://github.com/mozilla/pdf.js/blob/master/LICENSE PDF.js: https://github.com/mozilla/pdf.js/blob/master/LICENSE
Swift: https://github.com/apple/swift/blob/master/LICENSE.txt Swift: https://github.com/apple/swift/blob/main/LICENSE.txt
permissions: permissions:
- commercial-use - commercial-use

View File

@ -11,7 +11,7 @@ note: Boost recommends taking the additional step of adding a boilerplate notice
using: using:
Boost: https://github.com/boostorg/boost/blob/master/LICENSE_1_0.txt Boost: https://github.com/boostorg/boost/blob/master/LICENSE_1_0.txt
Catch2: https://github.com/catchorg/Catch2/blob/master/LICENSE.txt Catch2: https://github.com/catchorg/Catch2/blob/devel/LICENSE.txt
DMD: https://github.com/dlang/dmd/blob/master/LICENSE.txt DMD: https://github.com/dlang/dmd/blob/master/LICENSE.txt
permissions: permissions:

View File

@ -2,12 +2,12 @@
title: European Union Public License 1.2 title: European Union Public License 1.2
spdx-id: EUPL-1.2 spdx-id: EUPL-1.2
description: The European Union Public Licence (EUPL) is a copyleft free/open source software license created on the initiative of and approved by the European Commission in 22 official languages of the European Union. description: The European Union Public Licence (EUPL) is a copyleft free/open source software license created on the initiative of and approved by the European Commission in <a href="https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12">23 official languages</a> of the European Union.
how: Indicate “Licensed under the EUPL” following the copyright notice of your source code, for example in a README file or directly in a source code file as a comment. how: Indicate “Licensed under the EUPL” following the copyright notice of your source code, for example in a README file or directly in a source code file as a comment.
using: using:
AethysRotation: https://github.com/SimCMinMax/AethysRotation/blob/master/LICENSE HeroRotation: https://github.com/herotc/hero-rotation/blob/shadowlands/LICENSE
WildDuck: https://github.com/nodemailer/wildduck/blob/master/LICENSE WildDuck: https://github.com/nodemailer/wildduck/blob/master/LICENSE
ZoneMTA: https://github.com/zone-eu/zone-mta/blob/master/LICENSE ZoneMTA: https://github.com/zone-eu/zone-mta/blob/master/LICENSE

View File

@ -10,7 +10,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of
using: using:
World Countries: https://github.com/mledoze/countries/blob/master/LICENSE World Countries: https://github.com/mledoze/countries/blob/master/LICENSE
OpenFlights: https://github.com/jpatokal/openflights/blob/master/data/LICENSE OpenFlights: https://github.com/jpatokal/openflights/blob/master/data/LICENSE
Public Zone Database: https://github.com/zonedb/zonedb/blob/master/LICENSE.md Public Zone Database: https://github.com/zonedb/zonedb/blob/main/LICENSE.md
permissions: permissions:
- commercial-use - commercial-use

View File

@ -8,7 +8,7 @@ description: A license with no conditions whatsoever which dedicates works to th
how: Create a text file (typically named UNLICENSE or UNLICENSE.txt) in the root of your source code and copy the text of the license disclaimer into the file. how: Create a text file (typically named UNLICENSE or UNLICENSE.txt) in the root of your source code and copy the text of the license disclaimer into the file.
using: using:
youtube-dl: https://github.com/rg3/youtube-dl/blob/master/LICENSE scoop: https://github.com/lukesampson/scoop/blob/master/LICENSE
kakoune: https://github.com/mawww/kakoune/blob/master/UNLICENSE kakoune: https://github.com/mawww/kakoune/blob/master/UNLICENSE
RDF.rb: https://github.com/ruby-rdf/rdf/blob/master/UNLICENSE RDF.rb: https://github.com/ruby-rdf/rdf/blob/master/UNLICENSE

View File

@ -16,7 +16,7 @@ Any open source software license or open license for media (see [above](#data-me
### Fonts ### Fonts
The [SIL Open Font License 1.1](/licenses/ofl-1.1/) keeps fonts open but allows them to be freely used in other works. The [SIL Open Font License 1.1](/licenses/ofl-1.1/) keeps fonts open, allowing them to be freely used in other works.
### Mixed projects ### Mixed projects