From 3aec2700426bc0427e097e9d37441643d5a02654 Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Tue, 19 Nov 2019 22:42:14 +0000 Subject: [PATCH] Add examples for Creative Commons licenses and OFL Also adjust instructions in README.md to match CONTRIBUTING.md --- README.md | 4 ++-- _licenses/cc-by-4.0.txt | 3 +++ _licenses/cc-by-sa-4.0.txt | 3 +++ _licenses/cc0-1.0.txt | 3 +++ _licenses/ofl-1.1.txt | 3 +++ spec/license_meta_spec.rb | 4 ---- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7b6b860..fe6c089 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,8 @@ We catalog [select](CONTRIBUTING.md#adding-a-license) open source licenses with ```bash git clone https://github.com/github/choosealicense.com.git cd choosealicense.com -script/bootstrap -script/server +./script/bootstrap +./script/server ``` Open `http://localhost:4000` in your favorite browser. diff --git a/_licenses/cc-by-4.0.txt b/_licenses/cc-by-4.0.txt index 52233ed..d9a4a36 100644 --- a/_licenses/cc-by-4.0.txt +++ b/_licenses/cc-by-4.0.txt @@ -7,6 +7,9 @@ description: Permits almost any use subject to providing credit and license noti 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. It is also acceptable to solely supply a link to a copy of the license, usually to the canonical URL for the license. using: + - caniuse: https://github.com/Fyrd/caniuse/blob/master/LICENSE + - WHATWG HTML standard: https://github.com/whatwg/html/blob/master/LICENSE + - Kubernetes documentation: https://github.com/kubernetes/website/blob/master/LICENSE permissions: - commercial-use diff --git a/_licenses/cc-by-sa-4.0.txt b/_licenses/cc-by-sa-4.0.txt index 21afff8..8e48b1b 100644 --- a/_licenses/cc-by-sa-4.0.txt +++ b/_licenses/cc-by-sa-4.0.txt @@ -7,6 +7,9 @@ description: Similar to CC-BY-4.0 but require 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. It is also acceptable to solely supply a link to a copy of the license, usually to the canonical URL for the license. using: + - Flight rules for Git: https://github.com/k88hudson/git-flight-rules/blob/master/LICENSE + - GitHub-Dark: https://github.com/StylishThemes/GitHub-Dark/blob/master/LICENSE + - Material Design Iconic Font: https://github.com/zavoloklom/material-design-iconic-font/blob/master/License.md permissions: - commercial-use diff --git a/_licenses/cc0-1.0.txt b/_licenses/cc0-1.0.txt index 81b345d..55375b4 100644 --- a/_licenses/cc0-1.0.txt +++ b/_licenses/cc0-1.0.txt @@ -10,6 +10,9 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of note: Creative Commons recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found on their website. using: + - Awesome: https://github.com/sindresorhus/awesome/blob/master/license + - Shields.io: https://github.com/badges/shields/blob/master/LICENSE + - psdash: https://github.com/Jahaja/psdash/blob/master/LICENSE permissions: - commercial-use diff --git a/_licenses/ofl-1.1.txt b/_licenses/ofl-1.1.txt index 066a30f..192aab3 100644 --- a/_licenses/ofl-1.1.txt +++ b/_licenses/ofl-1.1.txt @@ -10,6 +10,9 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of note: This license doesn't require source provision, but recommends it. All files derived from OFL files must remain licensed under the OFL. using: + - FiraCode: https://github.com/tonsky/FiraCode/blob/master/LICENSE + - Noto fonts: https://github.com/googlefonts/noto-fonts/blob/master/LICENSE + - Fantasque Sans Mono: https://github.com/belluzj/fantasque-sans/blob/master/LICENSE.txt permissions: - private-use diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb index f5d58c6..fa6c440 100644 --- a/spec/license_meta_spec.rb +++ b/spec/license_meta_spec.rb @@ -28,16 +28,12 @@ describe 'license meta' do 'artistic-2.0', 'bsd-3-clause-clear', 'bsl-1.0', - 'cc0-1.0', - 'cc-by-4.0', - 'cc-by-sa-4.0', 'eupl-1.1', 'lgpl-2.1', 'lgpl-3.0', 'lppl-1.3c', 'ms-pl', 'ms-rl', - 'ofl-1.1', 'wtfpl', 'zlib' ]