about summary refs log tree commit homepage
path: root/README
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2013-10-26 07:05:10 +0000
committerEric Wong <normalperson@yhbt.net>2013-10-26 07:43:22 +0000
commitf078eb93d343bb27cf5c6dc84efbe7c598d572fb (patch)
treefa1d9235df9fbe83fabd4c96ad09ab31595cc20a /README
parentd9c0db79e9eef9839aaada1be1105b3ff8ceae5c (diff)
downloadunicorn-f078eb93d343bb27cf5c6dc84efbe7c598d572fb.tar.gz
There is currently no GPLv4, so this change has no effect at the
moment.

In case the GPLv4 arrives and I am not alive to approve/review it,
the lesser of evils is have give blanket approval of all future GPL
versions (as published by the FSF).  The worse evil is to be stuck
with a license which cannot guarantee the Free-ness of this project
in the future.

This unfortunately means the FSF can theoretically come out with
license terms I do not agree with, but the GPLv2 and GPLv3 will
always be an option to all users.
Diffstat (limited to 'README')
-rw-r--r--README5
1 files changed, 3 insertions, 2 deletions
diff --git a/README b/README
index 5dde0d7..42167c8 100644
--- a/README
+++ b/README
@@ -63,8 +63,9 @@ both the the request and response in between \Unicorn and slow clients.
 It is based on Mongrel 1.1.5.
 Mongrel is copyright 2007 Zed A. Shaw and contributors.
 
-\Unicorn is tri-licensed under (your choice) of the GPLv3, GPLv2 or
-Ruby (1.8)-specific terms.  See the included LICENSE file for details.
+\Unicorn is licensed under (your choice) of the GPLv2 or later
+(GPLv3+ preferred), or Ruby (1.8)-specific terms.
+See the included LICENSE file for details.
 
 \Unicorn is 100% Free Software.