Merge https://github.com/github/choosealicense.com into patch-1

_config.yml

@@ -35,7 +35,7 @@ exclude:
   - assets/vendor/selectivizr/tests
   - assets/vendor/clipboard/test
 
-gems:
+plugins:
   - jekyll-sitemap
   - jekyll-redirect-from
   - jekyll-seo-tag

_licenses/apache-2.0.txt

@@ -215,7 +215,7 @@ limitations:
    APPENDIX: How to apply the Apache License to your work.
 
       To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
+      boilerplate notice, with the fields enclosed by brackets "[]"
       replaced with your own identifying information. (Don't include
       the brackets!)  The text should be enclosed in the appropriate
       comment syntax for the file format. We also recommend that a
@@ -223,7 +223,7 @@ limitations:
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright {yyyy} {name of copyright owner}
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

_licenses/ecl-2.0.txt

@@ -216,14 +216,14 @@ END OF TERMS AND CONDITIONS
 APPENDIX: How to apply the Educational Community License to your work
 
 To apply the Educational Community License to your work, attach the following
-boilerplate notice, with the fields enclosed by brackets "{}" replaced with
+boilerplate notice, with the fields enclosed by brackets "[]" replaced with
 your own identifying information. (Don't include the brackets!) The text
 should be enclosed in the appropriate comment syntax for the file format. We
 also recommend that a file or class name and description of purpose be
 included on the same "printed page" as the copyright notice for easier
 identification within third-party archives.
 
-Copyright {yyyy} {name of copyright owner} Licensed under the Educational
+Copyright [yyyy] [name of copyright owner] Licensed under the Educational
 Community License, Version 2.0 (the "License"); you may not use this file
 except in compliance with the License. You may obtain a copy of the License at
 

_licenses/gpl-2.0.txt

@@ -37,7 +37,7 @@ limitations:
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
@@ -326,8 +326,8 @@ to attach them to the start of each source file to most effectively
 convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    {description}
+    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) {year}  {fullname}
+    Copyright (C) <year>  <name of author>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -365,7 +365,7 @@ necessary.  Here is a sample; alter the names:
   Yoyodyne, Inc., hereby disclaims all copyright interest in the program
   `Gnomovision' (which makes passes at compilers) written by James Hacker.
 
-  {signature of Ty Coon}, 1 April 1989
+  <signature of Ty Coon>, 1 April 1989
   Ty Coon, President of Vice
 
 This General Public License does not permit incorporating your program into

_licenses/gpl-3.0.txt

@@ -670,8 +670,8 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    {one line to give the program's name and a brief idea of what it does.}
+    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) {year}  {name of author}
+    Copyright (C) <year>  <name of author>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -691,7 +691,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    {project}  Copyright (C) {year}  {fullname}
+    <program>  Copyright (C) <year>  <name of author>
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

_licenses/lgpl-2.1.txt

@@ -40,9 +40,9 @@ limitations:
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-(This is the first released version of the Lesser GPL.  It also counts
+[This is the first released version of the Lesser GPL.  It also counts
  as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.)
+ the version number 2.1.]
 
                             Preamble
 
@@ -504,8 +504,8 @@ safest to attach them to the start of each source file to most effectively
 convey the exclusion of warranty; and each file should have at least the
 "copyright" line and a pointer to where the full notice is found.
 
-    {description}
+    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) {year} {fullname}
+    Copyright (C) <year>  <name of author>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -532,7 +532,7 @@ necessary.  Here is a sample; alter the names:
   library `Frob' (a library for tweaking knobs) written by James Random
   Hacker.
 
-  {signature of Ty Coon}, 1 April 1990
+  <signature of Ty Coon>, 1 April 1990
   Ty Coon, President of Vice
 
 That's all there is to it!

_licenses/osl-3.0.txt

@@ -11,7 +11,7 @@ note: OSL 3.0's author has <a href="http://rosenlaw.com/OSL3.0-explained.htm">pr
 
 using:
   - appserver.io: https://github.com/appserver-io/appserver/blob/master/LICENSE.txt
-  - Magento 2: https://github.com/magento/magento2/blob/develop/LICENSE.txt
+  - JsonMapper: https://github.com/cweiske/jsonmapper/blob/master/LICENSE
   - Restyaboard: https://github.com/RestyaPlatform/board/blob/master/LICENSE.txt
 
 permissions:

appendix.md

@@ -25,7 +25,7 @@ If you're here to choose a license, **[start from the home page](/)** to see a f
     {% endfor %}
   {% endfor %}
 </tr>
-{% assign licenses = 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 = '' %}

spec/license_fields_spec.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe 'license fillable fields' do
-  licenses.each do |license|
-    context "The #{license['title']} license" do
-      matches = license['content'].scan(/(\A|\W)\[([a-z]+)\]/).map { |row| row[1] }
-      extra_fields = matches.flatten - (fields.map { |f| f['name'] })
-      it 'should only contain supported fillable fields' do
-        expect(extra_fields).to be_empty
-      end
-      it 'does not overlook supported fillable fields' do
-        matches_generous = license['content'].scan(/\[([a-z]+)\]/)
-        extra_fields_generous = matches_generous.flatten - (fields.map { |f| f['name'] })
-        expect(matches_generous.flatten - extra_fields_generous).to eq matches
-      end
-    end
-  end
-end