Revert "fixed up non-free shit"

[www.git] / licence.shtml

diff --git a/licence.shtml b/licence.shtml
index 5cf3f4dc412e4dd6fbb3697f05ebbb5cc716c5ef..25eec9a47f6833ca5c373829451806ebfcae1b7f 100755 (executable)
--- a/licence.shtml
+++ b/licence.shtml
@@ -11,29 +11,40 @@
 
 <div id="content">
   <p>
-    Unless otherwise noted, content on this website is Copyright © 2010 Steven
-    McDonald.
+    Unless otherwise noted, content on this website is Copyright © 2010-2011
+    Steven McDonald.
   </p>
   <h2>
     Licence Grant
   </h2>
   <p>
     Unless otherwise noted, permission is granted to copy, distribute and/or
-    modify content on this website under the terms of the <a
+    modify content on this website under the terms of either 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.
+    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.
   </p>
   <p>
-    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. :-)
+    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>.
+  </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.
+    :-)
   </p>
   <h2>
     Common Exceptions
   </h2>
   <p>
-    The W3C icons at the bottom of every page are Copyright © 1994-2006 W3C®
+    The W3C icons at the bottom of every page are Copyright © 1994-2010 W3C®
     (MIT, ERCIM, Keio) from the <a href="http://www.w3.org/QA/Tools/Icons">W3C
     website</a>. W3C® grants permission for their use on webpages which pass
     their HTML and CSS validators, respectively.