Merge branch 'gh-pages' into gh-pages

404.md

@@ -0,0 +1,6 @@
+---
+title: 404 Not Found
+---
+Sorry! We could not find the page you were looking for.
+
+If you were trying to see a license, go to [licenses](/licenses).

_licenses/eupl-1.1.txt

@@ -7,7 +7,7 @@ description: The “European Union Public Licence” (EUPL) is a copyleft free/o
 
 how: Create a text file (typically named COPYING or LICENCE.txt) in the root of your source code and copy the text of the license into the file.
 
-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.
+note: The European Commission recommends taking the additional step of adding a [boilerplate notice](https://joinup.ec.europa.eu/sites/default/files/inline-files/EUPL%201_1%20Guidelines%20EN%20Joinup.pdf#page=17) to the top of each file.
 
 using:
 

_licenses/mit.txt

@@ -10,7 +10,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of
 
 using:
   Babel: https://github.com/babel/babel/blob/master/LICENSE
-  .NET Core: https://github.com/dotnet/runtime/blob/master/LICENSE.TXT
+  .NET: https://github.com/dotnet/runtime/blob/main/LICENSE.TXT
   Rails: https://github.com/rails/rails/blob/master/MIT-LICENSE
 
 permissions:

_licenses/mulanpsl-2.0.txt

@@ -108,8 +108,7 @@ You may obtain a copy of Mulan PSL v2 at:
          http://license.coscl.org.cn/MulanPSL2
 THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY
 KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
-NON-INFRINGEMENT,
+NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
-MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
 See the Mulan PSL v2 for more details.
 
 Mulan Permissive Software License，Version 2

assets/css/application.scss

@@ -7,7 +7,7 @@
 body {
   background: #fafafa;
   color: #5c5855;
-  font: 14px/1.4 "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font: 0.875rem/1.4 "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
 
 @media (prefers-color-scheme: dark) {
@@ -68,7 +68,7 @@ h1, h2, h3, h5 {
 }
 
 h1 {
-  font-size: 35px;
+  font-size: 2.1875rem;
   margin-bottom: 25px;
 }
 
@@ -78,19 +78,19 @@ h1 {
 
 h2 {
   opacity: 0.8;
-  font-size: 24px;
+  font-size: 1.5rem;
   margin-top: 24px;
   margin-bottom: 10px;
 }
 
 h3 {
-  font-size: 15px;
+  font-size: 0.9375rem;
   margin-top: 20px;
   margin-bottom: 10px;
 }
 
 h5 {
-  font-size: 14px;
+  font-size: 0.875rem;
   margin-bottom: 15px;
 }
 
@@ -120,12 +120,12 @@ strong {
 }
 
 .home h1 {
-  font-size: 60px;
+  font-size: 3.75rem;
 }
 
 .home h2 {
   color: #687072;
-  font-size: 27px;
+  font-size: 1.6875rem;
   line-height: 70px;
   margin-bottom: 45px;
   vertical-align: middle;
@@ -134,7 +134,7 @@ strong {
 
 .home h2 span {
   color: rgba(127,127,127,10%);
-  font-size: 70px;
+  font-size: 4.375rem;
   padding: 0 5px;
   position: relative;
   top: 10px;
@@ -160,7 +160,7 @@ strong {
 }
 
 .triptych h3 {
-  font-size: 22px;
+  font-size: 1.375rem;
   margin: 0 auto 20px auto;
   width: 220px;
 }
@@ -218,7 +218,7 @@ strong {
 }
 
 .license-overview-name {
-  font-size: 28px;
+  font-size: 1.75rem;
   margin-top: 5px;
 }
 
@@ -228,7 +228,7 @@ strong {
 
 .license-rules {
   border-bottom: solid 1px #ddd;
-  font-size: 13px;
+  font-size: 0.8125rem;
   line-height: 1.3;
   margin-bottom: 12px;
   width: 100%;
@@ -240,7 +240,7 @@ strong {
 }
 
 .license-rules th {
-  font-size: 15px;
+  font-size: 0.9375rem;
   padding: 5px 10px 5px 0;
   vertical-align: bottom;
 }
@@ -259,11 +259,11 @@ strong {
 }
 
 .license-rules .name a {
-  font-size: 28px;
+  font-size: 1.75rem;
 }
 
 .license-rules .name small a {
-  font-size: 16px;
+  font-size: 1rem;
 }
 
 .license-rules td {
@@ -302,14 +302,14 @@ strong {
 }
 
 .license-body {
-  font-size: 15px;
+  font-size: 0.9375rem;
   float: left;
   width: 700px;
 }
 
 .license-body pre {
   font-family: Consolas, Monaco, Courier, monospace;
-  font-size: 14px;
+  font-size: 0.875rem;
   background-color: #fff;
   border: 1px solid #eee;
   -webkit-border-radius: 3px;
@@ -327,7 +327,7 @@ strong {
 .sidebar {
   float: right;
   width: 220px;
-  font-size: 12px;
+  font-size: 0.75rem;
 }
 
 .sidebar a.button {
@@ -398,7 +398,7 @@ strong {
   background-image: -o-linear-gradient(#eee, #ddd);
   background-image: linear-gradient(#eee, #ddd);
   display: inline-block;
-  font-size: 12px;
+  font-size: 0.75rem;
   font-weight: normal;
   padding: 5px 10px;
   text-align: center;
@@ -423,7 +423,7 @@ strong {
   margin-top: 30px;
   padding-top: 20px;
   color: #555;
-  font-size: 12px;
+  font-size: 0.75rem;
   text-align: left;
   line-height: 1.5;
 }
@@ -467,7 +467,7 @@ strong {
 .qtip-limitations,
 .qtip-fetching,
 .qtip-error {
-  font-size: 12px;
+  font-size: 0.75rem;
   line-height: 1.3;
 }
 

community.md

@@ -14,7 +14,7 @@ Some communities have strong preferences for particular licenses. If you want to
 {: .bullets}
 
 * [Apache](https://www.apache.org/licenses/) requires [Apache License 2.0](/licenses/apache-2.0/)
-* [Cloud Native Computing Foundation](https://github.com/cncf/toc/blob/master/process/project_proposals.adoc) dictates [Apache License 2.0](/licenses/apache-2.0/) by default
+* [Cloud Native Computing Foundation](https://github.com/cncf/toc/blob/main/process/project_proposals.md) dictates [Apache License 2.0](/licenses/apache-2.0/) by default
 * [GNU](https://www.gnu.org/licenses/license-recommendations.html) recommends [GNU GPLv3](/licenses/gpl-3.0/) for most programs
 * [npm packages](https://libraries.io/search?platforms=npm) overwhelmingly use the [MIT](/licenses/mit/) or the very similar [ISC](/licenses/isc) licenses
 * [OpenBSD](https://www.openbsd.org/policy.html) prefers the [ISC License](/licenses/isc/)

spec/license_spec.rb

@@ -28,7 +28,7 @@ describe 'licenses' do
 
       context 'industry approval' do
         it 'should be approved by OSI or FSF or OD' do
-          expect(approved_licenses).to include(spdx_lcase), 'See https://git.io/vzCTV.'
+          expect(approved_licenses).to include(spdx_lcase), 'See https://github.com/github/choosealicense.com/blob/gh-pages/CONTRIBUTING.md#adding-new-licenses.'
         end
       end