summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2012-12-03 21:19:44 +0000
committerEric Wong <normalperson@yhbt.net>2012-12-04 11:23:55 +0000
commitfd0192c134acd1d5037a9aa45ad7b5375c28c29c (patch)
tree4e64efb8cc6e27ce82e195272e1799a4cf4c65ac
parent69e6a793d34ff71da7c8ca59962d627e2fb508d8 (diff)
Since Ruby 1.9.3, (Matz) Ruby is licensed under a 2-clause BSDL.
Thus we need to clarify we inherited the license terms from
Ruby 1.8 to prevent misunderstanding.

(The Ruby license change cannot alter the license of other
 projects automatically)

Since we added the GPLv3 as an additional license in 2011,
the license terms of unicorn no longer matches Mongrel 1.1.5.

This is NOT a change to the unicorn license at all, just a
wording clarification.
-rw-r--r--README8
1 files changed, 4 insertions, 4 deletions
diff --git a/README b/README
index 7152df8..5dde0d7 100644
--- a/README
+++ b/README
@@ -60,11 +60,11 @@ both the the request and response in between \Unicorn and slow clients.
 == License
 
 \Unicorn is copyright 2009 by all contributors (see logs in git).
-It is based on Mongrel 1.1.5 and carries the same license.
+It is based on Mongrel 1.1.5.
+Mongrel is copyright 2007 Zed A. Shaw and contributors.
 
-Mongrel is copyright 2007 Zed A. Shaw and contributors. It is
-tri-licensed under (your choice) of the GPLv3, GPLv2 or Ruby-specific
-terms.  See the included LICENSE file for details.
+\Unicorn is tri-licensed under (your choice) of the GPLv3, GPLv2 or
+Ruby (1.8)-specific terms.  See the included LICENSE file for details.
 
 \Unicorn is 100% Free Software.