about summary refs log tree commit homepage
path: root/LICENSE
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2011-05-10 15:35:21 -0700
committerEric Wong <normalperson@yhbt.net>2011-05-10 15:44:39 -0700
commit382d3cabfda9fdd391228d24e8a8d4cb014648b9 (patch)
tree63c098946ff2fb210a0ccdb76ffa37a2a6853c18 /LICENSE
parent704f843054f3ca32941d42972a1c7d1b144d06ad (diff)
downloadrainbows-382d3cabfda9fdd391228d24e8a8d4cb014648b9.tar.gz
GPLv2 and Ruby-specific terms remain intact, but this means
we can be combined and redistributed with GPLv3-only software
(once Unicorn has GPLv3 added to its license).
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE19
1 files changed, 14 insertions, 5 deletions
diff --git a/LICENSE b/LICENSE
index 4cfad55..02d634c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,8 +1,17 @@
-\Rainbows! is copyrighted Free Software by all contributors, see the
-logs in revision control for 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:
+\Rainbows! is copyrighted Free Software by all contributors, see the 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
+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 \Rainbows! 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/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