Pull my website out of 2011

diff --git a/about.shtml b/about.shtml
index f5c0ceb85b019b61f1d818536ec35891dd4ded72..4e7df88f6591bdb80c0b8aaedc4d665ef9a0caa2 100644 (file)
--- a/about.shtml
+++ b/about.shtml
@@ -14,9 +14,7 @@
     About me
   </h2>
   <p>
-    I am Steven McDonald, a <a
-    href="http://www.gnu.org/philosophy/free-sw.html">free software</a>
-    enthusiast and musician living in Sydney, Australia.
+    I am Steven McDonald, a systems administrator and musician living in Sydney, Australia.
   </p>
   <h3>
     How to contact me
@@ -25,12 +23,6 @@
     <li>
       Email: <a href="mailto:steven@steven-mcdonald.id.au">steven@steven-mcdonald.id.au</a>
     </li>
-    <li>
-      Identi.ca: <a href="https://identi.ca/parsifal">parsifal</a>
-    </li>
-    <li>
-      IRC: Parsifal on FreeNode
-    </li>
     <li>
       XMPP (Jabber): steven@steven-mcdonald.id.au
     </li>

diff --git a/index.shtml b/index.shtml
index 2cadc6c308e7dbb8bd69d381b4c86f558ba9a23f..9c439a3ca8e8b42bd038c9340a41862eb76b3b4b 100644 (file)
--- a/index.shtml
+++ b/index.shtml
@@ -11,16 +11,9 @@
 
 <div id="content">
   <p>
-    Welcome to my personal website. I'm putting this together as a project to
-    help me get back into HTML/CSS, which I haven't used in years, and to learn
-    how to do it right this time (i.e. conform to the standards and what not).
-    It will also serve as a place for me to publish tutorials and scripts for
-    the <a href="http://www.gnu.org">GNU</a>/<a href="http://www.kernel.org/">
-    Linux</a> operating system, targeted in particular at audio enthusiasts
-    using the <a href="http://debian.org">Debian</a> distribution, which I
-    would recommend to anyone looking for a reliable <a
-    href="http://www.gnu.org/philosophy/free-sw.html">free</a> operating
-    system.
+    Welcome to my personal website. There's not very much here, and this place
+    isn't very conscientiously maintained, so you can safely assume anything
+    here is either out of date or about to become so.
   </p>
 </div>
 

diff --git a/licence.shtml b/licence.shtml
index d1c8e19d86c34f36fa8869cca7c02ce593c84f78..7f00dbf69ab6cc787b6f3ef09d05551e9d235cbe 100644 (file)
--- a/licence.shtml
+++ b/licence.shtml
@@ -18,21 +18,13 @@
     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
-    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
+    Unless otherwise noted, permission is granted to redistribute and/or
+    modify content on this website under the terms of the <a href="/wtfpl.txt">
+    Do What The Fuck You Want To Public License</a>, Version 2, as
+    published by Sam Hocevar. 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.
-  </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,

diff --git a/wtfpl.txt b/wtfpl.txt
new file mode 100644 (file)
index 0000000..5a8e332
--- /dev/null
+++ b/wtfpl.txt
@@ -0,0 +1,14 @@
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.
+