From cf29488c587334874cf491a01a1f74ba3ac7de45 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Mon, 30 Sep 2013 13:46:59 -0400
Subject: Merge branch 'new'.

---
(limited to 'index.html')

diff --git a/index.html b/index.html
deleted file mode 100755
index b551d28..0000000
--- a/index.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--#set var="title" value="" -->
-<!--#include file="includes/header.html" -->
-<img src="work-area-portrait.240x240.png" alt="P. J. McDermott" class="photo">
-<p>
-	This is my personal Web site, which contains personal and professional
-	information about me, technical guides on GNU/Linux and UNIX, and essays
-	on computing ethics and freedom.
-</p>
-<h3>About Me</h3>
-<p>
-	I am:
-</p>
-<ul>
-	<li>A hacker (that is, a playful tinkerer interested in exploring the limits
-	of technology).</li>
-	<li>A knowledgeable user of GNU/Linux.</li>
-	<li>A competent software author.</li>
-	<li>A fan of freely- and semi-freely-licensed heavy metal and rock
-	music.</li>
-	<li>A student in the
-	<a href="http://www.google-melange.com/gsoc/homepage/google/gsoc2012">2012
-		Google Summer of Code</a> program
-	<a href="http://wiki.debian.org/SummerOfCode2012/StudentApplications/PJMcDermott">working
-		with the Debian Project</a>.</li>
-	<li>The leader of a project to develop a fully-free
-	<a href="http://os.pehjota.net/">embedded operating system
-		distribution</a>.</li>
-	<li><a href="https://www.fsf.org/register_form?referrer=10830">Associate
-		member</a> #10830 of the Free Software Foundation.</li>
-	<li>A recent university graduate with a degree in computer science.</li>
-	<li>A self-taught student of U.S. and international copyright law and free
-	software licensing.</li>
-	<li>The former leader of my university's undergraduate GNU/Linux special
-	interest group.</li>
-	<li>Trained in karate.</li>
-	<li>Licensed to operate motorboats.</li>
-	<li>Certified for open water SCUBA diving.</li>
-</ul>
-<h3>New</h3>
-<ul>
-	<li><a href="talks/software-contracts/">A presentation on the disputed legal
-		validity of software contracts</a>.</li>
-	<li><a href="guides/shell-workshop/">A workshop on the UNIX shell</a> I gave at
-		NJIT.</li>
-</ul>
-<h3>To Come</h3>
-<ul>
-	<li>More essays on computing ethics and freedom.</li>
-	<li>Technical guides on GNU/Linux, especially one related to the boot
-	process (an apparently popular topic with which I'm quite familiar).</li>
-</ul>
-<!--#include file="includes/footer.html" -->
--
cgit v0.9.1