From 7295849a881cc04ffd5ba3258a96946788a838a6 Mon Sep 17 00:00:00 2001 From: Haacked Date: Wed, 10 Jul 2013 10:59:35 -0700 Subject: [PATCH 1/2] homepage text tweaking per legal review --- css/application.css | 2 +- index.html | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/css/application.css b/css/application.css index 1802421..cdec959 100644 --- a/css/application.css +++ b/css/application.css @@ -204,7 +204,7 @@ strong { margin-left: 0; margin-top: 16px; } -.situations .reciprocity { +.situations .copyleft { margin-top: 3px; } .situations h3 { diff --git a/index.html b/index.html index 46d74c3..046187c 100644 --- a/index.html +++ b/index.html @@ -14,7 +14,7 @@ class: home

I want it simple and permissive.

- The MIT License is a permissive license that is short and to the point. It doesn’t include any warranties and lets people do anything they want with your code (with attribution back to you). + 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. @@ -24,17 +24,17 @@ class: home

I’m concerned about patents.

- The Apache License is a permissive license similar to the MIT License, but also contains a patent license for any code that infringes on a contributor’s patents. + The Apache License is a permissive license similar to the MIT License, but also provides an express grant of patent rights from the contributor to the recipient.

Apache, SVN, and NuGet use the Apache License.

-
  • +
  • -

    I care about reciprocity.

    +

    I care about sharing improvements.

    - The GPL (V2 or V3) is a reciprocal license that requires that folks who modify your code also license their changes under the GPL. V3 is similar to V2, but adds a restriction restricting use in hardware that forbids software alterations. + The GPL (V2 or V3) is a copyleft license that requires that people who modify your code disclose their changes when they distribute their program that includes your code. V3 is similar to V2, but adds a restriction restricting use in hardware that forbids software alterations.

    Linux and Git use the GPL. From 70aaba7ba03f8940b0ceb9ddb8a488ecbbca2a5f Mon Sep 17 00:00:00 2001 From: Haacked Date: Wed, 10 Jul 2013 14:01:00 -0700 Subject: [PATCH 2/2] Tweaks per content review --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 046187c..d99fbe0 100644 --- a/index.html +++ b/index.html @@ -24,7 +24,7 @@ class: home

    I’m concerned about patents.

    - The Apache License is a permissive license similar to the MIT License, but also provides an express grant of patent rights from the contributor to the recipient. + 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. @@ -34,7 +34,7 @@ class: home

    I care about sharing improvements.

    - The GPL (V2 or V3) is a copyleft license that requires that people who modify your code disclose their changes when they distribute their program that includes your code. V3 is similar to V2, but adds a restriction restricting use in hardware that forbids software alterations. + The GPL (V2 or V3) is a copyleft license that requires others who modify your code to disclose their changes if they redistribute it in source or binary form. V3 is similar to V2, but adds a restriction restricting use in hardware that forbids software alterations.

    Linux and Git use the GPL.