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 'talks')

diff --git a/talks/index.html b/talks/index.html
deleted file mode 100755
index d8d59d6..0000000
--- a/talks/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!--#set var="title" value="Talks" -->
-<!--#include virtual="../includes/header.html" -->
-<h2>Talks</h2>
-<p>
-	Here you will find information about some of the talks and presentations
-	I've given.
-</p>
-<ul>
-	<li><a href="software-contracts/">Legal Validity of Software Contracts</a></li>
-</ul>
-<!--#include virtual="../includes/footer.html" -->
diff --git a/talks/index.mdwn b/talks/index.mdwn
new file mode 100644
index 0000000..0a917cb
--- /dev/null
+++ b/talks/index.mdwn
@@ -0,0 +1,9 @@
+<!--#set var="title" value="Talks" -->
+<!--#include virtual="/includes/header.html" -->
+
+Here you will find information about some of the talks and presentations I've
+given.
+
+  * [Legal Validity of Software Contracts](software-contracts/)
+
+<!--#include virtual="/includes/footer.html" -->
diff --git a/talks/software-contracts/index.html b/talks/software-contracts/index.html
deleted file mode 100755
index 158810f..0000000
--- a/talks/software-contracts/index.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--#set var="title" value="Legal Validity of Software Contracts" -->
-<!--#include virtual="../../includes/header.html" -->
-<h2>Legal Validity of Software Contracts</h2>
-<p>
-	This is a presentation that I gave in a law-related course at the New Jersey
-	Institute of Technology (NJIT) in the Spring of 2012.
-</p>
-<p>
-	In the presentation, I define software contracts (a.k.a. "end-user license
-	agreements", "software license agreements", or simply "licenses") and
-	explain the history of software copyright law and contracts.  I then examine
-	the disputed legal validity of software contracts in three main areas:
-	assent to terms (including "shrink wrap" and "click wrap" contracts),
-	ownership of copies (the "licensed, not sold" argument), and conscionability
-	and preemption.
-</p>
-<p>
-	The presentation refers to statutory and case law in the United States, but
-	the concepts should apply to almost any jurisdiction.
-</p>
-<h4>Slides</h4>
-<p>
-	The following are the slides I prepared for the presentation:
-</p>
-<ul>
-	<li><a href="software-contracts.odp">OpenDocument Format</a></li>
-	<li><a href="software-contracts.pdf">Portable Document Format</a></li>
-</ul>
-<p>
-	Included in the OpenDocument version is the script to the presentation
-	(in LibreOffice, look in the "Notes" tab).
-</p>
-<p>
-	Many reader programs render stripes in the slide background of the PDF file.
-	This is due to
-	<a href="https://bugs.launchpad.net/ubuntu/+source/cairo/+bug/164233">a bug</a>
-	<a href="https://bugs.freedesktop.org/show_bug.cgi?id=47706">in cairo</a>
-	which has been fixed in a version newer than that which I used.
-</p>
-<h4>Copyright</h4>
-<p>
-	Copyright &copy; 2012 Patrick "P. J." M<span class="super">c</span>Dermott
-	<br>
-	All works related to this workshop, including this document, the flyer, the
-	notes, and the session records may be used under the terms of the
-	<a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
-		Attribution-ShareAlike 3.0 Unported license</a>.
-</p>
-<!--#include virtual="../../includes/footer.html" -->
diff --git a/talks/software-contracts/index.mdwn b/talks/software-contracts/index.mdwn
new file mode 100644
index 0000000..7727014
--- /dev/null
+++ b/talks/software-contracts/index.mdwn
@@ -0,0 +1,46 @@
+<!--#set var="title" value="Legal Validity of Software Contracts" -->
+<!--#include virtual="/includes/header.html" -->
+
+This is a presentation that I gave in a law-related course at the New Jersey
+Institute of Technology (NJIT) in the Spring of 2012.
+
+In the presentation, I define software contracts (a.k.a. "end-user license
+agreements", "software license agreements", or simply "licenses") and explain
+the history of software copyright law and contracts.  I then examine the
+disputed legal validity of software contracts in three main areas: assent to
+terms (including "shrink wrap" and "click wrap" contracts), ownership of copies
+(the "licensed, not sold" argument), and conscionability and preemption.
+
+The presentation refers to statutory and case law in the United States, but the
+concepts should apply to almost any jurisdiction.
+
+Slides
+======
+
+The following are the slides I prepared for the presentation:
+
+  * [OpenDocument Format](software-contracts.odp)
+  * [Portable Document Format](software-contracts.pdf)
+
+Included in the OpenDocument version is the script to the presentation (in
+LibreOffice, look in the "Notes" tab).
+
+Many reader programs render stripes in the slide background of the PDF file.
+This is due to [a bug][bug-lp] [in cairo][bug-fdo] which has been fixed in a
+version newer than that which I used.
+
+[bug-lp]: https://bugs.launchpad.net/ubuntu/+source/cairo/+bug/164233
+[bug-fdo]: https://bugs.freedesktop.org/show_bug.cgi?id=47706
+
+Copyright
+=========
+
+Copyright &copy; 2012 Patrick "P. J." M<span class="super">c</span>Dermott
+
+All works related to this workshop, including this document, the flyer, the
+notes, and the session records may be used under the terms of the
+[Creative Commons Attribution-ShareAlike 3.0 Unported license][cc-by-sa-3.0].
+
+[cc-by-sa-3.0]: http://creativecommons.org/licenses/by-sa/3.0/
+
+<!--#include virtual="/includes/footer.html" -->
--
cgit v0.9.1