Merge branch 'gh-pages' into home-reform

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 or <http://choosealicense.com/licenses>, 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 <http://choosealicense.com/appendix/> 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.
@@ -40,6 +41,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

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

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`

_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

_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

_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:

_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

_licenses/apache-2.0.txt

@@ -16,10 +16,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
@@ -27,9 +23,14 @@ permissions:
   - patent-use
   - private-use
 
+conditions:
+  - include-copyright
+  - document-changes
+
 limitations:
   - trademark-use
   - no-liability
+
 ---
 
                                  Apache License

_licenses/artistic-2.0.txt

@@ -6,11 +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), which refers to the license itself, not the licensed project.
-
-conditions:
-  - include-copyright
-  - document-changes
 
 permissions:
   - commercial-use
@@ -19,9 +15,14 @@ permissions:
   - patent-use
   - private-use
 
+conditions:
+  - include-copyright
+  - document-changes
+
 limitations:
   - no-liability
   - trademark-use
+
 ---
 
 		       The Artistic License 2.0

_licenses/bsd-2-clause.txt

@@ -3,22 +3,24 @@ 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 <a href="/licenses/bsd-2-clause/">BSD 2-Clause</a> and <a href="/licenses/bsd-3-clause/">BSD 3-Clause</a>. Both have very minute differences to the MIT 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. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders.
 
-conditions:
-  - include-copyright
-
 permissions:
   - commercial-use
   - modifications
   - distribution
   - private-use
 
+conditions:
+  - include-copyright
+
 limitations:
   - no-liability
+
 ---
 
 BSD 2-Clause License

_licenses/bsd-3-clause-clear.txt

@@ -1,25 +1,25 @@
 ---
 title: BSD 3-clause Clear License
 spdx-id: BSD-3-Clause-Clear
+source: https://spdx.org/licenses/BSD-3-Clause-Clear.html
 
 description: A variant of the <a href="/licenses/bsd-3-clause/">BSD 3-Clause License</a> 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

_licenses/bsd-3-clause.txt

@@ -2,22 +2,24 @@
 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 <a href="/licenses/bsd-2-clause/">BSD 2-Clause License</a>, 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.
 
 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.
 
-conditions:
-  - include-copyright
-
 permissions:
   - commercial-use
   - modifications
   - distribution
   - private-use
 
+conditions:
+  - include-copyright
+
 limitations:
   - no-liability
+
 ---
 
 BSD 3-Clause License

_licenses/bsl-1.0.txt

@@ -0,0 +1,48 @@
+---
+title: Boost Software License 1.0
+spdx-id: BSL-1.0
+source: https://opensource.org/licenses/BSL-1.0
+
+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.
+
+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
+  - modifications
+  - distribution
+  - private-use
+
+conditions:
+  - include-copyright
+
+limitations:
+  - no-liability
+
+---
+
+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.

_licenses/cc-by-4.0.txt

@@ -7,20 +7,21 @@ 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 soley supply a link to a copy of the license, usually to the <a href='https://creativecommons.org/licenses/by/4.0/'>canonical URL for the license</a>.
 
-conditions:
-  - include-copyright
-  - document-changes
-
 permissions:
   - commercial-use
   - modifications
   - distribution
   - private-use
 
+conditions:
+  - include-copyright
+  - document-changes
+
 limitations:
   - no-liability
   - trademark-use
   - patent-use
+
 ---
 
 Attribution 4.0 International

_licenses/cc-by-sa-4.0.txt

@@ -7,21 +7,22 @@ description: Similar to <a href='/licenses/cc-by-4.0/'>CC-BY-4.0</a> 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 soley supply a link to a copy of the license, usually to the <a href='https://creativecommons.org/licenses/by-sa/4.0/'>canonical URL for the license</a>.
 
-conditions:
-  - include-copyright
-  - document-changes
-  - same-license
-
 permissions:
   - commercial-use
   - modifications
   - distribution
   - private-use
 
+conditions:
+  - include-copyright
+  - document-changes
+  - same-license
+
 limitations:
   - no-liability
   - trademark-use
   - patent-use
+
 ---
 
 Attribution-ShareAlike 4.0 International

_licenses/cc0-1.0.txt

@@ -22,6 +22,7 @@ limitations:
   - no-liability
   - trademark-use
   - patent-use
+
 ---
 
 CC0 1.0 Universal

_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.
 
@@ -13,11 +14,6 @@ using:
   - JUnit: https://github.com/junit-team/junit/blob/master/LICENSE-junit.txt
   - openHAB: https://github.com/openhab/openhab/blob/master/LICENSE.TXT
 
-conditions:
-  - disclose-source
-  - include-copyright
-  - same-license
-
 permissions:
   - commercial-use
   - distribution
@@ -25,8 +21,14 @@ permissions:
   - patent-use
   - private-use
 
+conditions:
+  - disclose-source
+  - include-copyright
+  - same-license
+
 limitations:
   - no-liability
+
 ---
 
 Eclipse Public License - v 1.0

_licenses/eupl-1.1.txt

@@ -10,13 +10,6 @@ how: Create a text file (typically named COPYING or LICENCE.txt) in the root of
 
 note: The European Commission recommends taking the additional step of adding a [boilerplate notice](https://joinup.ec.europa.eu/sites/default/files/ckeditor_files/files/EUPL%201_1%20Guidelines%20EN%20Joinup.pdf#page=17) to the top of each file.
 
-conditions:
-  - include-copyright
-  - disclose-source
-  - document-changes
-  - network-use-disclose
-  - same-license
-
 permissions:
   - commercial-use
   - modifications
@@ -24,9 +17,17 @@ permissions:
   - patent-use
   - private-use
 
+conditions:
+  - include-copyright
+  - disclose-source
+  - document-changes
+  - network-use-disclose
+  - same-license
+
 limitations:
   - no-liability
   - trademark-use
+
 ---
 
 European Union Public Licence

_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.
 
@@ -15,20 +16,21 @@ using:
   - Linux: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/COPYING
   - WordPress: https://github.com/WordPress/WordPress/blob/master/license.txt
 
-conditions:
-  - include-copyright
-  - document-changes
-  - disclose-source
-  - same-license
-
 permissions:
   - commercial-use
   - modifications
   - distribution
   - private-use
 
+conditions:
+  - include-copyright
+  - document-changes
+  - disclose-source
+  - same-license
+
 limitations:
   - no-liability
+
 ---
 
                     GNU GENERAL PUBLIC LICENSE

_licenses/gpl-3.0.txt

@@ -18,12 +18,6 @@ using:
   - GIMP: https://git.gnome.org/browse/gimp/tree/COPYING
   - Privacy Badger: https://github.com/EFForg/privacybadgerfirefox/blob/master/LICENSE
 
-conditions:
-  - include-copyright
-  - document-changes
-  - disclose-source
-  - same-license
-
 permissions:
   - commercial-use
   - modifications
@@ -31,8 +25,15 @@ permissions:
   - patent-use
   - private-use
 
+conditions:
+  - include-copyright
+  - document-changes
+  - disclose-source
+  - same-license
+
 limitations:
   - no-liability
+
 ---
 
                     GNU GENERAL PUBLIC LICENSE

_licenses/isc.txt

@@ -12,17 +12,18 @@ using:
   - Node.js semver: https://github.com/npm/node-semver/blob/master/LICENSE
   - OpenStreetMap iD: https://github.com/openstreetmap/iD/blob/master/LICENSE
 
-conditions:
-  - include-copyright
-
 permissions:
   - commercial-use
   - distribution
   - modifications
   - private-use
 
+conditions:
+  - include-copyright
+
 limitations:
   - no-liability
+
 ---
 
 ISC License

_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.
 
@@ -11,20 +12,21 @@ 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
-  - disclose-source
-  - document-changes
-  - same-license
-
 permissions:
   - commercial-use
   - modifications
   - distribution
   - private-use
 
+conditions:
+  - include-copyright
+  - disclose-source
+  - document-changes
+  - same-license
+
 limitations:
   - no-liability
+
 ---
 
                   GNU LESSER GENERAL PUBLIC LICENSE

_licenses/lgpl-3.0.txt

@@ -8,17 +8,10 @@ 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 <a href="/licenses/gpl-3.0">GNU GPLv3</a> 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 <a href="/licenses/gpl-3.0">GNU GPLv3</a> 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 <a href="/licenses/gpl-3.0">GNU GPLv3 license</a>. 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

_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

_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

_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

_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)

_licenses/ms-rl.txt

@@ -1,18 +1,12 @@
 ---
 title: Microsoft Reciprocal License
 spdx-id: MS-RL
-
+source: http://opensource.org/licenses/ms-rl
-source: http://opensource.org/licenses/ms-pl
 
 description: An open source license with a patent grant similar to the <a href="/licenses/ms-pl/">Microsoft Public License</a>, 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)

_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
 

_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

_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
+  - kakoune: https://github.com/mawww/kakoune/blob/master/UNLICENSE
+
 permissions:
   - private-use
   - commercial-use
@@ -19,6 +23,7 @@ conditions: []
 
 limitations:
   - no-liability
+
 ---
 
 This is free and unencumbered software released into the public domain.

_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: []
 
 ---

_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

about.md

@@ -19,11 +19,11 @@ 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 [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/)
-* [Free/Libre/Open Source license selection wizard](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
 

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 %}
 </tr>
-{% for license in site.licenses | sort: 'path' %}
+{% assign licenses = site.licenses sort: "path" %}
+{% for license in licenses %}
   <tr style="height: 3em"><th scope="row"><a href="{{ license.id }}">{{ license.title }}</a></th>
   {% 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
     <dt id="{{ req }}">{{ rule_obj.label }}</dt>
     {% 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 %}
           <dd class="license-{{t}}"><span class="license-sprite"></span> {{ r.description }}</dd>
         {% endif %}

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.
+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.
-
-<div class="clearfix">
-<div class="license-body">
-<pre id="license-text">Copyright [year] [fullname]</pre>
-</div> <!-- /license-body -->
-</div>
 
 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:
 

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|