From: Zak Rogoff <atticus@Amdijefri.office.fsf.org>
Date: Thu, 12 Mar 2015 15:56:17 +0000 (-0400)
Subject: Adding Mako's session description and reformatting keynotes a little.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ef0d25be025f9ce46ce01c88189bf6fc47d26dd3;p=libreplanet-static.git

Adding Mako's session description and reformatting keynotes a little.
---

diff --git a/2015/program/index.html b/2015/program/index.html
index 38754e76..fda7b38c 100755
--- a/2015/program/index.html
+++ b/2015/program/index.html
@@ -30,10 +30,10 @@
 		<h1 id="saturday">Saturday, March 21</h1>
 		<hr>
 		<h2><small>09:00 - 09:45: Registration and Breakfast</small></h2>
-		<h2>09:45 - 10:45: Opening Keynote: <a href="/2015/program/speakers.html#stallman">Richard Stallman</a></h2>
+		<h2>09:45 - 10:45: Opening Keynote: Richard Stallman</h2>
 		<div class="session">
 			<h3>Free software, free hardware, and other things</h3>
-			<span class="label label-default">Room 32-123</span>
+			<span class="label label-default">Room 32-123</span> <a href="/2015/program/speakers.html#stallman" class="session-speaker">Richard Stallman</a>
 			<p>Preceded by a welcome address from John Sullivan, FSF executive director.</p>
 		</div>
 
@@ -190,8 +190,9 @@
 <hr>
 
 		<h2><small>09:00 - 09:45: Registration and breakfast</small></h2>
-		<h2>09:45 - 10:30: Keynote: <a href="/2015/program/speakers.html#hill">Benjamin Mako Hill</a></h2><div class="session">
-			<span class="label label-default">Room 32-123</span>
+		<h2>09:45 - 10:30: Keynote: Benjamin Mako Hill</h2><div class="session"><h3>Access without empowerment</h3>
+			<span class="label label-default">Room 32-123</span> <span ><a href="/2015/program/speakers.html#hill" class="session-speaker">Benjamin Mako Hill</a></a>
+			<p>The free software movement has twin goals: promoting access to software through users' freedom to share, and empowering users by giving them control over their technology. For all our movement's success, we have been much more successful at the former. I will use data from free software and from several related movements to explain why promoting empowerment is systematically more difficult than promoting access and I will explore how our movement might address the second challenge in the future.</p>
 		</div>
 
 		<h2><small>10:30 - 10:40: Break</small></h2>
@@ -389,10 +390,11 @@
 		</div>
 
 		<h2><small>17:40 - 17:50: Break</small></h2>
-		<h2>17:50 - 18:35: Closing Keynote: <a href="/2015/program/speakers.html#sandler">Karen Sandler</a></h2>
+		<h2>17:50 - 18:35: Closing Keynote:
+			Karen Sandler</h2>
 				<div class="session">
 					<h3>Stand up for the GNU GPL</h3>
-					<span class="label label-default">Room 32-123</span>
+					<span class="label label-default">Room 32-123</span> <a class="session-speaker" href="/2015/program/speakers.html#sandler">Karen Sandler</a>
 					<p>Karen will discuss Conservancy's work with Christoph Hellwig and the suit against VMware to defend the GNU General Public License.</p>
 				</div>
 </div> <!-- session column end -->