Merge branch 'gh-pages' into spdx

_config.yml

@@ -16,6 +16,9 @@ rules:
   - description: Source code must be made available when distributing the software. In the case of LGPL, the source for the library (and not the entire program) must be made available.
     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: The library may be used within a non-open-source application.
     label: Library usage
     tag: library-usage

licenses.json

@@ -5,24 +5,4 @@ comment: \
   increment an index to see if we're on the true last iteration.
 ---
 {% assign count = 0 %}{% for page in site.pages %}{% if page.layout == "license" %}{% assign count = count | plus: 1 %}{% endif %}{% endfor %}{% assign i = 0 %}
-[
+[{% for page in site.pages %}{% if page.layout == "license" %}{{ page | jsonify }}{% assign i = i | plus: 1 %}{% if i < count %},{% endif %}{% endif %}{% endfor %}]
-{% for page in site.pages %}{% if page.layout == "license" %}
-  {
-    "title": "{{ page.title }}",
-    "permalink": "{{ page.permalink }}",
-    "featured": {% if page.featured %}true{% else %}false{% endif %},
-    "description": "{{ page.description | replace: '"', '\"' }}",
-    "how": "{{ page.how | replace: '"', '\"' }}",
-    "rules": {
-    {% for category in site.rules %}
-        {% assign cat = category[0] %}
-        "{{ cat }}": [
-        {% for rule in page[cat] %}
-            "{{ rule }}"{% if forloop.rindex0 > 0 %},{% endif %}
-        {% endfor %}
-        ]{% if forloop.rindex0 > 0 %},{% endif %}
-    {% endfor %}
-    }{% assign i = i | plus: 1 %}
-  }{% if i < count %},{% endif %}
- {% endif %}{% endfor %}
-]

licenses/AGPL-3.0.txt

@@ -16,6 +16,7 @@ required:
   - include-copyright
   - document-changes
   - disclose-source
+  - network-use-disclose
 
 permitted:
   - commercial-use

licenses/BSD-3-Clause.txt

@@ -40,7 +40,7 @@ modification, are permitted provided that the following conditions are met:
   this list of conditions and the following disclaimer in the documentation
   and/or other materials provided with the distribution.
 
-* Neither the name of the {organization} nor the names of its
+* Neither the name of [project] nor the names of its
   contributors may be used to endorse or promote products derived from
   this software without specific prior written permission.