about summary refs log tree commit homepage
path: root/LICENSE
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 /LICENSE
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 'LICENSE')
-rw-r--r--LICENSE17
1 files changed, 13 insertions, 4 deletions
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