summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/conferences/lca2010/abstract13
-rw-r--r--doc/conferences/lca2010/bio16
2 files changed, 15 insertions, 14 deletions
diff --git a/doc/conferences/lca2010/abstract b/doc/conferences/lca2010/abstract
index b195ff9..0b18528 100644
--- a/doc/conferences/lca2010/abstract
+++ b/doc/conferences/lca2010/abstract
@@ -50,5 +50,16 @@ as a port in FreeBSD. A Slackbuild is available for Slackware, and
Monkeysphere itself should work on any POSIX-ish system with the
appropriate dependencies available.
-The project's main web site is http://web.monkeysphere.info/
+The Monkeysphere project began to coalesce in early 2008, and remains
+an ongoing collaboration of many people, including:
+
+ * Micah Anderson
+ * Mike Castleman
+ * Daniel Kahn Gillmor
+ * Ross Glover
+ * Matthew James Goins
+ * Greg Lyle
+ * Jamie McClelland
+ * Jameson Graef Rollins
+The project's main web site is http://web.monkeysphere.info/
diff --git a/doc/conferences/lca2010/bio b/doc/conferences/lca2010/bio
index c8ac571..f358e02 100644
--- a/doc/conferences/lca2010/bio
+++ b/doc/conferences/lca2010/bio
@@ -18,16 +18,6 @@ He is also a contributor to The Organic Internet
(http://mayfirst.org/organicinternet), which includes his essay about
structural flaws in the X.509 certificate model.
-dkg began working with free software in 2002, and became a Debian
-Developer in 2009. The Monkeysphere project began to coalesce in
-early 2008, and remains an ongoing collaboration of many people,
-including:
-
- * Micah Anderson
- * Mike Castleman
- * Daniel Kahn Gillmor
- * Ross Glover
- * Matthew James Goins
- * Greg Lyle
- * Jamie McClelland
- * Jameson Graef Rollins
+dkg began working with free software in 2002, began work with the
+other Monkeysphere developers in 2008, and became a Debian Developer
+in 2009. People seem to laugh when they see his business card.