From cfa7104f853197bb826709763fd757e6fa9b4989 Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Wed, 6 Jul 2016 15:02:20 +0100 Subject: [PATCH 01/20] Fix instructions for Artistic 2.0 (follow-up #333) cf. #103, #310 and #333 cc @mlinksva, @benbalter, @bkeepers and @Haacked --- _licenses/artistic-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/artistic-2.0.txt b/_licenses/artistic-2.0.txt index 649fc10..6388526 100644 --- a/_licenses/artistic-2.0.txt +++ b/_licenses/artistic-2.0.txt @@ -6,7 +6,7 @@ source: http://www.perlfoundation.org/attachment/legal/artistic-2_0.txt description: Heavily favored by the Perl community, the Artistic license requires that modified versions of the software do not prevent users from running the standard version. -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. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. +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. Do not replace the copyright notice (year, author) — they refer to the license itself, not the licensed project. conditions: - include-copyright From 28c245adec2b4850543d2c1ae11b354a24d96bb1 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 6 Jul 2016 11:20:27 -0700 Subject: [PATCH 02/20] small wording fix, see https://github.com/github/choosealicense.com/pull/440#issuecomment-230809370 --- _licenses/artistic-2.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/artistic-2.0.txt b/_licenses/artistic-2.0.txt index 6388526..0b4ddda 100644 --- a/_licenses/artistic-2.0.txt +++ b/_licenses/artistic-2.0.txt @@ -6,7 +6,7 @@ source: http://www.perlfoundation.org/attachment/legal/artistic-2_0.txt description: Heavily favored by the Perl community, the Artistic license requires that modified versions of the software do not prevent users from running the standard version. -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. Do not replace the copyright notice (year, author) — they refer to the license itself, not the licensed project. +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. Do not replace the copyright notice (year, author), which refers to the license itself, not the licensed project. conditions: - include-copyright From f44e11237b432d49b4db8b69f3f9afa1b23dce7c Mon Sep 17 00:00:00 2001 From: Sam Gluck Date: Sun, 24 Jul 2016 09:47:39 +0100 Subject: [PATCH 03/20] Fix source URL for ms-rl license --- _licenses/ms-rl.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/ms-rl.txt b/_licenses/ms-rl.txt index 953fd5b..f3e610a 100644 --- a/_licenses/ms-rl.txt +++ b/_licenses/ms-rl.txt @@ -2,7 +2,7 @@ title: Microsoft Reciprocal License spdx-id: MS-RL -source: http://opensource.org/licenses/ms-pl +source: http://opensource.org/licenses/ms-rl description: An open source license with a patent grant similar to the Microsoft Public License, with the additional condition that any source code for any derived file be provided under this license. From c0fe6e3dededc7b52063f6f629229667381e3412 Mon Sep 17 00:00:00 2001 From: Joey Govea Date: Mon, 8 Aug 2016 11:34:51 -0700 Subject: [PATCH 04/20] Add note about CLA --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0491bdc..1faa0ed 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -40,6 +40,8 @@ find it in the GitHub repository. Then click the `Edit` button. Make your changes, type in a commit message, and click the `Propose File Change` button. That’s it! +You will be asked to sign the [GitHub Contributor License Agreement](https://cla.github.com/) for this project when you make your first pull request. + For more advanced changes, check out [the bootstrap instructions](https://github.com/github/choosealicense.com#run-it-on-your-machine) in the [project's readme](/README.md). ## Testing From e81e63e696b0101516d8c166c0fd04711bc65c56 Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Mon, 22 Aug 2016 18:24:02 +0100 Subject: [PATCH 05/20] unlicense: add 3 popular projects using it --- _licenses/unlicense.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.txt index 61463ee..9cccaa3 100644 --- a/_licenses/unlicense.txt +++ b/_licenses/unlicense.txt @@ -6,9 +6,13 @@ hidden: false description: A license with no conditions whatsoever which dedicates works to the public domain. Unlicensed works, modifications, and larger works may be distributed under different terms and without source code. - 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: + - youtube-dl: https://github.com/rg3/youtube-dl/blob/master/LICENSE + - stacktrace.js: https://github.com/stacktracejs/stacktrace.js/blob/master/LICENSE + - kakokune: https://github.com/mawww/kakoune/blob/master/UNLICENSE + permissions: - private-use - commercial-use From 9e6528c68f8886da6b977d0ad28107113a7666db Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Mon, 22 Aug 2016 18:25:24 +0100 Subject: [PATCH 06/20] sort license properties in the order permissions > conditions > limitations (fixes #387) --- _data/rules.yml | 34 ++++++++++++++++---------------- _licenses/afl-3.0.txt | 9 +++++---- _licenses/agpl-3.0.txt | 15 +++++++------- _licenses/apache-2.0.txt | 9 +++++---- _licenses/artistic-2.0.txt | 9 +++++---- _licenses/bsd-2-clause.txt | 7 ++++--- _licenses/bsd-3-clause-clear.txt | 10 +++++----- _licenses/bsd-3-clause.txt | 7 ++++--- _licenses/cc-by-4.0.txt | 9 +++++---- _licenses/cc-by-sa-4.0.txt | 11 ++++++----- _licenses/cc0-1.0.txt | 1 + _licenses/epl-1.0.txt | 11 ++++++----- _licenses/eupl-1.1.txt | 15 +++++++------- _licenses/gpl-2.0.txt | 13 ++++++------ _licenses/gpl-3.0.txt | 13 ++++++------ _licenses/isc.txt | 7 ++++--- _licenses/lgpl-2.1.txt | 13 ++++++------ _licenses/lgpl-3.0.txt | 14 ++++++------- _licenses/lppl-1.3c.txt | 11 ++++++----- _licenses/mit.txt | 7 ++++--- _licenses/mpl-2.0.txt | 11 ++++++----- _licenses/ms-pl.txt | 8 ++++---- _licenses/ms-rl.txt | 12 +++++------ _licenses/ofl-1.1.txt | 8 ++++---- _licenses/osl-3.0.txt | 14 ++++++------- _licenses/unlicense.txt | 1 + _licenses/wtfpl.txt | 4 ++-- _licenses/zlib.txt | 9 +++++---- 28 files changed, 156 insertions(+), 136 deletions(-) diff --git a/_data/rules.yml b/_data/rules.yml index 3cf3145..738fd5f 100644 --- a/_data/rules.yml +++ b/_data/rules.yml @@ -1,20 +1,3 @@ -conditions: -- description: Include a copy of the license and copyright notice with the code. - label: License and Copyright Notice - tag: include-copyright -- description: Indicate changes made to the code. - label: State Changes - tag: document-changes -- description: Source code must be made available when distributing the software. - label: Disclose Source - tag: disclose-source -- description: Users who interact with the software via network are given the right to receive a copy of the corresponding source code. - label: Network Use is Distribution - tag: network-use-disclose -- description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used. - label: Same License - tag: same-license - permissions: - description: This software and derivatives may be used for commercial purposes. label: Commercial Use @@ -32,6 +15,23 @@ permissions: label: Patent Use tag: patent-use +conditions: +- description: Include a copy of the license and copyright notice with the code. + label: License and Copyright Notice + tag: include-copyright +- description: Indicate changes made to the code. + label: State Changes + tag: document-changes +- description: Source code must be made available when distributing the software. + label: Disclose Source + tag: disclose-source +- description: Users who interact with the software via network are given the right to receive a copy of the corresponding source code. + label: Network Use is Distribution + tag: network-use-disclose +- description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used. + label: Same License + tag: same-license + limitations: - description: This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights. label: Trademark Use diff --git a/_licenses/afl-3.0.txt b/_licenses/afl-3.0.txt index abb76e3..e1bf41c 100644 --- a/_licenses/afl-3.0.txt +++ b/_licenses/afl-3.0.txt @@ -7,10 +7,6 @@ description: The Academic Free License is a variant of the Open Software License 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 - - document-changes - permissions: - commercial-use - modifications @@ -18,11 +14,16 @@ permissions: - private-use - patent-use +conditions: + - include-copyright + - document-changes + limitations: - trademark-use - no-liability --- + Academic Free License (“AFL”) v. 3.0 This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: diff --git a/_licenses/agpl-3.0.txt b/_licenses/agpl-3.0.txt index 584c35f..0fe30ed 100644 --- a/_licenses/agpl-3.0.txt +++ b/_licenses/agpl-3.0.txt @@ -12,13 +12,6 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of note: The Free Software Foundation recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the end of the license. -conditions: - - include-copyright - - document-changes - - disclose-source - - network-use-disclose - - same-license - permissions: - commercial-use - modifications @@ -26,8 +19,16 @@ permissions: - patent-use - private-use +conditions: + - include-copyright + - document-changes + - disclose-source + - network-use-disclose + - same-license + limitations: - no-liability + --- GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/_licenses/apache-2.0.txt b/_licenses/apache-2.0.txt index fdbb554..19aa398 100644 --- a/_licenses/apache-2.0.txt +++ b/_licenses/apache-2.0.txt @@ -17,10 +17,6 @@ using: - Apache: https://svn.apache.org/viewvc/httpd/httpd/trunk/LICENSE?view=markup - Swift: https://github.com/apple/swift/blob/master/LICENSE.txt -conditions: - - include-copyright - - document-changes - permissions: - commercial-use - modifications @@ -28,9 +24,14 @@ permissions: - patent-use - private-use +conditions: + - include-copyright + - document-changes + limitations: - trademark-use - no-liability + --- Apache License diff --git a/_licenses/artistic-2.0.txt b/_licenses/artistic-2.0.txt index 0b4ddda..6bfd6ea 100644 --- a/_licenses/artistic-2.0.txt +++ b/_licenses/artistic-2.0.txt @@ -8,10 +8,6 @@ description: Heavily favored by the Perl community, the Artistic license 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. Do not replace the copyright notice (year, author), which refers to the license itself, not the licensed project. -conditions: - - include-copyright - - document-changes - permissions: - commercial-use - modifications @@ -19,9 +15,14 @@ permissions: - patent-use - private-use +conditions: + - include-copyright + - document-changes + limitations: - no-liability - trademark-use + --- The Artistic License 2.0 diff --git a/_licenses/bsd-2-clause.txt b/_licenses/bsd-2-clause.txt index 42eb9af..8cc23e1 100644 --- a/_licenses/bsd-2-clause.txt +++ b/_licenses/bsd-2-clause.txt @@ -8,17 +8,18 @@ description: A permissive license that comes in two variants, the BSD 3-Clause License that explicitly does not grant any patent rights. 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. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. Replace [project] with the project organization, if any, that sponsors this work. -source: https://spdx.org/licenses/BSD-3-Clause-Clear.html - -conditions: - - include-copyright - permissions: - commercial-use - modifications - distribution - private-use +conditions: + - include-copyright + limitations: - no-liability - patent-use + --- The Clear BSD License diff --git a/_licenses/bsd-3-clause.txt b/_licenses/bsd-3-clause.txt index caf6a7c..a744acd 100644 --- a/_licenses/bsd-3-clause.txt +++ b/_licenses/bsd-3-clause.txt @@ -7,17 +7,18 @@ description: A permissive license similar to the GNU GPLv3 license. Insert the word “Lesser” before “General” in all three places in the boilerplate notice to make sure that you refer to the GNU LGPLv3 and not the GNU GPLv3. -conditions: - - include-copyright - - disclose-source - - document-changes - - same-license - - permissions: - commercial-use - modifications @@ -26,8 +19,15 @@ permissions: - patent-use - private-use +conditions: + - include-copyright + - disclose-source + - document-changes + - same-license + limitations: - no-liability + --- GNU LESSER GENERAL PUBLIC LICENSE diff --git a/_licenses/lppl-1.3c.txt b/_licenses/lppl-1.3c.txt index 98b945a..7d2ee84 100644 --- a/_licenses/lppl-1.3c.txt +++ b/_licenses/lppl-1.3c.txt @@ -9,19 +9,20 @@ how: To use this license, place in each of the components of your work both an e note: An example boilerplate and more information about how to use the license can be found at the end of the license. -conditions: - - include-copyright - - document-changes - - disclose-source - permissions: - commercial-use - modifications - distribution - private-use +conditions: + - include-copyright + - document-changes + - disclose-source + limitations: - no-liability + --- The LaTeX Project Public License diff --git a/_licenses/mit.txt b/_licenses/mit.txt index df9713a..7fefea5 100644 --- a/_licenses/mit.txt +++ b/_licenses/mit.txt @@ -14,17 +14,18 @@ using: - .NET Core: https://github.com/dotnet/corefx/blob/master/LICENSE - Rails: https://github.com/rails/rails/blob/master/activerecord/MIT-LICENSE -conditions: - - include-copyright - permissions: - commercial-use - modifications - distribution - private-use +conditions: + - include-copyright + limitations: - no-liability + --- MIT License diff --git a/_licenses/mpl-2.0.txt b/_licenses/mpl-2.0.txt index c637032..22d075b 100644 --- a/_licenses/mpl-2.0.txt +++ b/_licenses/mpl-2.0.txt @@ -16,11 +16,6 @@ using: - TimelineJS3: https://github.com/NUKnightLab/TimelineJS3/blob/master/LICENSE - LibreOffice: https://cgit.freedesktop.org/libreoffice/core/tree/COPYING.MPL -conditions: - - disclose-source - - include-copyright - - same-license - permissions: - commercial-use - modifications @@ -28,9 +23,15 @@ permissions: - patent-use - private-use +conditions: + - disclose-source + - include-copyright + - same-license + limitations: - no-liability - trademark-use + --- Mozilla Public License Version 2.0 diff --git a/_licenses/ms-pl.txt b/_licenses/ms-pl.txt index 6111486..8505a1b 100644 --- a/_licenses/ms-pl.txt +++ b/_licenses/ms-pl.txt @@ -1,16 +1,12 @@ --- title: Microsoft Public License spdx-id: MS-PL - source: http://opensource.org/licenses/ms-pl description: An open source license with a patent grant. 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. -conditions: - - include-copyright - permissions: - commercial-use - modifications @@ -18,9 +14,13 @@ permissions: - patent-use - private-use +conditions: + - include-copyright + limitations: - no-liability - trademark-use + --- Microsoft Public License (MS-PL) diff --git a/_licenses/ms-rl.txt b/_licenses/ms-rl.txt index f3e610a..8619ffc 100644 --- a/_licenses/ms-rl.txt +++ b/_licenses/ms-rl.txt @@ -1,18 +1,12 @@ --- title: Microsoft Reciprocal License spdx-id: MS-RL - source: http://opensource.org/licenses/ms-rl description: An open source license with a patent grant similar to the Microsoft Public License, with the additional condition that any source code for any derived file be provided under this license. 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. -conditions: - - disclose-source - - include-copyright - - same-license - permissions: - commercial-use - modifications @@ -20,9 +14,15 @@ permissions: - patent-use - private-use +conditions: + - disclose-source + - include-copyright + - same-license + limitations: - no-liability - trademark-use + --- Microsoft Reciprocal License (MS-RL) diff --git a/_licenses/ofl-1.1.txt b/_licenses/ofl-1.1.txt index 1ab2d8d..9b22a4a 100644 --- a/_licenses/ofl-1.1.txt +++ b/_licenses/ofl-1.1.txt @@ -10,16 +10,16 @@ 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. -conditions: - - include-copyright - - same-license - permissions: - private-use - commercial-use - modifications - distribution +conditions: + - include-copyright + - same-license + limitations: - no-liability diff --git a/_licenses/osl-3.0.txt b/_licenses/osl-3.0.txt index 5393101..a47570b 100644 --- a/_licenses/osl-3.0.txt +++ b/_licenses/osl-3.0.txt @@ -14,13 +14,6 @@ using: - Magento 2: https://github.com/magento/magento2/blob/develop/LICENSE.txt - Restyaboard: https://github.com/RestyaPlatform/board/blob/master/LICENSE.txt -conditions: - - include-copyright - - disclose-source - - document-changes - - network-use-disclose - - same-license - permissions: - commercial-use - distribution @@ -28,6 +21,13 @@ permissions: - patent-use - private-use +conditions: + - include-copyright + - disclose-source + - document-changes + - network-use-disclose + - same-license + limitations: - trademark-use - no-liability diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.txt index 9cccaa3..c8a0563 100644 --- a/_licenses/unlicense.txt +++ b/_licenses/unlicense.txt @@ -23,6 +23,7 @@ conditions: [] limitations: - no-liability + --- This is free and unencumbered software released into the public domain. diff --git a/_licenses/wtfpl.txt b/_licenses/wtfpl.txt index e47419e..854bdb6 100644 --- a/_licenses/wtfpl.txt +++ b/_licenses/wtfpl.txt @@ -7,14 +7,14 @@ description: The easiest license out there. It gives the user permissions to do 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. -conditions: [] - permissions: - commercial-use - modifications - distribution - private-use +conditions: [] + limitations: [] --- diff --git a/_licenses/zlib.txt b/_licenses/zlib.txt index b8fd11e..01ba76e 100644 --- a/_licenses/zlib.txt +++ b/_licenses/zlib.txt @@ -7,18 +7,19 @@ description: A short permissive license, compatible with GPL. Requires altered s 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. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. -conditions: - - include-copyright - - document-changes - permissions: - commercial-use - modifications - distribution - private-use +conditions: + - include-copyright + - document-changes + limitations: - no-liability + --- zlib License From e0b2b9294dc2e267fdc11e0e07afe2dd0294cb36 Mon Sep 17 00:00:00 2001 From: Waldir Pimenta Date: Mon, 22 Aug 2016 20:03:52 +0100 Subject: [PATCH 07/20] unlicense: fix typo "kakokune" -->"kakoune" --- _licenses/unlicense.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.txt index c8a0563..20bae3e 100644 --- a/_licenses/unlicense.txt +++ b/_licenses/unlicense.txt @@ -11,7 +11,7 @@ how: Create a text file (typically named UNLICENSE or UNLICENSE.txt) in the root using: - youtube-dl: https://github.com/rg3/youtube-dl/blob/master/LICENSE - stacktrace.js: https://github.com/stacktracejs/stacktrace.js/blob/master/LICENSE - - kakokune: https://github.com/mawww/kakoune/blob/master/UNLICENSE + - kakoune: https://github.com/mawww/kakoune/blob/master/UNLICENSE permissions: - private-use From 0cee43e3c559ccb10fb5390bedec95a84e0e8b6b Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 9 Sep 2016 15:20:11 -0700 Subject: [PATCH 08/20] Update no-license - qualify "no [actions]" with "without being at risk..." - mention exceptions and limitations, jurisdiction-specific - mention that collaborators don't give you permission, either - remove trivial example copyright notice, suggest adding statement symmetric with for-users section below - suggest exploring contributor agreement so non-licensor has permission from contributors closes #444 #445 --- no-license.md | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/no-license.md b/no-license.md index d5e09f5..688f1d2 100644 --- a/no-license.md +++ b/no-license.md @@ -6,25 +6,17 @@ title: No License description: "You're under no obligation to choose a license and it's your right not to include one with your code or project. But please note that opting out of open source licenses doesn't mean you're opting out of copyright law." --- -Opting out of open source licenses doesn't mean you're opting out of copyright law. +When you make a creative work (which includes code), the work is under exclusive copyright by default. Unless you include a license that specifies otherwise, nobody else can use, copy, distribute, or modify your work without being at risk of take-downs, shake-downs, or litigation. Once the work has other contributors (each a copyright holder), “nobody” starts including you. -You'll have to check with your own legal counsel regarding your particular project, but generally speaking, the absence of a license means that default copyright laws apply. This means that you retain all rights to your source code and that nobody else may reproduce, distribute, or create derivative works from your work. +Even in the absence of a license file, you may grant some rights in cases where you publish your source code to a site that requires accepting terms of service. For example, if you publish your source code in a public repository on GitHub, you have accepted the [Terms of Service](https://help.github.com/articles/github-terms-of-service), by which you allow others to view and fork your repository. Others may not need your permission if [limitations and exceptions to copyright](https://en.wikipedia.org/wiki/Limitations_and_exceptions_to_copyright) apply to their particular situation. Neither site terms nor jurisdiction-specific copyright limitations are sufficient for the kinds of collaboration that people usually seek on a public code host, such as experimentation, modification, and sharing as fostered by an open source license. -You don't have to do anything to not offer a license, though including a copyright notice is recommended. - -
-
-
Copyright [year] [fullname]
-
-
+You don't have to do anything to not offer a license. You may however wish to add a copyright notice and statement that you are not offering any license in a prominent place (e.g., your project's README) so that [users](#for-users) don't assume you made an oversight. If you're going to accept others' contributions to your non-licensed project, you may wish to explore with your lawyer adding a contributor agreement to your project so that you maintain copyright permission from contributors, even though you're not granting the same. Disallowing use of your code might not be what you intend by "no license." An [open-source license](/) allows reuse of your code while retaining copyright. If your goal is to completely opt-out of copyright restrictions, try a [public domain dedication](/licenses/#unlicense). -Even in the absence of a license file, you may grant some rights in cases where you publish your source code to a site that requires accepting terms of service. For example, if you publish your source code in a public repository on GitHub, you have accepted the [Terms of Service](https://help.github.com/articles/github-terms-of-service), by which you allow others to view and fork your repository; but this alone does not allow for the kinds of collaboration that people usually seek on a public code host, such as experimentation, modification, and sharing as fostered by an open source license. - ## For users -If you find software that doesn't have a license, that generally means you have no permission from the creators of the software to use, modify, or share the software. Although a code host such as GitHub may allow you to download or fork the code, this does not imply that you are permitted to use, modify, or share the software for any purpose. +If you find software that doesn't have a license, that generally means you have no permission from the creators of the software to use, modify, or share the software. Although a code host such as GitHub may allow you to view and fork the code, this does not imply that you are permitted to use, modify, or share the software for any purpose. Your options: From c008a5fbef641d49c83d5d61a8a5c66428efeb40 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 9 Sep 2016 16:08:17 -0700 Subject: [PATCH 09/20] CCIL broke John Cowan's website --- about.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about.md b/about.md index 78e5532..c15de13 100644 --- a/about.md +++ b/about.md @@ -23,7 +23,7 @@ See our [appendix](/appendix) for a table of all of the licenses cataloged in th * Linux Foundation's [SPDX License List](https://spdx.org/licenses/) * [Comparison of free and open-source software licenses](https://en.wikipedia.org/wiki/Comparison_of_free_and_open-source_software_licenses) on English Wikipedia * [License differentiator](http://www.oss-watch.ac.uk/apps/licdiff/) ([source](https://github.com/ox-it/licdiff)) from [OSS Watch](http://www.oss-watch.ac.uk/) -* [Free/Libre/Open Source license selection wizard](http://home.ccil.org/~cowan/floss/) by John Cowan +* [Free/Libre/Open Source license selection wizard](http://web.archive.org/web/20160801055258/http://home.ccil.org/~cowan/floss/) by John Cowan ## Help us improve it From e800e1c845cf40be99fb57150d531363c4bb07fa Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Wed, 14 Sep 2016 14:45:04 -0700 Subject: [PATCH 10/20] Remove variation in instructions for applying LGPLv3 Leaving only the option described in https://www.gnu.org/licenses/gpl-howto.html Following from discussion at https://github.com/benbalter/licensee/pull/113#r78846987 --- _licenses/lgpl-3.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/lgpl-3.0.txt b/_licenses/lgpl-3.0.txt index 4fe9601..6c68924 100644 --- a/_licenses/lgpl-3.0.txt +++ b/_licenses/lgpl-3.0.txt @@ -8,7 +8,7 @@ hidden: false description: Permissions of this copyleft license are conditioned on making available complete source code of licensed works and modifications under the same license or the GNU GPLv3. Copyright and license notices must be preserved. Contributors provide an express grant of patent rights. However, a larger work using the licensed work through interfaces provided by the licensed work may be distributed under different terms and without source code for the larger work. -how: This license is an additional set of permissions to the GNU GPLv3 license. Follow the instructions to apply the GNU GPLv3. Then either paste this text to the bottom of the created file OR add a separate file (typically named COPYING.lesser or LICENSE.lesser) in the root of your source code and copy the text. +how: This license is an additional set of permissions to the GNU GPLv3 license. Follow the instructions to apply the GNU GPLv3. Then add a separate file named COPYING.LESSER in the root of your source code and copy the text. note: The Free Software Foundation recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the end of the GNU GPLv3 license. Insert the word “Lesser” before “General” in all three places in the boilerplate notice to make sure that you refer to the GNU LGPLv3 and not the GNU GPLv3. From 6a74345a6df9df803e02744c3dd361801ab6de2a Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Fri, 16 Sep 2016 10:12:43 +0200 Subject: [PATCH 11/20] Add Boost Software License 1.0. --- _licenses/bsl-1.0.txt | 56 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 _licenses/bsl-1.0.txt diff --git a/_licenses/bsl-1.0.txt b/_licenses/bsl-1.0.txt new file mode 100644 index 0000000..5ed1add --- /dev/null +++ b/_licenses/bsl-1.0.txt @@ -0,0 +1,56 @@ +--- +title: Boost Software License 1.0 +spdx-id: BSL-1.0 +source: https://opensource.org/licenses/BSL-1.0 + +description: This is a simple license that includes a clause on warranty, and encourages free and open use of software licensed under it. + +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. Add a comment to source files based on the following template, substituting appropriate text for the italicized portion: + // Copyright [fullname] [year]. + // Distributed under the Boost Software License, Version 1.0. + // (See accompanying file LICENSE_1_0.txt or copy at + // http://www.boost.org/LICENSE_1_0.txt) + +using: + - Boost: http://www.boost.org/users/license.html + +permissions: + - commercial-use + - modifications + - distribution + - private-use + +conditions: + - include-copyright + +limitations: + - no-liability + - same-license + +--- + +Boost Software License - Version 1.0 - August 17th, 2003 + +Permission is hereby granted, free of charge, to any person or organization +obtaining a copy of the software and accompanying documentation covered by +this license (the "Software") to use, reproduce, display, distribute, +execute, and transmit the Software, and to prepare derivative works of the +Software, and to permit third-parties to whom the Software is furnished to +do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including +the above license grant, this restriction and the following disclaimer, +must be included in all copies of the Software, in whole or in part, and +all derivative works of the Software, unless such copies or derivative +works are solely in the form of machine-executable object code generated by +a source language processor. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + From 8c7ee28d6c9904aa240cc37c146edbcd5020811b Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 16 Sep 2016 14:59:55 -0700 Subject: [PATCH 12/20] remove | sort from for loops, avoid new(?) liquid warning --- appendix.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/appendix.md b/appendix.md index b961268..a28f3be 100644 --- a/appendix.md +++ b/appendix.md @@ -25,7 +25,8 @@ If you're here to choose a license, **[start from the home page](/)** to see a f {% endfor %} {% endfor %} -{% for license in site.licenses | sort: 'path' %} +{% assign licenses = site.licenses sort: "path" %} +{% for license in licenses %} {{ license.title }} {% assign seen_tags = '' %} {% for type in types %} @@ -76,7 +77,8 @@ If you're here to choose a license, **[start from the home page](/)** to see a f
{{ rule_obj.label }}
{% capture seen_tags %}{{ seen_tags | append:req }}{% endcapture %} {% for t in types %} - {% for r in site.data.rules[t] | sort: "label" %} + {% assign rs = site.data.rules[t] | sort: "label" %} + {% for r in rs %} {% if r.tag == req %}
{{ r.description }}
{% endif %} From 8de49ac800111fb4636f8618a4ac2c56a97c7257 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Fri, 16 Sep 2016 15:40:36 -0700 Subject: [PATCH 13/20] alignment with other records * same-license is not a limitation and doesn't apply in any way to BSL-1.0 * other licenses with a per-file notice recommendation get that added to the note field * have the description mention the reason for this license existing, binary distribution without notices (IIUC) * remove using: pending an example that can be followed by others and detected eg on GitHub, see https://github.com/github/choosealicense.com/blob/gh-pages/README.md#optional-fields and see #358 #372 #377 --- _licenses/bsl-1.0.txt | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/_licenses/bsl-1.0.txt b/_licenses/bsl-1.0.txt index 5ed1add..04adcb0 100644 --- a/_licenses/bsl-1.0.txt +++ b/_licenses/bsl-1.0.txt @@ -3,17 +3,11 @@ title: Boost Software License 1.0 spdx-id: BSL-1.0 source: https://opensource.org/licenses/BSL-1.0 -description: This is a simple license that includes a clause on warranty, and encourages free and open use of software licensed under it. +description: A simple permissive license only requiring preservation of copyright and license notices for source (and not binary) distribution. Licensed works, modifications, and larger works may be distributed under different terms and without source code. -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. Add a comment to source files based on the following template, substituting appropriate text for the italicized portion: - // Copyright [fullname] [year]. - // Distributed under the Boost Software License, Version 1.0. - // (See accompanying file LICENSE_1_0.txt or copy at - // http://www.boost.org/LICENSE_1_0.txt) +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. -using: - - Boost: http://www.boost.org/users/license.html +note: Boost recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the [Boost Software License FAQ](http://www.boost.org/users/license.html#FAQ). permissions: - commercial-use @@ -26,7 +20,6 @@ conditions: limitations: - no-liability - - same-license --- @@ -53,4 +46,3 @@ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - From 33107b8baa33f3e34e733ca0eb3a0d12978d3a5e Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 18 Sep 2016 13:58:15 -0700 Subject: [PATCH 14/20] appendix link to see whether license already cataloged Inspired by https://github.com/github/choosealicense.com/issues/454 asking for an already-cataloged license to be added. --- CONTRIBUTING.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1faa0ed..2a41ddf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,7 +12,7 @@ get. But first, please make sure you understand what ## Adding a license -Choosealicense.com is intended to demystify license choices, not present all of them. As such, there are several requirements for a license to be listed on the site: +Choosealicense.com is intended to demystify license choices, not present or catalog all of them. As such, only a small number are highlighted on the home page and and there are several requirements for a license to be [cataloged](http://choosealicense.com/appendix/) on the site: 1. The license must have [an SPDX identifier](https://spdx.org/licenses/). If your license isn't registered with SPDX, please [request that it be added](https://spdx.org/spdx-license-list/request-new-license-or-exception). 2. The license must be listed on one of the following approved lists of licenses: @@ -23,6 +23,7 @@ Choosealicense.com is intended to demystify license choices, not present all of If your proposed license meets the above criteria, here's a few other things to keep in mind as you propose the license's addition: +* Is the license already cataloged? See for a list of all of the licenses known by the site. * Licenses live in the `/_licenses` folder. * The license files should be in the format of `_licenses/[lowercased-spdx-id].txt` (e.g., `_licenses/mit.txt`) * Each license has both [required and optional metadata](https://github.com/github/choosealicense.com#license-metadata) that should be included. From 14059979cdf57400c665102896d6496e5cacda63 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 18 Sep 2016 16:56:24 -0700 Subject: [PATCH 15/20] comma --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2a41ddf..90e4d89 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,7 +12,7 @@ get. But first, please make sure you understand what ## Adding a license -Choosealicense.com is intended to demystify license choices, not present or catalog all of them. As such, only a small number are highlighted on the home page and and there are several requirements for a license to be [cataloged](http://choosealicense.com/appendix/) on the site: +Choosealicense.com is intended to demystify license choices, not present or catalog all of them. As such, only a small number are highlighted on the home page or , and there are several requirements for a license to be [cataloged](http://choosealicense.com/appendix/) on the site: 1. The license must have [an SPDX identifier](https://spdx.org/licenses/). If your license isn't registered with SPDX, please [request that it be added](https://spdx.org/spdx-license-list/request-new-license-or-exception). 2. The license must be listed on one of the following approved lists of licenses: From 570f69e4ecd34ebbc261bfd838daa4b50e36722f Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 26 Sep 2016 11:20:44 -0700 Subject: [PATCH 16/20] hidden: false for 'popular' licenses - document criteria for whether a license is hidden - needed for license spectrum on /licenses OR - on 'popular' list at https://opensource.org/licenses (some other list could be used in the future) - adjust license properties and tests accordingly This gets non-hidden list back close to what it was before #386 and (pending licensee vendoring this change, licensee release, and github.com licensee dependency version bump) some commonly requested licenses (eg #413 #449) will reappear in the github.com license drop-down. --- README.md | 2 +- _data/meta.yml | 2 +- _licenses/bsd-2-clause.txt | 1 + _licenses/bsd-3-clause.txt | 1 + _licenses/epl-1.0.txt | 1 + _licenses/gpl-2.0.txt | 1 + _licenses/lgpl-2.1.txt | 1 + spec/license_shown_spec.rb | 7 ++++++- 8 files changed, 13 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 28d775e..a957412 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc #### Optional fields * `featured` - Whether the license should be featured on the main page (defaults to false) -* `hidden` - Whether the license is hidden from the license list (defaults to true) +* `hidden` - Whether the license is neither [popular](https://opensource.org/licenses) nor fills out the [spectrum of licenses](http://choosealicense.com/licenses/) from strongly conditional to unconditional (defaults to true) * `nickname` - Customary short name if applicable (e.g, GPLv3) * `note` - Additional information about the licenses * `using` - A list of up to 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that can be detected by [licensee](https://github.com/benbalter/licensee) in the form of `project_name: license_file_url` diff --git a/_data/meta.yml b/_data/meta.yml index 0a1cd1e..fc97bd0 100644 --- a/_data/meta.yml +++ b/_data/meta.yml @@ -40,7 +40,7 @@ required: false - name: hidden - description: Whether the license is hidden from the license list (defaults to true) + description: Whether the license is neither [popular](https://opensource.org/licenses) nor fills out the [spectrum of licenses](http://choosealicense.com/licenses/) from strongly conditional to unconditional (defaults to true) required: false - name: nickname diff --git a/_licenses/bsd-2-clause.txt b/_licenses/bsd-2-clause.txt index 8cc23e1..5add7a3 100644 --- a/_licenses/bsd-2-clause.txt +++ b/_licenses/bsd-2-clause.txt @@ -3,6 +3,7 @@ title: BSD 2-clause "Simplified" License spdx-id: BSD-2-Clause redirect_from: /licenses/bsd/ source: http://opensource.org/licenses/BSD-2-Clause +hidden: false description: A permissive license that comes in two variants, the BSD 2-Clause and BSD 3-Clause. Both have very minute differences to the MIT license. diff --git a/_licenses/bsd-3-clause.txt b/_licenses/bsd-3-clause.txt index a744acd..ecc98ac 100644 --- a/_licenses/bsd-3-clause.txt +++ b/_licenses/bsd-3-clause.txt @@ -2,6 +2,7 @@ title: BSD 3-clause "New" or "Revised" License spdx-id: BSD-3-Clause source: http://opensource.org/licenses/BSD-3-Clause +hidden: false description: A permissive license similar to the BSD 2-Clause License, but with a 3rd clause that prohibits others from using the name of the project or its contributors to promote derived products without written consent. diff --git a/_licenses/epl-1.0.txt b/_licenses/epl-1.0.txt index 53a738e..91307a8 100644 --- a/_licenses/epl-1.0.txt +++ b/_licenses/epl-1.0.txt @@ -3,6 +3,7 @@ title: Eclipse Public License 1.0 spdx-id: EPL-1.0 redirect_from: /licenses/eclipse/ source: https://www.eclipse.org/legal/epl-v10.html +hidden: false description: This commercially-friendly copyleft license provides the ability to commercially license binaries; a modern royalty-free patent license grant; and the ability for linked works to use other licenses, including commercial ones. diff --git a/_licenses/gpl-2.0.txt b/_licenses/gpl-2.0.txt index 2ff19dc..4d1bedb 100644 --- a/_licenses/gpl-2.0.txt +++ b/_licenses/gpl-2.0.txt @@ -4,6 +4,7 @@ spdx-id: GPL-2.0 nickname: GNU GPLv2 redirect_from: /licenses/gpl-v2/ source: http://www.gnu.org/licenses/gpl-2.0.txt +hidden: false description: The GNU GPL is the most widely used free software license and has a strong copyleft requirement. When distributing derived works, the source code of the work must be made available under the same license. There are multiple variants of the GNU GPL, each with different requirements. diff --git a/_licenses/lgpl-2.1.txt b/_licenses/lgpl-2.1.txt index f1f6ffd..9b353e8 100644 --- a/_licenses/lgpl-2.1.txt +++ b/_licenses/lgpl-2.1.txt @@ -4,6 +4,7 @@ spdx-id: LGPL-2.1 nickname: GNU LGPLv2.1 redirect_from: /licenses/lgpl-v2.1/ source: http://www.gnu.org/licenses/lgpl-2.1.txt +hidden: false description: Primarily used for software libraries, the GNU LGPL requires that derived works be licensed under the same license, but works that only link to it do not fall under this restriction. There are two commonly used versions of the GNU LGPL. diff --git a/spec/license_shown_spec.rb b/spec/license_shown_spec.rb index 90fb4cc..7c0ec1d 100644 --- a/spec/license_shown_spec.rb +++ b/spec/license_shown_spec.rb @@ -6,7 +6,12 @@ describe 'shown licenses' do SHOWN_LICENSES = %w( agpl-3.0 apache-2.0 + bsd-2-clause + bsd-3-clause + epl-1.0 + gpl-2.0 gpl-3.0 + lgpl-2.1 lgpl-3.0 mit mpl-2.0 @@ -14,7 +19,7 @@ describe 'shown licenses' do ).freeze it 'has the expected number of shown licenses' do - expect(shown_licenses.count).to eql(7) + expect(shown_licenses.count).to eql(12) end shown_licenses.each do |license| From 47048d41e75d73cda0dc6ed2d04ae3a5f6a59d7a Mon Sep 17 00:00:00 2001 From: Anand Date: Mon, 10 Oct 2016 23:42:52 +0200 Subject: [PATCH 17/20] Adding a link in the about page to FSF's advice on how to choose a license for your work. --- about.md | 1 + 1 file changed, 1 insertion(+) diff --git a/about.md b/about.md index c15de13..3540d01 100644 --- a/about.md +++ b/about.md @@ -19,6 +19,7 @@ See our [appendix](/appendix) for a table of all of the licenses cataloged in th {: .bullets} * Open Source Initiative's [list of licenses](https://opensource.org/licenses/) approved as conforming to the [Open Source Definition](https://opensource.org/osd) +* Free Software Foundation's [advice on how to choose a license](https://www.gnu.org/licenses/license-recommendations.en.html) * Free Software Foundation's [comments on various licenses](http://www.gnu.org/licenses/license-list.html) * Linux Foundation's [SPDX License List](https://spdx.org/licenses/) * [Comparison of free and open-source software licenses](https://en.wikipedia.org/wiki/Comparison_of_free_and_open-source_software_licenses) on English Wikipedia From 306ffb019431e114101f35d2a73f9ab36c2966bd Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 10 Oct 2016 15:25:29 -0700 Subject: [PATCH 18/20] fold 2 FSF links into one bullet --- about.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/about.md b/about.md index 3540d01..c33cdf9 100644 --- a/about.md +++ b/about.md @@ -19,8 +19,7 @@ See our [appendix](/appendix) for a table of all of the licenses cataloged in th {: .bullets} * Open Source Initiative's [list of licenses](https://opensource.org/licenses/) approved as conforming to the [Open Source Definition](https://opensource.org/osd) -* Free Software Foundation's [advice on how to choose a license](https://www.gnu.org/licenses/license-recommendations.en.html) -* Free Software Foundation's [comments on various licenses](http://www.gnu.org/licenses/license-list.html) +* Free Software Foundation's [comments on various licenses](http://www.gnu.org/licenses/license-list.html) and [advice on how to choose a license](https://www.gnu.org/licenses/license-recommendations.en.html) * Linux Foundation's [SPDX License List](https://spdx.org/licenses/) * [Comparison of free and open-source software licenses](https://en.wikipedia.org/wiki/Comparison_of_free_and_open-source_software_licenses) on English Wikipedia * [License differentiator](http://www.oss-watch.ac.uk/apps/licdiff/) ([source](https://github.com/ox-it/licdiff)) from [OSS Watch](http://www.oss-watch.ac.uk/) From a0120c2f2132db0539427f3eeadb7ea29f000ea9 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 12 Dec 2016 17:21:28 -0800 Subject: [PATCH 19/20] New home for John Cowan's license selection wizard Waybacked in https://github.com/github/choosealicense.com/commit/c008a5fbef641d49c83d5d61a8a5c66428efeb40, Cowan now has a new home, updating to that. --- about.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about.md b/about.md index c33cdf9..26572d5 100644 --- a/about.md +++ b/about.md @@ -23,7 +23,7 @@ See our [appendix](/appendix) for a table of all of the licenses cataloged in th * Linux Foundation's [SPDX License List](https://spdx.org/licenses/) * [Comparison of free and open-source software licenses](https://en.wikipedia.org/wiki/Comparison_of_free_and_open-source_software_licenses) on English Wikipedia * [License differentiator](http://www.oss-watch.ac.uk/apps/licdiff/) ([source](https://github.com/ox-it/licdiff)) from [OSS Watch](http://www.oss-watch.ac.uk/) -* [Free/Libre/Open Source license selection wizard](http://web.archive.org/web/20160801055258/http://home.ccil.org/~cowan/floss/) by John Cowan +* [Free/Libre/Open Source license selection wizard](http://vrici.lojban.org/~cowan/floss/) by John Cowan ## Help us improve it From 74ec63ec1b27e1c80ca6a78e166641bf2c65da22 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 12 Dec 2016 14:34:21 -0800 Subject: [PATCH 20/20] order gems so rubocop doesn't complain --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 66b1bc6..44de39e 100644 --- a/Gemfile +++ b/Gemfile @@ -8,14 +8,14 @@ gem 'github-pages', versions['github-pages'] group :development do gem 'colored' - gem 'terminal-table' gem 'fuzzy_match' + gem 'terminal-table' end group :test do gem 'html-proofer', '~> 3.0' + gem 'nokogiri' gem 'rake' gem 'rspec' - gem 'nokogiri' gem 'rubocop' end