From 33e00d098efae382bdcce2fee002888bc9087a7f Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Tue, 17 Jun 2014 11:41:40 -0400
Subject: [PATCH 1/4] use jsonify to build license json

---
 licenses.json | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/licenses.json b/licenses.json
index edf1a4c..f8e1a6a 100644
--- a/licenses.json
+++ b/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" %}
-  {
-    "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 %}
-]
+[{% for page in site.pages %}{% if page.layout == "license" %}{{ page | jsonify }}{% assign i = i | plus: 1 %}{% if i < count %},{% endif %}{% endif %}{% endfor %}]

From 31d4116c531e22dcc0527844fc76aa0bb283c4b2 Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Tue, 17 Jun 2014 12:45:15 -0400
Subject: [PATCH 2/4] swap project for organization

---
 licenses/bsd-3-clause.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/licenses/bsd-3-clause.txt b/licenses/bsd-3-clause.txt
index 61f4964..e4f3ea6 100644
--- a/licenses/bsd-3-clause.txt
+++ b/licenses/bsd-3-clause.txt
@@ -39,7 +39,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.
 

From 991ec3c4e49de1c7a10183c763dee05c0c4e9515 Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@web.de>
Date: Mon, 16 Jun 2014 13:08:04 +0200
Subject: [PATCH 3/4] AGPL: Highlight the Affero Feature

This is a follow up to #197

A new point in the "required" section of the AGPL
highlights the difference to the plain GPL.
It states that running a network service of the software
triggers the disclose-source requirement, e.g. in SaaS use cases.

This is my personal interpretation of the paragraph 13 AGPL, IANAL.

Comments are welcome!
---
 _config.yml          | 3 +++
 licenses/agpl-v3.txt | 1 +
 2 files changed, 4 insertions(+)

diff --git a/_config.yml b/_config.yml
index beb77ed..5e45d98 100644
--- a/_config.yml
+++ b/_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: SaaS is Distribution
+    tag: saas-disclose
   - description: The library may be used within a non-open-source application.
     label: Library usage
     tag: library-usage
diff --git a/licenses/agpl-v3.txt b/licenses/agpl-v3.txt
index c5db592..0006fb2 100644
--- a/licenses/agpl-v3.txt
+++ b/licenses/agpl-v3.txt
@@ -16,6 +16,7 @@ required:
   - include-copyright
   - document-changes
   - disclose-source
+  - saas-disclose
 
 permitted:
   - commercial-use

From 9ddb6fff14776cd10c26a9af6f29eb8b85801b48 Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@web.de>
Date: Mon, 16 Jun 2014 22:58:33 +0200
Subject: [PATCH 4/4] Use the More General "Network Use is Distribution"

thanks to @parkr !
---
 _config.yml          | 4 ++--
 licenses/agpl-v3.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/_config.yml b/_config.yml
index 5e45d98..b1c4866 100644
--- a/_config.yml
+++ b/_config.yml
@@ -17,8 +17,8 @@ rules:
     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: SaaS is Distribution
-    tag: saas-disclose
+    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
diff --git a/licenses/agpl-v3.txt b/licenses/agpl-v3.txt
index 0006fb2..cc1286f 100644
--- a/licenses/agpl-v3.txt
+++ b/licenses/agpl-v3.txt
@@ -16,7 +16,7 @@ required:
   - include-copyright
   - document-changes
   - disclose-source
-  - saas-disclose
+  - network-use-disclose
 
 permitted:
   - commercial-use