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 --- LICENSE | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'LICENSE') diff --git a/LICENSE b/LICENSE index d48c2d4..099110a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,8 +1,17 @@ Unicorn is copyrighted free software by all contributors, see logs in -revision control for names and email addresses of all of them. You can -redistribute it and/or modify it under either the terms of the -{GPL2}[http://www.gnu.org/licenses/gpl-2.0.txt] (see link:COPYING) or -the conditions below: +revision control for names and email addresses of all of them. + +You can redistribute it and/or modify it under either the terms of the +GNU General Public License (GPL) as published by the Free Software +Foundation (FSF), version {3.0}[http://www.gnu.org/licenses/gpl-3.0.txt] +or version {2.0}[http://www.gnu.org/licenses/gpl-2.0.txt] +or the Ruby-specific license terms (see below). + +The unicorn project leader (Eric Wong) reserves the right to add future +versions of the GPL (and no other licenses) as published by the FSF to +the licensing terms. + +=== Ruby-specific terms (if you're not using the GPLv2 or GPLv3) 1. You may make and give away verbatim copies of the source form of the software without restriction, provided that you duplicate all of the -- cgit v1.2.3-24-ge0c7