downcase all filenames, resolve merge conflicts

licenses/AGPL-3.0.txt

@@ -1,10 +1,10 @@
 ---
-title: Affero GPL
+title: GNU Affero GPL v3.0
 category: GPL
 tab-slug: agpl-v3
 hide-from-license-list: true
 layout: license
-permalink: /licenses/agpl-v3/
+permalink: /licenses/agpl-3.0/
 source: http://www.gnu.org/licenses/agpl-3.0.txt
 redirect_from: /licenses/agpl/
 

licenses/Apache-2.0.txt

@@ -1,8 +1,9 @@
 ---
-title: Apache v2 License
+title: Apache License 2.0
 category: Apache
 layout: license
-permalink: /licenses/apache/
+permalink: /licenses/apache-2.0/
+redirect_fom: /licenses/apache/
 
 featured: true
 

licenses/Artistic-2.0.txt

@@ -2,8 +2,9 @@
 layout: license
 title: Artistic License 2.0
 category: Artistic
-permalink: /licenses/artistic/
+redirect_from: /licenses/artistic/
 source: http://www.perlfoundation.org/attachment/legal/artistic-2_0.txt
+permalink: /licenses/artistic-2.0/
 
 description: Heavily favored by the Perl community, the Artistic license requires that modified versions of the software do not prevent users from running the standard version.
 

licenses/BSD-2-Clause.txt

@@ -1,10 +1,11 @@
 ---
 layout: license
-title: BSD license
+title: Simplified BSD
 category: BSD
 tab-slug: bsd
 hide-from-license-list: true
-permalink: /licenses/bsd/
+redirect_from: /licenses/bsd/
+permalink: /licenses/bsd-2-clause/
 
 description: A permissive license that comes in two variants, the <a href="/licenses/bsd">BSD 2-Clause</a> and <a href="/licenses/bsd-3-clause">BSD 3-Clause</a>. Both have very minute differences to the MIT license.
 
@@ -36,6 +37,7 @@ modification, are permitted provided that the following conditions are met:
 * Redistributions of source code must retain the above copyright notice, this
   list of conditions and the following disclaimer.
 
+<<<<<<< HEAD:licenses/bsd.txt
 * Redistributions in binary form must reproduce the above copyright notice,
   this list of conditions and the following disclaimer in the documentation
   and/or other materials provided with the distribution.
@@ -50,3 +52,19 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+=======
+  Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+>>>>>>> 688abde66cc8d9512eaf17e9a56917f77436cffe:licenses/BSD-2-Clause.txt

licenses/BSD-3-Clause.txt

@@ -1,9 +1,10 @@
 ---
 layout: license
-title: BSD (3-Clause) License
+title: New BSD
 category: BSD
 tab-slug: bsd-3
 hide-from-license-list: true
+redirect_from: /licenses/bsd-3-clause/
 permalink: /licenses/bsd-3-clause/
 
 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. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. Replace {organization} with the organization, if any, that sponsors this work.

licenses/EPL-1.0.txt

@@ -2,7 +2,8 @@
 layout: license
 title: Eclipse Public License v1.0
 category: Eclipse
-permalink: /licenses/eclipse/
+redirect_from: /licenses/eclipse/
+permalink: /licenses/epl-1.0/
 
 description: This commercially-friendly copyleft license provides the ability to commercially license binaries; a modern royalty-free patent license grant; and the ability for linked works to use other licenses, including commercial ones.
 

licenses/GPL-2.0.txt

@@ -1,14 +1,16 @@
 ---
-title: GPL v2
+title: GNU GPL v2.0
 category: GPL
 tab-slug: gpl-v2
 hide-from-license-list: false
 layout: license
-permalink: /licenses/gpl-v2/
+permalink: /licenses/gpl-2.0/
+redirect_from: /licenses/gpl-v2/
 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.
 
+
 featured: true
 
 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.

licenses/GPL-3.0.txt

@@ -1,11 +1,15 @@
 ---
-title: GPL v3
+title: GNU GPL v3.0
 category: GPL
 tab-slug: gpl-v3
 hide-from-license-list: true
 layout: license
-permalink: /licenses/gpl-v3/
+redirect_from: /licenses/gpl-v3/
+permalink: /licenses/gpl-3.0/
 source: http://www.gnu.org/licenses/gpl-3.0.txt
+layout: license
+
+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.
 
 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.
 

licenses/LGPL-2.1.txt

@@ -1,9 +1,10 @@
 ---
 layout: license
-title: LGPL v2.1
+title: GNU LGPL v2.1
 category: LGPL
 tab-slug: lgpl-v2_1
-permalink: /licenses/lgpl-v2.1/
+redirect_from: /licenses/lgpl-v2.1/
+permalink: /licenses/lgpl-2.1/
 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.

licenses/LGPL-3.0.txt

@@ -1,15 +1,16 @@
 ---
 layout: license
-title: LGPL v3
+title: GNU LGPL v3.0
 category: LGPL
 tab-slug: lgpl-v3
 hide-from-license-list: true
-permalink: /licenses/lgpl-v3/
+redirect_from: /licenses/lgpl-v3/
 source: http://www.gnu.org/licenses/lgpl-3.0.txt
+permalink: /licenses/lgpl-3.0/
 
-description: Version 3 of the LGPL is an additional set of permissions to the <a href="/licenses/gpl-v3">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 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.
 
-how: This license is an additional set of permissions to the <a href="/licenses/gpl-v3">GPL v3</a> license. Follow the instructions to apply the GPL v3 license. Then either paste this text to the bottom of that 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">GPL v3</a> license. Follow the instructions to apply the GPL v3 license. Then either paste this text to the bottom of that 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 license.
 

licenses/MPL-2.0.txt

@@ -1,9 +1,10 @@
 ---
 layout: license
-title: Mozilla Public License Version 2.0
+title: Mozilla Public License 2.0
 category: Mozilla
-permalink: /licenses/mozilla/
+redirect_from: /licenses/mozilla/
 source: http://www.mozilla.org/MPL/2.0/
+permalink: /licenses/mpl-2.0/
 
 description: The Mozilla Public License (MPL 2.0) is maintained by the Mozilla foundation. This license attempts to be a compromise between the permissive BSD license and the reciprocal GPL license.
 

licenses/unlicense.txt

@@ -1,14 +1,10 @@
 ---
 layout: license
-title: The Unlicense
-category: Public Domain Dedication
-tab-slug: unlicense
-permalink: /licenses/unlicense/
+permalink: /licenses/Unlicense/
 class: license-types
+title: Public Domain (Unlicense)
 filename: UNLICENSE
 
-source: http://unlicense.org/UNLICENSE
-
 description: Because copyright is automatic in most countries, <a href="http://unlicense.org">the Unlicense</a> is a template to waive copyright interest in software you've written and dedicate it to the public domain. Use the Unlicense to opt out of copyright entirely. It also includes the no-warranty statement from the MIT/X11 license.
 
 how: Create a text file (typically named UNLICENSE or UNLICENSE.txt) in the root of your source code and copy the text of the license disclaimer into the file.
@@ -16,10 +12,11 @@ how: Create a text file (typically named UNLICENSE or UNLICENSE.txt) in the root
 required:
 
 permitted:
+  - private-use
   - commercial-use
   - modifications
   - distribution
-  - private-use
+  - sublicense
 
 forbidden:
   - no-liability