about summary refs log tree commit homepage
path: root/README
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2011-08-29 19:54:32 +0000
committerEric Wong <normalperson@yhbt.net>2011-08-29 20:06:59 +0000
commitcd22c595633ec36b69c60f27f2c3841ae0f6faca (patch)
tree7a3e3ed67da0810f80222fc38ca004ecd3a1aeb1 /README
parent8bed251777e9850b04f52f4c520e8b173bd1d756 (diff)
downloadunicorn-cd22c595633ec36b69c60f27f2c3841ae0f6faca.tar.gz
Existing license terms (Ruby-specific) and GPLv2 remain
in place, but GPLv3 is preferred as it helps with
distribution of AGPLv3 code and is explicitly compatible
with Apache License (v2.0).

Many more reasons are documented by the FSF:
https://www.gnu.org/licenses/quick-guide-gplv3.html
http://gplv3.fsf.org/rms-why.html

ref: http://thread.gmane.org/gmane.comp.lang.ruby.unicorn.general/933
Diffstat (limited to 'README')
-rw-r--r--README6
1 files changed, 3 insertions, 3 deletions
diff --git a/README b/README
index 4cd5d3e..7152df8 100644
--- a/README
+++ b/README
@@ -62,9 +62,9 @@ both the the request and response in between \Unicorn and slow clients.
 \Unicorn is copyright 2009 by all contributors (see logs in git).
 It is based on Mongrel 1.1.5 and carries the same license.
 
-Mongrel is copyright 2007 Zed A. Shaw and contributors. It is licensed
-under the Ruby (1.8) license and the GPL2. See the included LICENSE file
-for details.
+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 100% Free Software.