Merge branch 'gh-pages' into home-reform

Author: mlinksva

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,22 +7,23 @@ 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
   - distribution
   - 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,22 +12,23 @@ 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
   - distribution
   - 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,20 +16,21 @@ 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
   - distribution
   - 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.
-
-conditions:
-  - include-copyright
-  - document-changes
+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.
 
 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