From 93eed7401525aafe89962377fb2e9364da05c089 Mon Sep 17 00:00:00 2001
From: Steven McDonald <steven@steven-mcdonald.id.au>
Date: Sun, 10 Jul 2011 10:27:12 +1000
Subject: [PATCH] Revert "Added GPL option and clarification on reason for
 licensing terms."

Also discovered why commits should have only one change at a time, as I only
wanted to remove GPL option and leave clarification :)
---
 main/licence.shtml | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/main/licence.shtml b/main/licence.shtml
index f567248..4346125 100755
--- a/main/licence.shtml
+++ b/main/licence.shtml
@@ -19,28 +19,25 @@
   </h2>
   <p>
     Unless otherwise noted, permission is granted to copy, distribute and/or
-    modify content on this website under the terms of either the <a
+    modify content on this website under the terms of the <a
     href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
-    Attribution-Sharealike Unported License</a>, version 3.0 or any later
-    version published by Creative Commons, or the <a
-    href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU General
-    Public License</a>, version 2 or any later version published by the Free
-    Software Foundation. For the avoidance of doubt, "this website" means any
-    content accessible via HTTP under the www.steven-mcdonald.id.au domain,
-    and does not include content under the images, non-free or any other
-    subdomain.
+    Attribution-Sharealike Unported License</a>, Version 3.0 or any later
+    version published by Creative Commons. For the avoidance of doubt, "this
+    website" means any content accessible via HTTP under the
+    www.steven-mcdonald.id.au domain, and does not include content under the
+    images, non-free or any other subdomain.
   </p>
   <p>
-    The latter option is provided mainly for compatibility with many existing
-    free software projects; if you would like to use anything published here in
-    a project which is licensed incompatibly with both of the licences above,
-    please feel free to <a href="/about.shtml">email me</a>.
+    If you would like to use anything published here in a project which is
+    licensed incompatibly with the licence above, please feel free to <a
+    href="/about.shtml">email me</a>. If it's for a project whose goals are
+    friendly to the free software and/or free culture movements, it's probably
+    fine.
   </p>
   <p>
-    It's not required by either of the licences, but if you do use a
-    substantial portion of anything I've published here in a derived work or
-    publish it elsewhere, I would appreciate it if you could tell me about it.
-    :-)
+    It's not required by the licence, but if you do use a substantial portion
+    of anything I've published here in a derived work or publish it elsewhere,
+    I would appreciate it if you could tell me about it. :-)
   </p>
   <h2>
     Common Exceptions
-- 
2.30.2