Revert "Moved main site to main/, created non-free/"

[www.git] / licence.shtml

diff --git a/licence.shtml b/licence.shtml
index 5cf3f4dc412e4dd6fbb3697f05ebbb5cc716c5ef..43461254986cb72ca550aeff636767e3028ecd4b 100755 (executable)
--- a/licence.shtml
+++ b/licence.shtml
@@ -11,8 +11,8 @@
 
 <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
@@ -22,7 +22,17 @@
     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.
+    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>
+    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 the licence, but if you do use a substantial portion
@@ -33,11 +43,15 @@
     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.
   </p>
+  <p>
+    These images are hosted under the non-free subdomain, this section is only
+    meant for clarity.
+  </p>
 </div>
 
 <!--#include virtual="/footer.shtml"-->