From b0b9847238ea7286e22d5b14f4e9aa6a0a133527 Mon Sep 17 00:00:00 2001
From: Zak Rogoff <zak@fsf.org>
Date: Mon, 1 Feb 2016 16:54:59 -0500
Subject: [PATCH] Tweaking a bit.

---
 2016/program/generated-sessions.html |  20 ++-
 2016/program/speakers.html           | 240 +++++++++++++++------------
 2 files changed, 154 insertions(+), 106 deletions(-)

diff --git a/2016/program/generated-sessions.html b/2016/program/generated-sessions.html
index aa7105a5..05991e89 100755
--- a/2016/program/generated-sessions.html
+++ b/2016/program/generated-sessions.html
@@ -16,8 +16,13 @@
     </hgroup>
    </header>
    <span class="program-session-speaker">
-    Edward Snowden,
-        Daniel Kahn Gillmor
+    <a href="speakers#snowden">
+     Edward Snowden
+    </a>
+    ,
+    <a href="speakers#dkg">
+     Daniel Kahn Gillmor
+    </a>
    </span>
    <p class="program-session-room-details">
     <button aria-controls="day-1-timeslot-1-session-1-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-1-timeslot-1-session-1-collapse" data-toggle="collapse">
@@ -54,8 +59,15 @@
     </hgroup>
    </header>
    <span class="program-session-speaker">
-    Deb Nicholson,
-        Open Invention Network and Richard Fontana,
+    <a href="speakers#nicholson">
+     Deb Nicholson
+    </a>
+    ,
+        Open Invention Network and
+    <a href="speakers#fontana">
+     Richard Fontana
+    </a>
+    ,
         Red Hat
    </span>
    <p class="program-session-room-details">
diff --git a/2016/program/speakers.html b/2016/program/speakers.html
index 8c6e0721..a1eff850 100755
--- a/2016/program/speakers.html
+++ b/2016/program/speakers.html
@@ -11,13 +11,13 @@
 <p>The program is still being filled in, so check back for updates. <a href="https://libreplanet.org/2015/program/speakers.html">See last year's full program</a>.</p>
 
 <!--<div class="row speaker-bio">
-	<div class="col-md-3 col-sm-4 col-xs-5">
-		<img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/stallman.jpg" alt="[ Template - Photo ]"/>
-	</div>
-	<div class="col-md-9 col-sm-8 col-xs-7">
-		<h3 id="name-code">Name</h3>
-		<p>Description</p>
-	</div>
+<div class="col-md-3 col-sm-4 col-xs-5">
+<img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/stallman.jpg" alt="[ Template - Photo ]"/>
+</div>
+<div class="col-md-9 col-sm-8 col-xs-7">
+<h3 id="name-code">Name</h3>
+<p>Description</p>
+</div>
 </div>-->
 <h1>Keynote</h1>
 <div class="row speaker-bio">
@@ -55,90 +55,22 @@
 
 <hr>
 <!--<div class="row speaker-bio">
-	<div class="col-md-2 col-sm-3 col-xs-4">
-		<img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/stallman.jpg" alt="[ Template - Photo ]"/>
-	</div>
-	<div class="col-md-10 col-sm-9 col-xs-8">
-		<h3 id="name-code">Name</h3>
-		<p>Description</p>
-	</div>
-</div>-->
-
-<div class="row speaker-bio">
-	<div class="col-md-2 col-sm-3 col-xs-4">
-	</div>
-	<div class="col-md-10 col-sm-9 col-xs-8">
-		<h3 id="emmanuel">Emmanuel</h3>
-		<p>Emmanuel is a Division III student at Hampshire College, studying how technology (especially restrictive technology, like DRM) can affect how individuals share information, learn, remix content, and organize, among other things. Born and raised in western Massachusetts, they are committed to building a free society, improving the lives of others with technology.
-</p>
-	</div>
-</div>
-
-<div class="row speaker-bio">
-	<div class="col-md-2 col-sm-3 col-xs-4">
-	</div>
-	<div class="col-md-10 col-sm-9 col-xs-8">
-		<h3 id="emmanuel">George Chriss, OpenMeetings.org</h3>
-	</div>
-</div>
-
-<div class="row speaker-bio">
-	<div class="col-md-2 col-sm-3 col-xs-4">
-		<img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/kurdali.png" alt="[ Bassam Kurdali - Photo ]"/>
-	</div>
-	<div class="col-md-10 col-sm-9 col-xs-8">
-		<h3 id="kurdali">Bassam Kurdali, Urchin</h3>
-		<p>Bassam is a 3D animator/filmmaker whose 2006 short, Elephants Dream, was the first "open movie." It established the viability of libre tools in a production environment and set precedent by offering its source data under a permissive license for learning, remixing and re-use. His character, ManCandy, began as an easily animatable test bed for rigging experiments. Multiple iterations have been released to the public, and Bassam demonstrates him in the animated tutorial video + short, The ManCandy FAQ. Under the sign of the urchin, Bassam is continuing to pursue a model of production that invests in commonwealth. He teaches, writes and lectures around the world on free production and free software technique. Raised in Damascus, Bassam trained in the United States as an electrical and software engineer.</p>
-	</div>
+<div class="col-md-2 col-sm-3 col-xs-4">
+<img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/stallman.jpg" alt="[ Template - Photo ]"/>
 </div>
-
-<div class="row speaker-bio">
-	<div class="col-md-2 col-sm-3 col-xs-4">
-		<img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/lelous.jpg" alt="[ Jonathan Le Lous - Photo ]"/>
-	</div>
-	<div class="col-md-10 col-sm-9 col-xs-8">
-		<h3 id="lelous">Jonathan Le Lous, April
-</h3>
-		<p>Jonathan has been involved with the Free Software Movement for ten years, in France and now in Canada.</p>
-	</div>
-</div>
-
-<div class="row speaker-bio">
-	<div class="col-md-2 col-sm-3 col-xs-4">
-	</div>
-	<div class="col-md-10 col-sm-9 col-xs-8">
-		<h3 id="mcgrath">M. C. McGrath</h3>
-		<p>M. C. is the founder of Transparency Toolkit, a free software project that helps people use open data to expose surveillance and human rights abuses. He is also a Thiel Fellow and an Echoing Green Fellow. Previously, M. C. graduated from Boston University with a degree in civic technology and did research at the MIT Media Lab.</p>
-	</div>
-</div>
-
-<div class="row speaker-bio">
-	<div class="col-md-2 col-sm-3 col-xs-4">
-		<img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/oliva.png" alt="[ Alexandre Oliva - Photo ]"/>
-	</div>
-	<div class="col-md-10 col-sm-9 col-xs-8">
-		<h3 id="oliva">Alexandre Oliva, FSF Latin America</h3>
-		<p>FSF Latin America board member. GNU speaker. Free Software Evangelist. Maintainer of GNU Linux-libre, and co-maintainer of the GNU Compiler Collection, GNU binutils and GNU libc. GNU tools engineer at Red Hat Brasil.</p>
-	</div>
-</div>
-
-<div class="row speaker-bio">
-	<div class="col-md-2 col-sm-3 col-xs-4">
-		<img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/peterson.jpg" alt="[ Paige Peterson - Photo ]"/>
-	</div>
-	<div class="col-md-10 col-sm-9 col-xs-8">
-		<h3 id="peterson">Paige Peterson, MaidSoft</h3>
-		<p>While working towards a BFA in Interrelated Media from Massachusetts College of Art, Paige developed an interest in programming and a fascination in the complexity of natural systems. After graduation, Paige worked for mesh networking startup, Open Garden which helped to map her interest in natural decentralized systems onto concepts within technology. She previously organized San Francisco's bitcoin meetup and is fascinated by the freeing potential of cryptocurrencies. She currently fills various roles at MaidSafe with a focus on community and communication.</p>
-	</div>
+<div class="col-md-10 col-sm-9 col-xs-8">
+<h3 id="name-code">Name</h3>
+<p>Description</p>
 </div>
+</div>-->
 
 <div class="row speaker-bio">
 	<div class="col-md-2 col-sm-3 col-xs-4">
-		<img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/seeder.jpg" alt="[ Andrew Seeder - Photo ]"/>
 	</div>
 	<div class="col-md-10 col-sm-9 col-xs-8">
-		<h3 id="seeder">Andrew Seeder, Dudley Street Neighborhood Initiative</h3>
-		<p>Andrew Seeder is the Data Systems Manager at the Dudley Street Neighborhood Initiative in Roxbury, Boston. He is also a consultant for the Smart Chicago Collaborative, sits on the IT Working Group for Boston Ujima, and is a member of the young professionals committee for YMCA's Training, Inc. He helps organize cryptoparties and works with friends on the Boston Meshnet project. Tweet him at @ahseeder.</p>
+		<h3 id="emmanuel">Emmanuel, Hampshire College</h3>
+		<p>Emmanuel is a Division III student at Hampshire College, studying how technology (especially restrictive technology, like DRM) can affect how individuals share information, learn, remix content, and organize, among other things. Born and raised in western Massachusetts, they are committed to building a free society, improving the lives of others with technology.
+		</p>
 	</div>
 </div>
 
@@ -146,35 +78,139 @@
 	<div class="col-md-2 col-sm-3 col-xs-4">
 	</div>
 	<div class="col-md-10 col-sm-9 col-xs-8">
-		<h3 id="name-code">David Thompson, GNU Guix</h3>
-		<p>David Thompson is an FSF alumnus and Guile Scheme hacker. David works on system deployment tools for Guix, develops a functional reactive game engine called Sly (it's cool, you should check it out!), and is frequently found nose-deep in his copy of SICP. He lives in the Boston area.</p>
+		<h3 id="chriss">George Chriss, OpenMeetings.org</h3>
 	</div>
 </div>
 
 <div class="row speaker-bio">
 	<div class="col-md-2 col-sm-3 col-xs-4">
-		<img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/webber.png" alt="[ Christopher Webber - Photo ]"/>
+		<img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/corvellec.jpg" alt="[ Marianne Corvellec - Photo ]"/>
 	</div>
 	<div class="col-md-10 col-sm-9 col-xs-8">
-		<h3 id="webber">Christopher Webber, GNU MediaGoblin</h3>
-		<p>Christopher Allan Webber is co-founder of MediaGoblin, longtime free software and free culture advocate, Creative Commons alumnus, and occasional Guix contributor. You can frequently find him nose-deep in some emacs buffer making ascii art or maybe something more important than that. He lives in Madison, Wisconsin.</p>
+		<h3 id="corvellec">Marianne Corvellec, April</h3>
+		<p>Marianne Corvellec has been a Free Software activist with April since 2011. April is an advocacy association which has been promoting and defending Free Software in France and Europe since 1996. Marianne's focus has been on legal and institutional issues.</p>
 	</div>
 </div>
 
 <div class="row speaker-bio">
 	<div class="col-md-2 col-sm-3 col-xs-4">
-		<img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/zacchiroli.jpg" alt="[ Stefano Zacchiroli - Photo ]"/>
 	</div>
 	<div class="col-md-10 col-sm-9 col-xs-8">
-		<h3 id="zacchiroli">Stefano Zacchiroli, Debian, IRILL</h3>
-		<p>Stefano Zacchiroli is Associate Professor of Computer Science at University Paris Diderot. His research interests span formal methods and their applications to improve software quality and user experience in the context of Free Software distributions. He has been an official member of the Debian Project since 2001, taking care of many tasks from package maintenance to distribution-wide Quality Assurance. He has been elected to serve as Debian Project Leader for 3 terms in a row, over the period 2010-2013. He is a Board Director of the Open Source Initiative (OSI). He is a recipient of the 2015 O'Reilly Open Source Award.</p>
-	</div>
-</div>
-
-<!--#include virtual="../includes/footer.html"-->
-<!--#include virtual="../includes/common_js.html"-->
-<!--#include virtual="../includes/program_js.html"-->
-<script type="text/javascript">
-$("#p-speakers").addClass("active").text("Speakers");
-</script>
-<!--#include virtual="../includes/close.html" -->
+		<h3 id="fontana">Richard Fontana, Red Hat</h3>
+		<p>Richard Fontana is a lawyer at Red Hat. He leads support for Red Hat's engineering and research and development units and is Red Hat's lead counsel for legal issues relating to free software. Richard is also a board director of the Open Source Initiative.</p>	</div>
+	</div>
+
+	<div class="row speaker-bio">
+		<div class="col-md-2 col-sm-3 col-xs-4">
+		</div>
+		<div class="col-md-10 col-sm-9 col-xs-8">
+			<h3 id="gerwitz">Mike Gerwitz</h3>
+		</div>
+	</div>
+
+	<div class="row speaker-bio">
+		<div class="col-md-2 col-sm-3 col-xs-4">
+			<img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/kurdali.png" alt="[ Bassam Kurdali - Photo ]"/>
+		</div>
+		<div class="col-md-10 col-sm-9 col-xs-8">
+			<h3 id="kurdali">Bassam Kurdali, Urchin</h3>
+			<p>Bassam is a 3D animator/filmmaker whose 2006 short, Elephants Dream, was the first "open movie." It established the viability of libre tools in a production environment and set precedent by offering its source data under a permissive license for learning, remixing and re-use. His character, ManCandy, began as an easily animatable test bed for rigging experiments. Multiple iterations have been released to the public, and Bassam demonstrates him in the animated tutorial video + short, The ManCandy FAQ. Under the sign of the urchin, Bassam is continuing to pursue a model of production that invests in commonwealth. He teaches, writes and lectures around the world on free production and free software technique. Raised in Damascus, Bassam trained in the United States as an electrical and software engineer.</p>
+		</div>
+	</div>
+
+	<div class="row speaker-bio">
+		<div class="col-md-2 col-sm-3 col-xs-4">
+			<img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/lelous.jpg" alt="[ Jonathan Le Lous - Photo ]"/>
+		</div>
+		<div class="col-md-10 col-sm-9 col-xs-8">
+			<h3 id="lelous">Jonathan Le Lous, April
+			</h3>
+			<p>Jonathan has been involved with the Free Software Movement for ten years, in France and now in Canada.</p>
+		</div>
+	</div>
+
+	<div class="row speaker-bio">
+		<div class="col-md-2 col-sm-3 col-xs-4">
+		</div>
+		<div class="col-md-10 col-sm-9 col-xs-8">
+			<h3 id="mcgrath">M. C. McGrath</h3>
+			<p>M. C. is the founder of Transparency Toolkit, a free software project that helps people use open data to expose surveillance and human rights abuses. He is also a Thiel Fellow and an Echoing Green Fellow. Previously, M. C. graduated from Boston University with a degree in civic technology and did research at the MIT Media Lab.</p>
+		</div>
+	</div>
+
+	<div class="row speaker-bio">
+		<div class="col-md-2 col-sm-3 col-xs-4">
+			<img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/nicholson.jpg" alt="[ Deb Nicholson - Photo ]"/>
+		</div>
+		<div class="col-md-10 col-sm-9 col-xs-8">
+			<h3 id="nicholson">Deb Nicholson, Open Invention Network</h3>
+			<p>FSF Latin America board member. GNU speaker. Free Software Evangelist. Maintainer of GNU Linux-libre, and co-maintainer of the GNU Compiler Collection, GNU binutils and GNU libc. GNU tools engineer at Red Hat Brasil.</p>
+		</div>
+	</div>
+
+	<div class="row speaker-bio">
+		<div class="col-md-2 col-sm-3 col-xs-4">
+			<img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/oliva.png" alt="[ Alexandre Oliva - Photo ]"/>
+		</div>
+		<div class="col-md-10 col-sm-9 col-xs-8">
+			<h3 id="oliva">Alexandre Oliva, FSF Latin America</h3>
+			<p>FSF Latin America board member. GNU speaker. Free Software Evangelist. Maintainer of GNU Linux-libre, and co-maintainer of the GNU Compiler Collection, GNU binutils and GNU libc. GNU tools engineer at Red Hat Brasil.</p>
+		</div>
+	</div>
+
+	<div class="row speaker-bio">
+		<div class="col-md-2 col-sm-3 col-xs-4">
+			<img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/peterson.jpg" alt="[ Paige Peterson - Photo ]"/>
+		</div>
+		<div class="col-md-10 col-sm-9 col-xs-8">
+			<h3 id="peterson">Paige Peterson, MaidSoft</h3>
+			<p>While working towards a BFA in Interrelated Media from Massachusetts College of Art, Paige developed an interest in programming and a fascination in the complexity of natural systems. After graduation, Paige worked for mesh networking startup, Open Garden which helped to map her interest in natural decentralized systems onto concepts within technology. She previously organized San Francisco's bitcoin meetup and is fascinated by the freeing potential of cryptocurrencies. She currently fills various roles at MaidSafe with a focus on community and communication.</p>
+		</div>
+	</div>
+
+	<div class="row speaker-bio">
+		<div class="col-md-2 col-sm-3 col-xs-4">
+			<img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/seeder.jpg" alt="[ Andrew Seeder - Photo ]"/>
+		</div>
+		<div class="col-md-10 col-sm-9 col-xs-8">
+			<h3 id="seeder">Andrew Seeder, Dudley Street Neighborhood Initiative</h3>
+			<p>Andrew Seeder is the Data Systems Manager at the Dudley Street Neighborhood Initiative in Roxbury, Boston. He is also a consultant for the Smart Chicago Collaborative, sits on the IT Working Group for Boston Ujima, and is a member of the young professionals committee for YMCA's Training, Inc. He helps organize cryptoparties and works with friends on the Boston Meshnet project. Tweet him at @ahseeder.</p>
+		</div>
+	</div>
+
+	<div class="row speaker-bio">
+		<div class="col-md-2 col-sm-3 col-xs-4">
+		</div>
+		<div class="col-md-10 col-sm-9 col-xs-8">
+			<h3 id="name-code">David Thompson, GNU Guix</h3>
+			<p>David Thompson is an FSF alumnus and Guile Scheme hacker. David works on system deployment tools for Guix, develops a functional reactive game engine called Sly (it's cool, you should check it out!), and is frequently found nose-deep in his copy of SICP. He lives in the Boston area.</p>
+		</div>
+	</div>
+
+	<div class="row speaker-bio">
+		<div class="col-md-2 col-sm-3 col-xs-4">
+			<img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/webber.png" alt="[ Christopher Webber - Photo ]"/>
+		</div>
+		<div class="col-md-10 col-sm-9 col-xs-8">
+			<h3 id="webber">Christopher Webber, GNU MediaGoblin</h3>
+			<p>Christopher Allan Webber is co-founder of MediaGoblin, longtime free software and free culture advocate, Creative Commons alumnus, and occasional Guix contributor. You can frequently find him nose-deep in some emacs buffer making ascii art or maybe something more important than that. He lives in Madison, Wisconsin.</p>
+		</div>
+	</div>
+
+	<div class="row speaker-bio">
+		<div class="col-md-2 col-sm-3 col-xs-4">
+			<img class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/zacchiroli.jpg" alt="[ Stefano Zacchiroli - Photo ]"/>
+		</div>
+		<div class="col-md-10 col-sm-9 col-xs-8">
+			<h3 id="zacchiroli">Stefano Zacchiroli, Debian, IRILL</h3>
+			<p>Stefano Zacchiroli is Associate Professor of Computer Science at University Paris Diderot. His research interests span formal methods and their applications to improve software quality and user experience in the context of Free Software distributions. He has been an official member of the Debian Project since 2001, taking care of many tasks from package maintenance to distribution-wide Quality Assurance. He has been elected to serve as Debian Project Leader for 3 terms in a row, over the period 2010-2013. He is a Board Director of the Open Source Initiative (OSI). He is a recipient of the 2015 O'Reilly Open Source Award.</p>
+		</div>
+	</div>
+
+	<!--#include virtual="../includes/footer.html"-->
+	<!--#include virtual="../includes/common_js.html"-->
+	<!--#include virtual="../includes/program_js.html"-->
+	<script type="text/javascript">
+	$("#p-speakers").addClass("active").text("Speakers");
+	</script>
+	<!--#include virtual="../includes/close.html" -->
-- 
2.25.1