Merge pull request #447 from waldyrious/patch-2

sort license properties as permissions > conditions > limitations (fixes #387)

Author: mlinksva

_data/rules.yml

@@ -1,20 +1,3 @@
-conditions:
-- description: Include a copy of the license and copyright notice with the code.
-  label: License and Copyright Notice
-  tag: include-copyright
-- description: Indicate changes made to the code.
-  label: State Changes
-  tag: document-changes
-- description: Source code must be made available when distributing the software.
-  label: Disclose Source
-  tag: disclose-source
-- description: Users who interact with the software via network are given the right to receive a copy of the corresponding source code.
-  label: Network Use is Distribution
-  tag: network-use-disclose
-- description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used.
-  label: Same License
-  tag: same-license
-
 permissions:
 - description: This software and derivatives may be used for commercial purposes.
   label: Commercial Use
@@ -32,6 +15,23 @@ permissions:
   label: Patent Use
   tag: patent-use
 
+conditions:
+- description: Include a copy of the license and copyright notice with the code.
+  label: License and Copyright Notice
+  tag: include-copyright
+- description: Indicate changes made to the code.
+  label: State Changes
+  tag: document-changes
+- description: Source code must be made available when distributing the software.
+  label: Disclose Source
+  tag: disclose-source
+- description: Users who interact with the software via network are given the right to receive a copy of the corresponding source code.
+  label: Network Use is Distribution
+  tag: network-use-disclose
+- description: Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used.
+  label: Same License
+  tag: same-license
+
 limitations:
 - description: This license explicitly states that it does NOT grant you trademark rights, even though licenses without such a statement probably do not grant you any implicit trademark rights.
   label: Trademark Use

_licenses/afl-3.0.txt

@@ -7,22 +7,23 @@ description: The Academic Free License is a variant of the Open Software 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. Files licensed under AFL 3.0 must also include the notice "Licensed under the Academic Free License version 3.0" adjacent to the copyright notice.
 
-conditions:
-  - include-copyright
-  - document-changes
-
 permissions:
   - commercial-use
   - modifications
   - distribution
   - private-use
   - patent-use
 
+conditions:
+  - include-copyright
+  - document-changes
+
 limitations:
   - trademark-use
   - no-liability
 
 ---
+
 Academic Free License (“AFL”) v. 3.0
 
 This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:

_licenses/agpl-3.0.txt

@@ -12,22 +12,23 @@ 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.
 
-conditions:
-  - include-copyright
-  - document-changes
-  - disclose-source
-  - network-use-disclose
-  - same-license
-
 permissions:
   - commercial-use
   - modifications
   - distribution
   - patent-use
   - private-use
 
+conditions:
+  - include-copyright
+  - document-changes
+  - disclose-source
+  - network-use-disclose
+  - same-license
+
 limitations:
   - no-liability
+
 ---
 
                     GNU AFFERO GENERAL PUBLIC LICENSE

_licenses/apache-2.0.txt

@@ -17,20 +17,21 @@ using:
   - Apache: https://svn.apache.org/viewvc/httpd/httpd/trunk/LICENSE?view=markup
   - Swift: https://github.com/apple/swift/blob/master/LICENSE.txt
 
-conditions:
-  - include-copyright
-  - document-changes
-
 permissions:
   - commercial-use
   - modifications
   - distribution
   - patent-use
   - private-use
 
+conditions:
+  - include-copyright
+  - document-changes
+
 limitations:
   - trademark-use
   - no-liability
+
 ---
 
                                  Apache License

_licenses/artistic-2.0.txt

@@ -8,20 +8,21 @@ description: Heavily favored by the Perl community, the Artistic license require
 
 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. Do not replace the copyright notice (year, author), which refers to the license itself, not the licensed project.
 
-conditions:
-  - include-copyright
-  - document-changes
-
 permissions:
   - commercial-use
   - modifications
   - distribution
   - patent-use
   - private-use
 
+conditions:
+  - include-copyright
+  - document-changes
+
 limitations:
   - no-liability
   - trademark-use
+
 ---
 
 		       The Artistic License 2.0

_licenses/bsd-2-clause.txt

@@ -8,17 +8,18 @@ description: A permissive license that comes in two variants, the <a href="/lice
 
 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.
 
-conditions:
-  - include-copyright
-
 permissions:
   - commercial-use
   - modifications
   - distribution
   - private-use
 
+conditions:
+  - include-copyright
+
 limitations:
   - no-liability
+
 ---
 
 BSD 2-Clause License

_licenses/bsd-3-clause-clear.txt

@@ -1,25 +1,25 @@
 ---
 title: BSD 3-clause Clear License
 spdx-id: BSD-3-Clause-Clear
+source: https://spdx.org/licenses/BSD-3-Clause-Clear.html
 
 description: A variant of the <a href="/licenses/bsd-3-clause/">BSD 3-Clause License</a> that explicitly does not grant any patent rights.
 
 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 [project] with the project organization, if any, that sponsors this work.
 
-source: https://spdx.org/licenses/BSD-3-Clause-Clear.html
-
-conditions:
-  - include-copyright
-
 permissions:
   - commercial-use
   - modifications
   - distribution
   - private-use
 
+conditions:
+  - include-copyright
+
 limitations:
   - no-liability
   - patent-use
+
 ---
 
 The Clear BSD License

_licenses/bsd-3-clause.txt

@@ -7,17 +7,18 @@ description: A permissive license similar to the <a href="/licenses/bsd-2-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 [project] with the project organization, if any, that sponsors this work.
 
-conditions:
-  - include-copyright
-
 permissions:
   - commercial-use
   - modifications
   - distribution
   - private-use
 
+conditions:
+  - include-copyright
+
 limitations:
   - no-liability
+
 ---
 
 BSD 3-Clause License

_licenses/cc-by-4.0.txt

@@ -7,20 +7,21 @@ description: Permits almost any use subject to providing credit and license noti
 
 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. It is also acceptable to soley supply a link to a copy of the license, usually to the <a href='https://creativecommons.org/licenses/by/4.0/'>canonical URL for the license</a>.
 
-conditions:
-  - include-copyright
-  - document-changes
-
 permissions:
   - commercial-use
   - modifications
   - distribution
   - private-use
 
+conditions:
+  - include-copyright
+  - document-changes
+
 limitations:
   - no-liability
   - trademark-use
   - patent-use
+
 ---
 
 Attribution 4.0 International

_licenses/cc-by-sa-4.0.txt

@@ -7,21 +7,22 @@ description: Similar to <a href='/licenses/cc-by-4.0/'>CC-BY-4.0</a> but require
 
 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. It is also acceptable to soley supply a link to a copy of the license, usually to the <a href='https://creativecommons.org/licenses/by-sa/4.0/'>canonical URL for the license</a>.
 
-conditions:
-  - include-copyright
-  - document-changes
-  - same-license
-
 permissions:
   - commercial-use
   - modifications
   - distribution
   - private-use
 
+conditions:
+  - include-copyright
+  - document-changes
+  - same-license
+
 limitations:
   - no-liability
   - trademark-use
   - patent-use
+
 ---
 
 Attribution-ShareAlike 4.0 International