From abe74941dc5e528bd8b16238a0c7b3c52446da5d Mon Sep 17 00:00:00 2001 From: Brandon Keepers Date: Sun, 31 Jan 2016 19:53:09 +0100 Subject: [PATCH 1/3] Update examples - add a 3rd example (.NET Core) for MIT - replace SVN & NuGet with more more modern and well-known examples (Swift, Docker) for Apache: - Add a GPLv3 project to examples. --- index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index 3caf9c9..6e0f5e7 100644 --- a/index.html +++ b/index.html @@ -21,7 +21,7 @@ permalink: / The MIT License is a permissive license that is short and to the point. It lets people do anything they want with your code as long as they provide attribution back to you and don’t hold you liable.

- jQuery and Rails use the MIT License. + jQuery, Rails and .NET Core use the MIT License.

  • @@ -33,7 +33,7 @@ permalink: / The Apache License is a permissive license similar to the MIT License, but also provides an express grant of patent rights from contributors to users.

    - Apache, SVN, and NuGet use the Apache License. + Apache, Swift, and Docker use the Apache License.

  • @@ -42,10 +42,10 @@ permalink: /

    I care about sharing improvements.

    - The GPL (V2 or V3) 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 is a copyleft license that lets people do anything they want with your code as long as they give the same freedoms to anyone else to which give your code or something based on it.

    - Linux, Git, and WordPress use the GPL. + WordPress, Linux, and Bash use the GPL.

    • From 3227e22d89e9a3d18660bedb01996e430d9bc7c5 Mon Sep 17 00:00:00 2001 From: Brandon Keepers Date: Mon, 1 Feb 2016 19:45:01 +0100 Subject: [PATCH 2/3] Revert changes to GPL text This should be iterated on in another PR --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 6e0f5e7..00d79bc 100644 --- a/index.html +++ b/index.html @@ -42,7 +42,7 @@ permalink: /

    I care about sharing improvements.

    - The GNU GPL is a copyleft license that lets people do anything they want with your code as long as they give the same freedoms to anyone else to which give your code or something based on it. + The GPL (V2 or V3) 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.

    WordPress, Linux, and Bash use the GPL. From 6da34f08257d01f06635bbbe542da108aaba7895 Mon Sep 17 00:00:00 2001 From: Brandon Keepers Date: Mon, 1 Feb 2016 19:48:02 +0100 Subject: [PATCH 3/3] Use Android instead of Docker Reasoning: it is a mass consumer brand that is likely to be better known than Apache --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 00d79bc..6e05865 100644 --- a/index.html +++ b/index.html @@ -33,7 +33,7 @@ permalink: / The Apache License is a permissive license similar to the MIT License, but also provides an express grant of patent rights from contributors to users.

    - Apache, Swift, and Docker use the Apache License. + Apache, Swift, and Android use the Apache License.