Merge branch 'gh-pages' into home-reform

mlinksva · web-flow · commit 0bb1d1324b69 · 2017-11-04T10:54:27.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,11 @@ language: ruby
 rvm:
   - 2.4.0
 
+addons:
+  apt:
+    packages:
+    - libcurl4-openssl-dev
+
 branches:
   only:
     - gh-pages
diff --git a/_config.yml b/_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
diff --git a/_licenses/afl-3.0.txt b/_licenses/afl-3.0.txt
@@ -1,7 +1,7 @@
 ---
 title: Academic Free License v3.0
 spdx-id: AFL-3.0
-source: http://opensource.org/licenses/afl-3.0
+source: https://opensource.org/licenses/afl-3.0
 
 description: The Academic Free License is a variant of the Open Software License that does not require that the source code of derivative works be disclosed. It contains explicit copyright and patent grants and reserves trademark rights in the author.
 
diff --git a/_licenses/agpl-3.0.txt b/_licenses/agpl-3.0.txt
@@ -3,7 +3,7 @@ title: GNU Affero General Public License v3.0
 spdx-id: AGPL-3.0
 nickname: GNU AGPLv3
 redirect_from: /licenses/agpl/
-source: http://www.gnu.org/licenses/agpl-3.0.txt
+source: https://www.gnu.org/licenses/agpl-3.0.txt
 hidden: false
 
 description: Permissions of this strongest copyleft license are conditioned on making available complete source code of licensed works and modifications, which include larger works using a licensed work, under the same license. Copyright and license notices must be preserved. Contributors provide an express grant of patent rights. When a modified version is used to provide a service over a network, the complete source code of the modified version must be made available.
diff --git a/_licenses/apache-2.0.txt b/_licenses/apache-2.0.txt
@@ -2,7 +2,8 @@
 title: Apache License 2.0
 spdx-id: Apache-2.0
 redirect_from: /licenses/apache/
-source: http://www.apache.org/licenses/LICENSE-2.0.html
+source: https://www.apache.org/licenses/LICENSE-2.0.html
+featured: true
 hidden: false
 
 description: A permissive license whose main conditions require preservation of copyright and license notices. Contributors provide an express grant of patent rights. Licensed works, modifications, and larger works may be distributed under different terms and without source code.
@@ -214,15 +215,15 @@ 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
       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}
+   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.
diff --git a/_licenses/bsd-2-clause.txt b/_licenses/bsd-2-clause.txt
@@ -2,7 +2,7 @@
 title: BSD 2-clause "Simplified" License
 spdx-id: BSD-2-Clause
 redirect_from: /licenses/bsd/
-source: http://opensource.org/licenses/BSD-2-Clause
+source: https://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.
diff --git a/_licenses/bsd-3-clause.txt b/_licenses/bsd-3-clause.txt
@@ -1,7 +1,7 @@
 ---
 title: BSD 3-clause "New" or "Revised" License
 spdx-id: BSD-3-Clause
-source: http://opensource.org/licenses/BSD-3-Clause
+source: https://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.
diff --git a/_licenses/cc0-1.0.txt b/_licenses/cc0-1.0.txt
@@ -2,9 +2,9 @@
 title: Creative Commons Zero v1.0 Universal
 spdx-id: CC0-1.0
 redirect_from: /licenses/cc0/
-source: http://creativecommons.org/publicdomain/zero/1.0/
+source: https://creativecommons.org/publicdomain/zero/1.0/
 
-description: The <a href="http://creativecommons.org/publicdomain/zero/1.0/">Creative Commons CC0 Public Domain Dedication</a> waives copyright interest in any a work you've created and dedicates it to the world-wide public domain. Use CC0 to opt out of copyright entirely and ensure your work has the widest reach. As with the Unlicense and typical software licenses, CC0 disclaims warranties. CC0 is very similar to the Unlicense.
+description: The <a href="https://creativecommons.org/publicdomain/zero/1.0/">Creative Commons CC0 Public Domain Dedication</a> waives copyright interest in any a work you've created and dedicates it to the world-wide public domain. Use CC0 to opt out of copyright entirely and ensure your work has the widest reach. As with the Unlicense and typical software licenses, CC0 disclaims warranties. CC0 is very similar to the Unlicense.
 
 how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the CC0 into the file.
 
diff --git a/_licenses/ecl-2.0.txt b/_licenses/ecl-2.0.txt
@@ -12,7 +12,7 @@ note: The Apereo Foundation recommends taking the additional step of adding a bo
 using:
   - Sakai: https://github.com/sakaiproject/sakai/blob/master/LICENSE
   - OAE: https://github.com/oaeproject/Hilary/blob/master/LICENSE
-  - Opencast Matterhorn: https://bitbucket.org/opencast-community/matterhorn/src/e5b1684a822c0bd9bb07f3e53b4e1f22932da5ef/LICENSE?fileviewer=file-view-default
+  - Opencast: https://bitbucket.org/opencast-community/opencast/src/905077ba5e6483f8c49869a1fc13bf9268790a79/LICENSE?at=develop
 
 permissions:
   - commercial-use
@@ -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
 
diff --git a/_licenses/epl-1.0.txt b/_licenses/epl-1.0.txt
@@ -10,9 +10,9 @@ description: This commercially-friendly copyleft license provides the ability to
 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:
-  - Clojure: https://github.com/clojure/clojure/blob/master/epl-v10.html
-  - JUnit: https://github.com/junit-team/junit/blob/master/LICENSE-junit.txt
-  - openHAB: https://github.com/openhab/openhab/blob/master/LICENSE.TXT
+  - Eclipse Che: https://github.com/eclipse/che/blob/master/LICENSE
+  - JUnit: https://github.com/junit-team/junit4/blob/master/LICENSE-junit.txt
+  - openHAB: https://github.com/openhab/openhab-distro/blob/master/LICENSE
 
 permissions:
   - commercial-use
diff --git a/_licenses/eupl-1.1.txt b/_licenses/eupl-1.1.txt
@@ -2,7 +2,7 @@
 title: European Union Public License 1.1
 spdx-id: EUPL-1.1
 redirect_from: /licenses/eupl-v1.1/
-source: https://joinup.ec.europa.eu/community/eupl/og_page/eupl-text-11-12
+source: https://joinup.ec.europa.eu/page/eupl-text-11-12
 
 description: The “European Union Public Licence” (EUPL) is a copyleft free/open source software license created on the initiative of and approved by the European Commission in 22 official languages of the European Union.
 
diff --git a/_licenses/gpl-2.0.txt b/_licenses/gpl-2.0.txt
@@ -3,7 +3,7 @@ title: GNU General Public License v2.0
 spdx-id: GPL-2.0
 nickname: GNU GPLv2
 redirect_from: /licenses/gpl-v2/
-source: http://www.gnu.org/licenses/gpl-2.0.txt
+source: https://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.
@@ -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}
-    Copyright (C) {year}  {fullname}
+    <one line to give the program's name and a brief idea of what it does.>
+    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
diff --git a/_licenses/gpl-3.0.txt b/_licenses/gpl-3.0.txt
@@ -3,7 +3,7 @@ title: GNU General Public License v3.0
 spdx-id: GPL-3.0
 nickname: GNU GPLv3
 redirect_from: /licenses/gpl-v3/
-source: http://www.gnu.org/licenses/gpl-3.0.txt
+source: https://www.gnu.org/licenses/gpl-3.0.txt
 featured: true
 hidden: false
 
@@ -14,7 +14,7 @@ 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.
 
 using:
-  - Bash: http://git.savannah.gnu.org/cgit/bash.git/tree/COPYING
+  - Bash: https://git.savannah.gnu.org/cgit/bash.git/tree/COPYING
   - GIMP: https://git.gnome.org/browse/gimp/tree/COPYING
   - Privacy Badger: https://github.com/EFForg/privacybadgerfirefox/blob/master/LICENSE
 
@@ -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.}
-    Copyright (C) {year}  {name of author}
+    <one line to give the program's name and a brief idea of what it does.>
+    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.
diff --git a/_licenses/isc.txt b/_licenses/isc.txt
@@ -1,7 +1,7 @@
 ---
 title: ISC License
 spdx-id: ISC
-source: http://opensource.org/licenses/isc-license
+source: https://opensource.org/licenses/isc-license
 
 description: A permissive license lets people do anything with your code with proper attribution and without warranty. The ISC license is functionally equivalent to the <a href="/licenses/bsd-2-clause/">BSD 2-Clause</a> and <a href="/licenses/mit/">MIT</a> licenses, removing some language that is no longer necessary.
 
diff --git a/_licenses/lgpl-2.1.txt b/_licenses/lgpl-2.1.txt
@@ -3,7 +3,7 @@ title: GNU Lesser General Public License v2.1
 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
+source: https://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.
@@ -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}
-    Copyright (C) {year} {fullname}
+    <one line to give the library's name and a brief idea of what it does.>
+    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!
diff --git a/_licenses/lgpl-3.0.txt b/_licenses/lgpl-3.0.txt
@@ -3,7 +3,7 @@ title: GNU Lesser General Public License v3.0
 spdx-id: LGPL-3.0
 nickname: GNU LGPLv3
 redirect_from: /licenses/lgpl-v3/
-source: http://www.gnu.org/licenses/lgpl-3.0.txt
+source: https://www.gnu.org/licenses/lgpl-3.0.txt
 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.
diff --git a/_licenses/mpl-2.0.txt b/_licenses/mpl-2.0.txt
@@ -13,8 +13,8 @@ note: The Mozilla Foundation recommends taking the additional step of adding a b
 
 using:
   - Servo: https://github.com/servo/servo/blob/master/LICENSE
+  - Syncthing: https://github.com/syncthing/syncthing/blob/master/LICENSE
   - TimelineJS3: https://github.com/NUKnightLab/TimelineJS3/blob/master/LICENSE
-  - LibreOffice: https://cgit.freedesktop.org/libreoffice/core/tree/COPYING.MPL
 
 permissions:
   - commercial-use
diff --git a/_licenses/ms-pl.txt b/_licenses/ms-pl.txt
@@ -1,7 +1,7 @@
 ---
 title: Microsoft Public License
 spdx-id: MS-PL
-source: http://opensource.org/licenses/ms-pl
+source: https://opensource.org/licenses/ms-pl
 
 description: An open source license with a patent grant.
 
diff --git a/_licenses/ms-rl.txt b/_licenses/ms-rl.txt
@@ -1,7 +1,7 @@
 ---
 title: Microsoft Reciprocal License
 spdx-id: MS-RL
-source: http://opensource.org/licenses/ms-rl
+source: https://opensource.org/licenses/ms-rl
 
 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.
 
diff --git a/_licenses/osl-3.0.txt b/_licenses/osl-3.0.txt
@@ -1,7 +1,7 @@
 ---
 title: Open Software License 3.0
 spdx-id: OSL-3.0
-source: http://opensource.org/licenses/OSL-3.0
+source: https://opensource.org/licenses/OSL-3.0
 
 description: OSL 3.0 is a copyleft license that does not require reciprocal licensing on linked works. It also provides an express grant of patent rights from contributors to users, with a termination clause triggered if a user files a patent infringement lawsuit.
 
@@ -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:
diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.txt
@@ -1,7 +1,7 @@
 ---
 title: The Unlicense
 spdx-id: Unlicense
-source: http://unlicense.org/UNLICENSE
+source: https://unlicense.org/UNLICENSE
 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.
@@ -50,4 +50,4 @@ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
-For more information, please refer to <https://unlicense.org>
+For more information, please refer to <http://unlicense.org>
diff --git a/appendix.md b/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 = '' %}
diff --git a/existing.md b/existing.md
@@ -14,6 +14,6 @@ Some communities have strong preferences for particular licenses. If you want to
 
 * [Apache](https://www.apache.org/licenses/) requires [Apache License 2.0](/licenses/apache-2.0/)
 * [GNU](https://www.gnu.org/licenses/license-recommendations.html) recommends [GNU GPLv3](/licenses/gpl-3.0/) for most programs
-* [OpenBSD](http://www.openbsd.org/policy.html) prefers [ISC](/licenses/isc/)
+* [OpenBSD](https://www.openbsd.org/policy.html) prefers [ISC](/licenses/isc/)
 
 Communities come in all shapes and sizes. The examples above are *very* well established. If the community you see your project as a part of doesn't have set-in-stone licensing traditions, or you don't see your project as part of any particular community, that's just fine: [make your own choice of an open source license](/).
diff --git a/non-software.md b/non-software.md
@@ -4,7 +4,7 @@ layout: default
 permalink: /non-software/
 ---
 
-Open source software licenses can be used for non-software works, and often are the best choice. This is particularly the case when the works in question can be edited and versioned as source, e.g., [open source hardware](http://www.oshwa.org/definition/) designs. Choose an [open source license](/licenses/).
+Open source software licenses can be used for non-software works, and often are the best choice. This is particularly the case when the works in question can be edited and versioned as source, e.g., [open source hardware](https://www.oshwa.org/definition/) designs. Choose an [open source license](/licenses/).
 
 ### Data, media, etc.
 
diff --git a/spec/license_fields_spec.rb b/spec/license_fields_spec.rb
