apache version, GNU *gpl naming, in part via #335

mlinksva · mlinksva · commit db18b5dfe6a8 · 2016-02-16T09:29:18.000-08:00
diff --git a/_licenses/agpl-3.0.txt b/_licenses/agpl-3.0.txt
@@ -1,12 +1,12 @@
 ---
 title: GNU Affero General Public License v3.0
-nickname: GNU Affero GPL v3.0
+nickname: GNU AGPL v3.0
 redirect_from: /licenses/agpl/
-family: GPL
+family: GNU GPL
 variant: true
 source: http://www.gnu.org/licenses/agpl-3.0.txt
 
-description: "The GPL family of licenses 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. The AGPL family of licenses is distinguished from GPLv2 and GPLv3 in that hosted services using the code are considered distribution and trigger the copyleft requirements."
+description: "The GNU GPL family of licenses 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. The AGPL family of licenses is distinguished from GPLv2 and GPLv3 in that hosted services using the code are considered distribution and trigger the copyleft requirements."
 
 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.
 
diff --git a/_licenses/apache-2.0.txt b/_licenses/apache-2.0.txt
@@ -1,6 +1,5 @@
 ---
 title: Apache License 2.0
-nickname: Apache
 redirect_from: /licenses/apache/
 featured: true
 source: http://www.apache.org/licenses/LICENSE-2.0.html
diff --git a/_licenses/gpl-2.0.txt b/_licenses/gpl-2.0.txt
@@ -2,11 +2,11 @@
 title: GNU General Public License v2.0
 nickname: GNU GPL v2.0
 redirect_from: /licenses/gpl-v2/
-family: GPL
+family: GNU GPL
 variant: true
 source: http://www.gnu.org/licenses/gpl-2.0.txt
 
-description: 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 GPL, each with different requirements.
+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.
 
 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.
 
diff --git a/_licenses/gpl-3.0.txt b/_licenses/gpl-3.0.txt
@@ -2,11 +2,11 @@
 title: GNU General Public License v3.0
 nickname: GNU GPL v3.0
 redirect_from: /licenses/gpl-v3/
-family: GPL
+family: GNU GPL
 featured: true
 source: http://www.gnu.org/licenses/gpl-3.0.txt
 
-description: 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.
+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.
 
 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.
 
diff --git a/_licenses/lgpl-2.1.txt b/_licenses/lgpl-2.1.txt
@@ -2,11 +2,11 @@
 title: GNU Lesser General Public License v2.1
 nickname: GNU LGPL v2.1
 redirect_from: /licenses/lgpl-v2.1/
-family: LGPL
+family: GNU LGPL
 variant: true
 source: http://www.gnu.org/licenses/lgpl-2.1.txt
 
-description: Primarily used for software libraries, 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 LGPL.
+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.
 
 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.
 
diff --git a/_licenses/lgpl-3.0.txt b/_licenses/lgpl-3.0.txt
@@ -2,14 +2,14 @@
 title: GNU Lesser General Public License v3.0
 nickname: GNU LGPL v3.0
 redirect_from: /licenses/lgpl-v3/
-family: LGPL
+family: GNU LGPL
 source: http://www.gnu.org/licenses/lgpl-3.0.txt
 
-description: Version 3 of the LGPL is an additional set of permissions to the <a href="/licenses/gpl-3.0">GPL v3 license</a> that requires that derived works be licensed under the same license, but works that only link to it do not fall under this restriction.
+description: Version 3 of the GNU LGPL is an additional set of permissions to the <a href="/licenses/gpl-3.0">GNU GPLv3 license</a> that requires that derived works be licensed under the same license, but works that only link to it do not fall under this restriction.
 
-how: This license is an additional set of permissions to the <a href="/licenses/gpl-3.0">GPL v3</a> license. Follow the instructions to apply the GPL v3. Then either paste this text to the bottom of the created file OR add a separate file (typically named COPYING.lesser or LICENSE.lesser) in the root of your source code and copy the text.
+how: This license is an additional set of permissions to the <a href="/licenses/gpl-3.0">GNU GPLv3</a> license. Follow the instructions to apply the GNU GPLv3. Then either paste this text to the bottom of the created file OR add a separate file (typically named COPYING.lesser or LICENSE.lesser) in the root of your source code and copy the text.
 
-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 <a href="/licenses/gpl-3.0">GPL v3 license</a>. Insert the word “Lesser” before “General” in all three places in the boilerplate notice to make sure that you refer to the LGPL v3 and not the GPL v3.
+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 <a href="/licenses/gpl-3.0">GNU GPLv3 license</a>. Insert the word “Lesser” before “General” in all three places in the boilerplate notice to make sure that you refer to the GNU LGPLv3 and not the GNU GPLv3.
 
 required:
   - include-copyright
diff --git a/index.html b/index.html
@@ -30,10 +30,10 @@ <h3>I want it simple and permissive.</h3>
       <h3>I’m concerned about patents.</h3>
     </a>
     <p>
-      The <a href="licenses/apache-2.0/">Apache License</a> is a permissive license similar to the MIT License, but also provides an express grant of patent rights from contributors to users.
+      The <a href="licenses/apache-2.0/">Apache License 2.0</a> is a permissive license similar to the MIT License, but also provides an express grant of patent rights from contributors to users.
     </p>
     <p>
-      <strong>Apache</strong>, <strong>Swift</strong>, and <strong>Android</strong> use the Apache&nbsp;License.
+      <strong>Apache</strong>, <strong>Swift</strong>, and <strong>Android</strong> use the Apache&nbsp;License&nbsp;2.0.
     </p>
   </li>
   <li class="copyleft">
@@ -42,10 +42,10 @@ <h3>I’m concerned about patents.</h3>
       <h3>I care about sharing improvements.</h3>
     </a>
     <p>
-      The GPL (<a href="licenses/gpl-2.0/">V2</a> or <a href="licenses/gpl-3.0/">V3</a>) is a copyleft license that requires anyone who distributes your code or a derivative work to make the source available under the same terms. V3 is similar to V2, but further restricts use in hardware that forbids software alterations.
+      The GNU GPL (<a href="licenses/gpl-2.0/">V2</a> or <a href="licenses/gpl-3.0/">V3</a>) is a copyleft license that requires anyone who distributes your code or a derivative work to make the source available under the same terms. V3 is similar to V2, but further restricts use in hardware that forbids software alterations.
     </p>
     <p>
-      <strong>WordPress</strong>, <strong>Linux</strong>, and <strong>Bash</strong> use the GPL.
+      <strong>WordPress</strong>, <strong>Linux</strong>, and <strong>Bash</strong> use the GNU GPL.
     </p>
   </li>
 </ul>
