about summary refs log tree commit homepage
diff options
3 files changed, 11 insertions, 9 deletions
diff --git a/LICENSE b/LICENSE
index 02d634c..05d3818 100644
@@ -3,15 +3,17 @@ 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).
+Foundation (FSF), either version 2 of the License, or (at your option)
+any later version.  We currently prefer the GPLv3 or later for
+derivative works, but the GPLv2 is fine.
-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.
+The complete texts of the GPLv2 and GPLv3 are below:
+GPLv2 - http://www.gnu.org/licenses/gpl-2.0.txt
+GPLv3 - http://www.gnu.org/licenses/gpl-3.0.txt
-=== Ruby-specific terms (if you're not using the GPLv2/GPLv3)
+You may (against our _preference_) also use the Ruby 1.8 license terms.
+=== Ruby 1.8-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
diff --git a/README b/README
index 3583060..b986456 100644
--- a/README
+++ b/README
@@ -90,7 +90,7 @@ fast applications.
 == License
 \Rainbows! is copyright 2009,2010 by all contributors (see logs in git).
-\Rainbows! is licensed under the Ruby (1.8) license or the GPL (v2 or v3).
+\Rainbows! is licensed under the Ruby (1.8) license or the GPLv2 or later.
 See the included {LICENSE}[link:LICENSE.html] file for more details.
 \Rainbows! is 100% Free Software.
diff --git a/rainbows.gemspec b/rainbows.gemspec
index 6a906cf..2ef91f7 100644
--- a/rainbows.gemspec
+++ b/rainbows.gemspec
@@ -57,5 +57,5 @@ Gem::Specification.new do |s|
   # We inherited the Ruby 1.8 license from Mongrel, so we're stuck with it.
   # GPLv3 is preferred.
-  s.licenses = ["GPLv2", "GPLv3", "Ruby 1.8"]
+  s.licenses = ["GPLv2+", "Ruby 1.8"]