From cd22c595633ec36b69c60f27f2c3841ae0f6faca Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 29 Aug 2011 19:54:32 +0000 Subject: add GPLv3 option to the license 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 --- README | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'README') 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. -- cgit v1.2.3-24-ge0c7