Moved main site to main/, created non-free/
authorSteven McDonald <steven.mcdonald@libremail.me>
Sun, 6 Mar 2011 12:32:46 +0000 (23:32 +1100)
committerSteven McDonald <steven.mcdonald@libremail.me>
Sun, 6 Mar 2011 12:32:46 +0000 (23:32 +1100)
30 files changed:
about.shtml [deleted file]
articles/creativecommons.shtml [deleted file]
articles/index.shtml [deleted file]
doctype.txt [deleted file]
footer.shtml [deleted file]
head.shtml [deleted file]
header.shtml [deleted file]
index.shtml [deleted file]
licence.shtml [deleted file]
main/about.shtml [new file with mode: 0755]
main/articles/creativecommons.shtml [new file with mode: 0755]
main/articles/index.shtml [new file with mode: 0755]
main/doctype.txt [new file with mode: 0755]
main/footer.shtml [new file with mode: 0755]
main/head.shtml [new file with mode: 0755]
main/header.shtml [new file with mode: 0755]
main/index.shtml [new file with mode: 0755]
main/licence.shtml [new file with mode: 0755]
main/navigation.shtml [new file with mode: 0755]
main/pgp_public_key.asc [new file with mode: 0755]
main/sitename.txt [new file with mode: 0755]
main/style.css [new file with mode: 0755]
main/valid-css.png [new file with mode: 0644]
main/valid-html401.png [new file with mode: 0644]
navigation.shtml [deleted file]
pgp_public_key.asc [deleted file]
sitename.txt [deleted file]
style.css [deleted file]
valid-css.png [deleted file]
valid-html401.png [deleted file]

diff --git a/about.shtml b/about.shtml
deleted file mode 100755 (executable)
index 24dfc58..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--#include virtual="/doctype.txt"-->
-<html>
-
-<!--#include virtual="/head.shtml"-->
-
-<body>
-
-<!--#include virtual="/header.shtml"-->
-
-<!--#include virtual="/navigation.shtml"-->
-
-<div id="content">
-  <h2>
-    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.
-  </p>
-  <h3>
-    How to contact me
-  </h3>
-  <ul id="contactme">
-    <li>
-      Email: steven AT steven-mcdonald DOT id DOT au
-    </li>
-    <li>
-      Identi.ca: <a href="https://identi.ca/parsifal">parsifal</a>
-    </li>
-    <li>
-      IRC: Parsifal on FreeNode
-    </li>
-    <li>
-      XMPP (Jabber): steven AT steven-mcdonald DOT id DOT au
-    </li>
-  </ul>
-  <h3>
-    PGP key
-  </h3>
-  <p>
-    If contacting me by email, I strongly encourage you to use PGP encryption.
-    My PGP public key may be found <a href="/pgp_public_key.asc">here</a>.
-  </p>
-</div>
-
-<!--#include virtual="/footer.shtml"-->
-
-</body>
-
-</html>
diff --git a/articles/creativecommons.shtml b/articles/creativecommons.shtml
deleted file mode 100755 (executable)
index 437c056..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--#include virtual="/doctype.txt"-->
-<html>
-
-<!--#include virtual="/head.shtml"-->
-
-<body>
-
-<!--#include virtual="/header.shtml"-->
-
-<!--#include virtual="/navigation.shtml"-->
-
-<div id="content">
-
-<!--
-
-NOTE TO SELF:
-
-When updating this page, be sure to update the "Last Updated" field below,
-AND on the articles index page!
-
--->
-
-<h2>Creative Commons Licences -- Why Precision Matters</h2>
-<p><em>(Last updated 2011-02-27)</em></p>
-
-<p>
-I frequently hear people refer to specific works as "Creative Commons licensed" or "under a Creative Commons licence." While this may be a perfectly valid description, it is also worse than useless because it not only provides almost no detail about the terms under which the work is licensed, but also serves to propagate the myth that the Creative Commons licences are similar in nature.
-</p>
-
-<p>
-The set of Creative Commons licences varies more widely than most other classes of licence -- they vary more widely than the set of free licences and they arguably vary more widely than EULAs, which tend to all say more or less the same thing. Yet, because they are published by the same organisation, people lump them together, referring to a work as "Creative Commons licensed" rather than giving actual detail regarding its licensing terms. Saying something is "Creative Commons licensed" is like telling a taxi driver that you want to go east; it just isn't specific enough to be of any use value whatsoever.
-</p>
-
-<p>
-The only characteristic shared among all Creative Commons licences is that they allow works to be shared verbatim, for non-commercial purposes only. Some of them do go further to allow modification, commercial use or both, but by referring to a work as being "under a Creative Commons licence," one doesn't communicate that. While noncommercial sharing is a valuable gem in today's culture of draconian copyright restrictions and DRM, it is not particularly useful by itself in many cases -- for example, the noncommercial restriction would prevent you from placing it on your blog if you display any advertising material from which you make money. For more good reasons <em>not</em> to use a noncommercial licence, please refer to <a href="http://freedomdefined.org/Licenses/NC">this great article</a> by Erik Möller.
-</p>
-
-<p>
-So please, if you are talking to someone about a work under a Creative Commons licence, tell them specifically which one you mean -- don't just say "Creative Commons licensed," partly because that will give them no useful information at all, and partly because that is likely to confuse them into believing that all of the CC licences contain similar terms.
-</p>
-
-</div>
-
-<!--#include virtual="/footer.shtml"-->
-
-</body>
-
-</html>
diff --git a/articles/index.shtml b/articles/index.shtml
deleted file mode 100755 (executable)
index 413f83e..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--#include virtual="/doctype.txt"-->
-<html>
-
-<!--#include virtual="/head.shtml"-->
-
-<body>
-
-<!--#include virtual="/header.shtml"-->
-
-<!--#include virtual="/navigation.shtml"-->
-
-<div id="content">
-
-<h2>Articles</h2>
-
-<p>This section contains a collection of articles I have written.</p>
-
-<p>
-<a href="/articles/creativecommons.shtml">Creative Commons Licences -- Why Precision Matters</a> 
-(Last updated 2011-02-27)
-</p>
-
-</div>
-
-<!--#include virtual="/footer.shtml"-->
-
-</body>
-
-</html>
diff --git a/doctype.txt b/doctype.txt
deleted file mode 100755 (executable)
index 54d1f40..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
diff --git a/footer.shtml b/footer.shtml
deleted file mode 100755 (executable)
index 5e90519..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<div id="footer">
-  <p>
-    <a href="/licence.shtml">
-      Copyright and Licence Grant
-    </a>
-  </p>
-  <a href="http://validator.w3.org/check?uri=referer">
-    <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="/valid-css.png" alt="Valid CSS">
-  </a>
-</div>
diff --git a/head.shtml b/head.shtml
deleted file mode 100755 (executable)
index 1bb1e7d..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<head>
-  <title>
-    <!--#include virtual="/sitename.txt"-->
-  </title>
-  <link rel="stylesheet" href="/style.css" type="text/css">
-  <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-</head>
diff --git a/header.shtml b/header.shtml
deleted file mode 100755 (executable)
index fecfa10..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<div id="header">
-  <h1>
-    <!--#include virtual="/sitename.txt"-->
-  </h1>
-</div>
diff --git a/index.shtml b/index.shtml
deleted file mode 100755 (executable)
index 2cadc6c..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--#include virtual="/doctype.txt"-->
-<html>
-
-<!--#include virtual="/head.shtml"-->
-
-<body>
-
-<!--#include virtual="/header.shtml"-->
-
-<!--#include virtual="/navigation.shtml"-->
-
-<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.
-  </p>
-</div>
-
-<!--#include virtual="/footer.shtml"-->
-
-</body>
-
-</html>
diff --git a/licence.shtml b/licence.shtml
deleted file mode 100755 (executable)
index 25eec9a..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-<!--#include virtual="/doctype.txt"-->
-<html>
-
-<!--#include virtual="/head.shtml"-->
-
-<body>
-
-<!--#include virtual="/header.shtml"-->
-
-<!--#include virtual="/navigation.shtml"-->
-
-<div id="content">
-  <p>
-    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 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, 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>
-    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-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>
-</div>
-
-<!--#include virtual="/footer.shtml"-->
-
-</body>
-
-</html>
diff --git a/main/about.shtml b/main/about.shtml
new file mode 100755 (executable)
index 0000000..24dfc58
--- /dev/null
@@ -0,0 +1,51 @@
+<!--#include virtual="/doctype.txt"-->
+<html>
+
+<!--#include virtual="/head.shtml"-->
+
+<body>
+
+<!--#include virtual="/header.shtml"-->
+
+<!--#include virtual="/navigation.shtml"-->
+
+<div id="content">
+  <h2>
+    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.
+  </p>
+  <h3>
+    How to contact me
+  </h3>
+  <ul id="contactme">
+    <li>
+      Email: steven AT steven-mcdonald DOT id DOT au
+    </li>
+    <li>
+      Identi.ca: <a href="https://identi.ca/parsifal">parsifal</a>
+    </li>
+    <li>
+      IRC: Parsifal on FreeNode
+    </li>
+    <li>
+      XMPP (Jabber): steven AT steven-mcdonald DOT id DOT au
+    </li>
+  </ul>
+  <h3>
+    PGP key
+  </h3>
+  <p>
+    If contacting me by email, I strongly encourage you to use PGP encryption.
+    My PGP public key may be found <a href="/pgp_public_key.asc">here</a>.
+  </p>
+</div>
+
+<!--#include virtual="/footer.shtml"-->
+
+</body>
+
+</html>
diff --git a/main/articles/creativecommons.shtml b/main/articles/creativecommons.shtml
new file mode 100755 (executable)
index 0000000..437c056
--- /dev/null
@@ -0,0 +1,48 @@
+<!--#include virtual="/doctype.txt"-->
+<html>
+
+<!--#include virtual="/head.shtml"-->
+
+<body>
+
+<!--#include virtual="/header.shtml"-->
+
+<!--#include virtual="/navigation.shtml"-->
+
+<div id="content">
+
+<!--
+
+NOTE TO SELF:
+
+When updating this page, be sure to update the "Last Updated" field below,
+AND on the articles index page!
+
+-->
+
+<h2>Creative Commons Licences -- Why Precision Matters</h2>
+<p><em>(Last updated 2011-02-27)</em></p>
+
+<p>
+I frequently hear people refer to specific works as "Creative Commons licensed" or "under a Creative Commons licence." While this may be a perfectly valid description, it is also worse than useless because it not only provides almost no detail about the terms under which the work is licensed, but also serves to propagate the myth that the Creative Commons licences are similar in nature.
+</p>
+
+<p>
+The set of Creative Commons licences varies more widely than most other classes of licence -- they vary more widely than the set of free licences and they arguably vary more widely than EULAs, which tend to all say more or less the same thing. Yet, because they are published by the same organisation, people lump them together, referring to a work as "Creative Commons licensed" rather than giving actual detail regarding its licensing terms. Saying something is "Creative Commons licensed" is like telling a taxi driver that you want to go east; it just isn't specific enough to be of any use value whatsoever.
+</p>
+
+<p>
+The only characteristic shared among all Creative Commons licences is that they allow works to be shared verbatim, for non-commercial purposes only. Some of them do go further to allow modification, commercial use or both, but by referring to a work as being "under a Creative Commons licence," one doesn't communicate that. While noncommercial sharing is a valuable gem in today's culture of draconian copyright restrictions and DRM, it is not particularly useful by itself in many cases -- for example, the noncommercial restriction would prevent you from placing it on your blog if you display any advertising material from which you make money. For more good reasons <em>not</em> to use a noncommercial licence, please refer to <a href="http://freedomdefined.org/Licenses/NC">this great article</a> by Erik Möller.
+</p>
+
+<p>
+So please, if you are talking to someone about a work under a Creative Commons licence, tell them specifically which one you mean -- don't just say "Creative Commons licensed," partly because that will give them no useful information at all, and partly because that is likely to confuse them into believing that all of the CC licences contain similar terms.
+</p>
+
+</div>
+
+<!--#include virtual="/footer.shtml"-->
+
+</body>
+
+</html>
diff --git a/main/articles/index.shtml b/main/articles/index.shtml
new file mode 100755 (executable)
index 0000000..413f83e
--- /dev/null
@@ -0,0 +1,29 @@
+<!--#include virtual="/doctype.txt"-->
+<html>
+
+<!--#include virtual="/head.shtml"-->
+
+<body>
+
+<!--#include virtual="/header.shtml"-->
+
+<!--#include virtual="/navigation.shtml"-->
+
+<div id="content">
+
+<h2>Articles</h2>
+
+<p>This section contains a collection of articles I have written.</p>
+
+<p>
+<a href="/articles/creativecommons.shtml">Creative Commons Licences -- Why Precision Matters</a> 
+(Last updated 2011-02-27)
+</p>
+
+</div>
+
+<!--#include virtual="/footer.shtml"-->
+
+</body>
+
+</html>
diff --git a/main/doctype.txt b/main/doctype.txt
new file mode 100755 (executable)
index 0000000..54d1f40
--- /dev/null
@@ -0,0 +1 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
diff --git a/main/footer.shtml b/main/footer.shtml
new file mode 100755 (executable)
index 0000000..5e90519
--- /dev/null
@@ -0,0 +1,13 @@
+<div id="footer">
+  <p>
+    <a href="/licence.shtml">
+      Copyright and Licence Grant
+    </a>
+  </p>
+  <a href="http://validator.w3.org/check?uri=referer">
+    <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="/valid-css.png" alt="Valid CSS">
+  </a>
+</div>
diff --git a/main/head.shtml b/main/head.shtml
new file mode 100755 (executable)
index 0000000..1bb1e7d
--- /dev/null
@@ -0,0 +1,7 @@
+<head>
+  <title>
+    <!--#include virtual="/sitename.txt"-->
+  </title>
+  <link rel="stylesheet" href="/style.css" type="text/css">
+  <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
+</head>
diff --git a/main/header.shtml b/main/header.shtml
new file mode 100755 (executable)
index 0000000..fecfa10
--- /dev/null
@@ -0,0 +1,5 @@
+<div id="header">
+  <h1>
+    <!--#include virtual="/sitename.txt"-->
+  </h1>
+</div>
diff --git a/main/index.shtml b/main/index.shtml
new file mode 100755 (executable)
index 0000000..2cadc6c
--- /dev/null
@@ -0,0 +1,31 @@
+<!--#include virtual="/doctype.txt"-->
+<html>
+
+<!--#include virtual="/head.shtml"-->
+
+<body>
+
+<!--#include virtual="/header.shtml"-->
+
+<!--#include virtual="/navigation.shtml"-->
+
+<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.
+  </p>
+</div>
+
+<!--#include virtual="/footer.shtml"-->
+
+</body>
+
+</html>
diff --git a/main/licence.shtml b/main/licence.shtml
new file mode 100755 (executable)
index 0000000..25eec9a
--- /dev/null
@@ -0,0 +1,58 @@
+<!--#include virtual="/doctype.txt"-->
+<html>
+
+<!--#include virtual="/head.shtml"-->
+
+<body>
+
+<!--#include virtual="/header.shtml"-->
+
+<!--#include virtual="/navigation.shtml"-->
+
+<div id="content">
+  <p>
+    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 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, 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>
+    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-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>
+</div>
+
+<!--#include virtual="/footer.shtml"-->
+
+</body>
+
+</html>
diff --git a/main/navigation.shtml b/main/navigation.shtml
new file mode 100755 (executable)
index 0000000..c280ce9
--- /dev/null
@@ -0,0 +1,19 @@
+<div id="navigation">
+ <ul>
+ <li>
+  <a href="/">Home</a>
+ </li>
+ <li>
+  <a href="/articles/">Articles</a>
+ </li>
+ <li>
+  &nbsp;
+ </li>
+ <li>
+  <a href="/about.shtml">About me</a>
+ </li>
+ <li>
+  <a href="/licence.shtml">Copyright</a>
+ </li>
+</ul>
+</div>
diff --git a/main/pgp_public_key.asc b/main/pgp_public_key.asc
new file mode 100755 (executable)
index 0000000..2e4c4dc
--- /dev/null
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+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
+RcZbHYgWKT4piB2cdlF4AOYHnd7ZoTy59Q==
+=qQDX
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/main/sitename.txt b/main/sitename.txt
new file mode 100755 (executable)
index 0000000..c736407
--- /dev/null
@@ -0,0 +1 @@
+www.steven-mcdonald.id.au
diff --git a/main/style.css b/main/style.css
new file mode 100755 (executable)
index 0000000..dffaa43
--- /dev/null
@@ -0,0 +1,149 @@
+a:link
+{
+  color: #60a0ff;
+}
+
+a:visited
+{
+  color: #a060ff;
+}
+
+a:active,a:hover
+{
+  color: #40ff80;
+}
+
+body
+{
+  background-color: #080808;
+  color: #ffff70;
+  font-family: sans;
+}
+
+code
+{
+  background-color: #402020;
+  border: 2px dashed #000000;
+  color: #ffd800;
+  display: block;
+  font-family: monospace;
+  font-size: 0.9em;
+  font-weight: bold;
+  margin: 1.5em 1.0em 1.5em 1.0em;
+  line-height: 1.5em;
+  padding: 0.5em;
+}
+
+h1
+{
+  font-size: 1.7em;
+  font-weight: bold;
+}
+
+h2
+{
+  font-size: 1.6em;
+  font-weight: bold;
+}
+
+h3
+{
+  font-size: 1.5em;
+  font-weight: bold;
+}
+
+h4
+{
+  font-size: 1.4em;
+  font-weight: bold;
+}
+
+h5
+{
+  font-size: 1.3em;
+  font-weight: bold;
+}
+
+h6
+{
+  font-size: 1.2em;
+  font-weight: bold;
+}
+
+h7
+{
+  font-size: 1.1em;
+  font-weight: bold;
+}
+
+img
+{
+  border: 0;
+}
+
+p
+{
+  line-height: 1.5em;
+}
+
+strong
+{
+  font-weight: bold;
+}
+
+#contactme
+{
+
+}
+
+#content
+{
+  margin: 0 14em 50px 20px; /* navigation width + 4em */
+}
+
+#footer
+{
+  height: 4em;
+  font-size: 0.8em;
+  margin: 0 10em 0 10em;
+  padding: 0.5em;
+  text-align: center;
+}
+
+#header
+{
+  height: 4em;
+  margin: 0 10em 0 10em;
+  padding: 0.5em;
+  text-align: center;
+}
+
+#navigation
+{
+  background-color: #181818;
+  border: 3px solid #606018;
+  color: #d0d060;
+  padding: 0.3em;
+  position: absolute;
+  right: 20px;
+  text-align: right;
+  top: 7em; /* header height + 3em */
+  width: 10em;
+}
+
+#navigation a:link,#navigation a:visited
+{
+  color: #d0d040;
+}
+
+#navigation a:active,#navigation a:hover
+{
+  color: #e0e045;
+}
+
+#navigation ul
+{
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+}
diff --git a/main/valid-css.png b/main/valid-css.png
new file mode 100644 (file)
index 0000000..e65a388
Binary files /dev/null and b/main/valid-css.png differ
diff --git a/main/valid-html401.png b/main/valid-html401.png
new file mode 100644 (file)
index 0000000..c010842
Binary files /dev/null and b/main/valid-html401.png differ
diff --git a/navigation.shtml b/navigation.shtml
deleted file mode 100755 (executable)
index c280ce9..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<div id="navigation">
- <ul>
- <li>
-  <a href="/">Home</a>
- </li>
- <li>
-  <a href="/articles/">Articles</a>
- </li>
- <li>
-  &nbsp;
- </li>
- <li>
-  <a href="/about.shtml">About me</a>
- </li>
- <li>
-  <a href="/licence.shtml">Copyright</a>
- </li>
-</ul>
-</div>
diff --git a/pgp_public_key.asc b/pgp_public_key.asc
deleted file mode 100755 (executable)
index 2e4c4dc..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-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
-RcZbHYgWKT4piB2cdlF4AOYHnd7ZoTy59Q==
-=qQDX
------END PGP PUBLIC KEY BLOCK-----
diff --git a/sitename.txt b/sitename.txt
deleted file mode 100755 (executable)
index c736407..0000000
+++ /dev/null
@@ -1 +0,0 @@
-www.steven-mcdonald.id.au
diff --git a/style.css b/style.css
deleted file mode 100755 (executable)
index dffaa43..0000000
--- a/style.css
+++ /dev/null
@@ -1,149 +0,0 @@
-a:link
-{
-  color: #60a0ff;
-}
-
-a:visited
-{
-  color: #a060ff;
-}
-
-a:active,a:hover
-{
-  color: #40ff80;
-}
-
-body
-{
-  background-color: #080808;
-  color: #ffff70;
-  font-family: sans;
-}
-
-code
-{
-  background-color: #402020;
-  border: 2px dashed #000000;
-  color: #ffd800;
-  display: block;
-  font-family: monospace;
-  font-size: 0.9em;
-  font-weight: bold;
-  margin: 1.5em 1.0em 1.5em 1.0em;
-  line-height: 1.5em;
-  padding: 0.5em;
-}
-
-h1
-{
-  font-size: 1.7em;
-  font-weight: bold;
-}
-
-h2
-{
-  font-size: 1.6em;
-  font-weight: bold;
-}
-
-h3
-{
-  font-size: 1.5em;
-  font-weight: bold;
-}
-
-h4
-{
-  font-size: 1.4em;
-  font-weight: bold;
-}
-
-h5
-{
-  font-size: 1.3em;
-  font-weight: bold;
-}
-
-h6
-{
-  font-size: 1.2em;
-  font-weight: bold;
-}
-
-h7
-{
-  font-size: 1.1em;
-  font-weight: bold;
-}
-
-img
-{
-  border: 0;
-}
-
-p
-{
-  line-height: 1.5em;
-}
-
-strong
-{
-  font-weight: bold;
-}
-
-#contactme
-{
-
-}
-
-#content
-{
-  margin: 0 14em 50px 20px; /* navigation width + 4em */
-}
-
-#footer
-{
-  height: 4em;
-  font-size: 0.8em;
-  margin: 0 10em 0 10em;
-  padding: 0.5em;
-  text-align: center;
-}
-
-#header
-{
-  height: 4em;
-  margin: 0 10em 0 10em;
-  padding: 0.5em;
-  text-align: center;
-}
-
-#navigation
-{
-  background-color: #181818;
-  border: 3px solid #606018;
-  color: #d0d060;
-  padding: 0.3em;
-  position: absolute;
-  right: 20px;
-  text-align: right;
-  top: 7em; /* header height + 3em */
-  width: 10em;
-}
-
-#navigation a:link,#navigation a:visited
-{
-  color: #d0d040;
-}
-
-#navigation a:active,#navigation a:hover
-{
-  color: #e0e045;
-}
-
-#navigation ul
-{
-  list-style-type: none;
-  margin: 0;
-  padding: 0;
-}
diff --git a/valid-css.png b/valid-css.png
deleted file mode 100644 (file)
index e65a388..0000000
Binary files a/valid-css.png and /dev/null differ
diff --git a/valid-html401.png b/valid-html401.png
deleted file mode 100644 (file)
index c010842..0000000
Binary files a/valid-html401.png and /dev/null differ