about summary refs log tree commit homepage
path: root/LICENSE
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2011-05-10 16:36:25 -0700
committerEric Wong <normalperson@yhbt.net>2011-05-10 16:39:17 -0700
commitd2bfeb287656d231737379dfda38b1ef8908bf22 (patch)
tree964f3fa4883a079cf885f2ccb79e4d2b8d7f6bae /LICENSE
parent27f11facd8aca6716928c85228119a9f7460dd43 (diff)
downloadzbatery-d2bfeb287656d231737379dfda38b1ef8908bf22.tar.gz
LICENSE: add GPLv3 terms
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 87eac50..8ec8934 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,8 +1,17 @@
-Zbatery 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:
+\Zbatery 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 \Zbatery 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