Merge branch 'gh-pages' into home-reform

Author: mlinksva

.rubocop.yml

@@ -1,9 +1,12 @@
 AllCops:
-  TargetRubyVersion: 2.1
+  TargetRubyVersion: 2.4
   Exclude:
     - _site/**/*
     - vendor/**/*
 
+Metrics/BlockLength:
+  Enabled: false
+
 Metrics/LineLength:
   Enabled: false
 

.travis.yml

@@ -5,7 +5,7 @@ script: "./script/cibuild"
 #environment
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.4.0
 
 branches:
   only:

CONTRIBUTING.md

@@ -14,12 +14,13 @@ get. But first, please make sure you understand what
 
 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).
+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).
 2. The license must be listed on one of the following approved lists of licenses:
    * [List of OSI approved licenses](https://opensource.org/licenses/alphabetical)
    * [GNU's list of free licenses](https://www.gnu.org/licenses/license-list.en.html) (*note: the license must be listed in one of the three "free" categories*)
    * [Open Definition's list of conformant licenses](http://opendefinition.org/licenses/) (non-code)
 3. A [GitHub code search](https://github.com/search?q=MIT+filename%3ALICENSE&type=Code) must reveal at least *1,000* public repositories using the license
+4. Identification of 3 notable projects using the license with straightforward LICENSE files which serve as examples newcomers can follow and that could be detected by [licensee](https://github.com/benbalter/licensee) if it knew about the license
 
 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:
 
@@ -28,6 +29,7 @@ If your proposed license meets the above criteria, here's a few other things to
 * 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.
 * The text of the license should be wrapped to a 78 character width.
+* The text of the license should match the corresponding text found at https://spdx.org/licenses/
 * The body of the file should be the text of the license in plain text.
 
 ## Making Changes

Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 require 'json'

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2016 GitHub, Inc. and contributors
+Copyright (c) 2013-2017 GitHub, Inc. and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -44,6 +44,7 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc
 * `source` - The URL to the license source text
 * `description` - A human-readable description of the license
 * `how` - Instructions on how to implement the license
+* `using` - A list of 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`
 * `permissions` - Bulleted list of permission rules
 * `conditions` - Bulleted list of condition rules
 * `limitations` - Bulleted list of limitation rules
@@ -54,7 +55,6 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc
 * `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`
 * `redirect_from` - Relative path(s) to redirect to the license from, to prevent breaking old URLs
 
 ### Auto-populated fields
@@ -80,23 +80,26 @@ The license properties (rules) are stored as a bulleted list within the licenses
 
 * `commercial-use` - This software and derivatives may be used for commercial purposes.
 * `modifications` - This software may be modified.
-* `distribution` - You may distribute this software.
-* `private-use` - You may use and modify the software without distributing it.
-* `patent-use` - This license provides an express grant of patent rights from the contributor to the recipient.
+* `distribution` - This software may be distributed.
+* `private-use` - This software may be used and modified in private.
+* `patent-use` - This license provides an express grant of patent rights from contributors.
 
 #### Conditions
 
-* `include-copyright` - Include a copy of the license and copyright notice with the code.
-* `document-changes` - Indicate changes made to the code.
-* `disclose-source` - Source code must be made available when distributing the software.
-* `network-use-disclose` - Users who interact with the software via network are given the right to receive a copy of the corresponding source code.
+* `include-copyright` - A copy of the license and copyright notice must be included with the software.
+* `document-changes` - Changes made to the code must be documented.
+* `disclose-source` - Source code must be made available when the software is distributed.
+* `network-use-disclose` - Users who interact with the software via network are given the right to receive a copy of the source code.
 * `same-license` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used.
+* `same-license--file` - Modifications of existing files must be released under the same license when distributing the software. In some cases a similar or related license may be used.
+* `same-license--library` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used, or this condition may not apply to works that use the software as a library.
 
 #### Limitations
 
-* `trademark-use` - 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.
-* `no-liability` - Software is provided without warranty and the software author/license owner cannot be held liable for damages.
-* `patent-use` -  This license explicitly states that it does NOT grant you any rights in the patents of contributors.
+* `trademark-use` - This license explicitly states that it does NOT grant trademark rights, even though licenses without such a statement probably do not grant any implicit trademark rights.
+* `liability` - This license includes a limitation of liability.
+* `patent-use` - This license explicitly states that it does NOT grant any rights in the patents of contributors.
+* `warranty` - The license explicitly states that it does NOT provide any warranty.
 
 ## License
 

Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'html-proofer'
 require 'rspec/core/rake_task'
 
@@ -13,7 +15,8 @@ task :test do
   HTMLProofer.check_directory('./_site',
                               check_html: true,
                               validation: { ignore_script_embeds: true },
-                              url_swap: { %r{http://choosealicense.com} => '' }).run
+                              url_swap: { %r{https://choosealicense.com} => '' },
+                              check_img_http: true).run
 end
 
 task :approved_licenses do
@@ -24,7 +27,7 @@ task :approved_licenses do
   puts approved.join(', ')
   puts "\n"
 
-  potential = approved - licenses.map { |l| l['id'] }
+  potential = approved - (licenses.map { |l| l['id'] })
   puts "#{potential.count} potential additions:"
   puts potential.join(', ')
 end

_config.yml

@@ -3,7 +3,7 @@ title: Choose a License
 description: Non-judgmental guidance on choosing a license for your open source project
 relative_permalinks: false
 markdown: kramdown
-url: "http://choosealicense.com"
+url: "https://choosealicense.com"
 
 collections:
   licenses:

_data/meta.yml

@@ -33,6 +33,10 @@
   description: Bulleted list of limited rules
   required: true
 
+- name: using
+  description: 'A list of 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`'
+  required: true
+
 # Optional fields
 
 - name: featured
@@ -51,10 +55,6 @@
   description: Additional information about the licenses
   required: false
 
-- name: using
-  description: '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`'
-  required: false
-
 - name: redirect_from
   description: Relative path(s) to redirect to the license from, to prevent breaking old URLs
   required: false

_data/rules.yml

@@ -1,44 +1,53 @@
 permissions:
 - description: This software and derivatives may be used for commercial purposes.
-  label: Commercial Use
+  label: Commercial use
   tag: commercial-use
 - description: This software may be modified.
   label: Modification
   tag: modifications
-- description: You may distribute this software.
+- description: This software may be distributed.
   label: Distribution
   tag: distribution
-- description: You may use and modify the software without distributing it.
-  label: Private Use
+- description: This software may be used and modified in private.
+  label: Private use
   tag: private-use
-- description: This license provides an express grant of patent rights from the contributor to the recipient.
-  label: Patent Use
+- description: This license provides an express grant of patent rights from contributors.
+  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
+- description: A copy of the license and copyright notice must be included with the software.
+  label: License and copyright notice
   tag: include-copyright
-- description: Indicate changes made to the code.
-  label: State Changes
+- description: Changes made to the code must be documented.
+  label: State changes
   tag: document-changes
-- description: Source code must be made available when distributing the software.
-  label: Disclose Source
+- description: Source code must be made available when the software is distributed.
+  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
+- description: Users who interact with the software via network are given the right to receive a copy of the 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
+  label: Same license
   tag: same-license
+- description: Modifications of existing files 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 (file)
+  tag: same-license--file
+- description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used, or this condition may not apply to works that use the software as a library.
+  label: Same license (library)
+  tag: same-license--library
 
 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
+- description: This license explicitly states that it does NOT grant trademark rights, even though licenses without such a statement probably do not grant any implicit trademark rights.
+  label: Trademark use
   tag: trademark-use
-- description: Software is provided without warranty and the software author/license owner cannot be held liable for damages.
-  label: Hold Liable
-  tag: no-liability
-- description: This license explicitly states that it does NOT grant you any rights in the patents of contributors.
-  label: Patent Use
+- description: This license includes a limitation of liability.
+  label: Liability
+  tag: liability
+- description: This license explicitly states that it does NOT grant any rights in the patents of contributors.
+  label: Patent use
   tag: patent-use
+- description: The license explicitly states that it does NOT provide any warranty.
+  label: Warranty
+  tag: warranty