From: Andre Noll <maan@systemlinux.org>
Date: Sun, 1 Jul 2007 00:05:41 +0000 (+0200)
Subject: web/license.html: make it clear that paraslash is licensed under the GPL V2
X-Git-Tag: v0.2.17~54
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=a97aa709abdbf6b1085a037a29d4e6cac5becbc2

web/license.html: make it clear that paraslash is licensed under the GPL V2

As today the GPL V3 was published, the term "GPL" (without mentioning
a version number) might be misleading.
---

diff --git a/web/license.in.html b/web/license.in.html
index 0e494be7..c732a07a 100644
--- a/web/license.in.html
+++ b/web/license.in.html
@@ -1,14 +1,19 @@
 <h1>License</h1>
 <hr>
 
-Paraslash is licensed under the <a
-href="http://www.gnu.org/licenses/gpl.html">GNU General
-Public License</a>, which is generally just abbreviated
-as the GPL license, or just the GPL. Check out the
-<a href="http://www.gnu.org/cgi-bin/license-quiz.cgi">GPL
+<p> Paraslash is licensed under the <a
+href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU
+General Public License, Version 2</a>, which is generally just
+abbreviated as the GPL license, or just the GPL.</p>
+
+<p> Check out the <a
+href="http://www.gnu.org/cgi-bin/license-quiz.cgi">GPL
 License Quiz</a> or take a look at the <a
 href="http://www.gnu.org/licenses/gpl-faq.html">Frequently Asked
-Questions about the GNU GPL</a>. For the differences between
-the established version 2 and the upcoming version 3 of the GPL, see this
-<a href="http://lia.ch/~sb/GPL_docdiff-2-3draft1.html"> colored
-diff</a>.
+Questions about the GNU GPL</a>. </p>
+
+<p> As of this writing (June 2007) the author
+does not see any benefits in switching to the new <a
+href="http://www.gnu.org/licenses/gpl-3.0.txt"> version 3 of the
+GPL</a> just released. However, this may change once version 3 becomes
+widely used.</p>