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

[www.git] / licence.shtml

diff --git a/licence.shtml b/licence.shtml
index 64c1fb71844fb7817b053adaec938c7667fcae3f..43461254986cb72ca550aeff636767e3028ecd4b 100755 (executable)
--- a/licence.shtml
+++ b/licence.shtml
@@ -19,25 +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.
+    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
@@ -48,6 +48,10 @@
     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"-->