From 205dfbc4009faffce8083a90a02e73e5b8216651 Mon Sep 17 00:00:00 2001
From: Steven McDonald <steven@steven-mcdonald.id.au>
Date: Sat, 24 Sep 2011 10:06:21 +1000
Subject: [PATCH] Revert "fixed up non-free shit"

This reverts commit a065f040f38b1ceef9627415cc0dff8821f26175.

Conflicts:

	main/licence.shtml
	main/valid-css.png
	main/valid-html401.png
	non-free/valid-css.png
	non-free/valid-html401.png
	valid-css.png
	valid-html401.png
---
 footer.shtml  |  4 ++--
 licence.shtml | 33 +++++++++++++++------------------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/footer.shtml b/footer.shtml
index 37508b8..5e90519 100755
--- a/footer.shtml
+++ b/footer.shtml
@@ -5,9 +5,9 @@
     </a>
   </p>
   <a href="http://validator.w3.org/check?uri=referer">
-    <img style="border:0;width:88px;height:31px" src="http://non-free.steven-mcdonald.id.au/valid-html401.png" alt="Valid HTML 4.01 Strict">
+    <img style="border:0;width:88px;height:31px" src="/valid-html401.png" alt="Valid HTML 4.01 Strict">
   </a> &nbsp;
   <a href="http://jigsaw.w3.org/css-validator/check/referer">
-    <img style="border:0;width:88px;height:31px" src="http://non-free.steven-mcdonald.id.au/valid-css.png" alt="Valid CSS">
+    <img style="border:0;width:88px;height:31px" src="/valid-css.png" alt="Valid CSS">
   </a>
 </div>
diff --git a/licence.shtml b/licence.shtml
index 4346125..25eec9a 100755
--- a/licence.shtml
+++ b/licence.shtml
@@ -19,25 +19,26 @@
   </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. 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, 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>
-    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.
+    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 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. :-)
+    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
@@ -48,10 +49,6 @@
     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"-->
-- 
2.30.2