updated web site to include mako

diff --git a/2018/includes/generated-bios.html b/2018/includes/generated-bios.html
index 7cb26bfd67f6df6c522e196f40f77769bb233e46..f455ccec0aa193b896fa55d4eabb0f35886fde6f 100644 (file)
--- a/2018/includes/generated-bios.html
+++ b/2018/includes/generated-bios.html
@@ -2,15 +2,37 @@
 <header class="keynote-speakers-header">
 <hgroup>
 <h2>Keynote speakers</h2>
+
 <section class="speaker-block" id="lp-keynote-speaker-1">
 <!-- keynote-speaker-1 row start -->
 <div class="row">
 <!-- keynote-speaker-1 img column start -->
 <div class="col-md-3 col-sm-4 col-xs-5">
-<img alt="[  Deb Nicholson - Photo  ]" class="img-responsive" src="https://web.archive.org/web/20180310155825im_/https://static.fsf.org/nosvn/libreplanet/2018/assets/nicholson_photo.png">
+<img alt="[  Benj. Mako Hill - Photo  ]" class="img-responsive" src="https://static.fsf.org/nosvn/libreplanet/2018/assets/hill.jpg">
 </div> <!-- keynote-speaker-1 img column end -->
 <!-- keynote-speaker-1 content column start -->
 <div class="col-md-9 col-sm-8 col-xs-7">
+<header class="keynote-speaker-header" id="mako">
+<hgroup>
+<h2>Benjamin Mako Hill</h2>
+</hgroup>
+</header>
+<p>Benjamin Mako Hill is a social scientist, technologist, and activist. In all three roles, he works to understand why some attempts at peer production — like Wikipedia and GNU/Linux — build large volunteer communities while the vast majority never attract even a second contributor. He is an Assistant Professor in the Department of Communication at the University of Washington. He is also a faculty affiliate at the Berkman Center for Internet and Society and an affiliate at the Institute for Quantitative Social Science — both at Harvard University. He has also been a leader, developer, and contributor to the free software community for more than a decade as part of the Debian and Ubuntu projects. He is the author of several best-selling technical books, a member of the Free Software Foundation board of directors and an advisor to the Wikimedia Foundation. Hill has a Masters degree from the MIT Media Lab and a PhD from MIT in an interdepartmental program between the Sloan School of Management and the Media Lab.</p>
+<p><i>Photo of Benjamin Mako Hill by Mika Matsuzaki CC-BY 4.0 US</i></p>
+</div> <!-- keynote-speaker-1 content column end -->
+</div> <!-- keynote-speaker-1 row end -->
+</section>
+</article>
+
+<section class="speaker-block" id="lp-keynote-speaker-2">
+<!-- keynote-speaker-2 row start -->
+<div class="row">
+<!-- keynote-speaker-2 img column start -->
+<div class="col-md-3 col-sm-4 col-xs-5">
+<img alt="[  Deb Nicholson - Photo  ]" class="img-responsive" src="https://web.archive.org/web/20180310155825im_/https://static.fsf.org/nosvn/libreplanet/2018/assets/nicholson_photo.png">
+</div> <!-- keynote-speaker-2 img column end -->
+<!-- keynote-speaker-2 content column start -->
+<div class="col-md-9 col-sm-8 col-xs-7">
 <header class="keynote-speaker-header" id="nicholson">
 <hgroup>
 <h2>Deb Nicholson</h2>
@@ -19,8 +41,8 @@
 <p>Deb Nicholson is a free software policy expert and a passionate community advocate. She is the Community Outreach Director for the <a href="https://web.archive.org/web/20180310155825/http://www.openinventionnetwork.com/">Open Invention Network</a>, the world's largest patent non-aggression community, which serves GNU, the kernel Linux, Android, and other key free software projects.</p>
 <p>She won the O’Reilly Open Source Award for her work with <a href="https://web.archive.org/web/20180310155825/https://mediagoblin.org/">GNU MediaGoblin</a> and <a href="https://web.archive.org/web/20180310155825/http://openhatch.org/">OpenHatch</a>. She is a founding organizer of the <a href="https://web.archive.org/web/20180310155825/http://seagl.org/">Seattle GNU/Linux Conference</a>, an annual event dedicated to surfacing new voices and welcoming new people to the free software community. She also serves on the <a href="https://web.archive.org/web/20180310155825/https://sfconservancy.org/">Software Freedom Conservancy</a>'s Evaluation Committee, which acts as a curator for new member projects. She lives with her husband and her lucky black cat in Cambridge, Massachusetts.</p>
 <p><i>Photo of Deb Nicholson by <a href="https://web.archive.org/web/20180310155825/https://www.flickr.com/photos/rhiannonstone/2744017707/">Misty Smith</a> CC-BY-NC-SA 2.0</i></p>
-</div> <!-- keynote-speaker-1 content column end -->
-</div> <!-- keynote-speaker-1 row end -->
+</div> <!-- keynote-speaker-2 content column end -->
+</div> <!-- keynote-speaker-2 row end -->
 </section>
 
 <section class="speaker-block" id="lp-keynote-speaker-3">

diff --git a/2018/includes/generated-sessions.html b/2018/includes/generated-sessions.html
index 6aaca12721d62a61cab0f88ee2fc25edae5c32b1..6b4b5ae4fe0fa59c2989e1b4ba0e48bf283616ab 100644 (file)
--- a/2018/includes/generated-sessions.html
+++ b/2018/includes/generated-sessions.html
@@ -14,7 +14,7 @@
 <article class="program-timeslot" id="day-1-timeslot-2">
 <header class="program-timeslot-header">
 <hgroup>
-<h2>10:00 - 10:45</h2>
+<h2>10:00 - 10:45 - Keynote</h2>
 </hgroup>
 </header>
 <section class="program-session" id="day-1-timeslot-2-session-1">
@@ -28,7 +28,7 @@
 </div>
 <div class="program-session-shelf">
 <div class="program-session-room-details">
-<span class="room label label-default">34-101</span>
+<span class="room label label-default">32-123</span>
 </div>
 <button aria-controls="day-1-timeslot-2-session-1-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-1-timeslot-2-session-1-collapse" data-toggle="collapse">
             Show details
@@ -66,7 +66,7 @@
 </div>
 <div class="program-session-shelf">
 <div class="program-session-room-details">
-<span class="room label label-default">34-101</span>
+<span class="room label label-default">32-123</span>
 </div>
 <button aria-controls="day-1-timeslot-4-session-1-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-1-timeslot-4-session-1-collapse" data-toggle="collapse">
             Show details
@@ -180,7 +180,7 @@
 </div>
 <div class="program-session-shelf">
 <div class="program-session-room-details">
-<span class="room label label-default">34-101</span>
+<span class="room label label-default">32-123</span>
 </div>
 <button aria-controls="day-1-timeslot-6-session-1-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-1-timeslot-6-session-1-collapse" data-toggle="collapse">
             Show details
@@ -295,7 +295,7 @@
 </div>
 <div class="program-session-shelf">
 <div class="program-session-room-details">
-<span class="room label label-default">34-101</span>
+<span class="room label label-default">32-123</span>
 </div>
 <button aria-controls="day-1-timeslot-8-session-1-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-1-timeslot-8-session-1-collapse" data-toggle="collapse">
             Show details
@@ -405,7 +405,7 @@
 </div>
 <div class="program-session-shelf">
 <div class="program-session-room-details">
-<span class="room label label-default">34-101</span>
+<span class="room label label-default">32-123</span>
 </div>
 <button aria-controls="day-1-timeslot-10-session-1-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-1-timeslot-10-session-1-collapse" data-toggle="collapse">
             Show details
@@ -522,7 +522,7 @@
 </div>
 <div class="program-session-shelf">
 <div class="program-session-room-details">
-<span class="room label label-default">34-101</span>
+<span class="room label label-default">32-123</span>
 </div>
 <button aria-controls="day-1-timeslot-12-session-1-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-1-timeslot-12-session-1-collapse" data-toggle="collapse">
             Show details
@@ -637,7 +637,7 @@
 </div>
 <div class="program-session-shelf">
 <div class="program-session-room-details">
-<span class="room label label-default">34-101</span>
+<span class="room label label-default">32-123</span>
 </div>
 <button aria-controls="day-1-timeslot-14-session-1-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-1-timeslot-14-session-1-collapse" data-toggle="collapse">
             Show details
@@ -751,7 +751,7 @@
 </div>
 <div class="program-session-shelf">
 <div class="program-session-room-details">
-<span class="room label label-default">34-101</span>
+<span class="room label label-default">32-123</span>
 </div>
 <button aria-controls="day-1-timeslot-16-session-1-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-1-timeslot-16-session-1-collapse" data-toggle="collapse">
             Show details
@@ -790,7 +790,7 @@
 <article class="program-timeslot" id="day-2-timeslot-2">
 <header class="program-timeslot-header">
 <hgroup>
-<h2>10:00 - 10:45</h2>
+<h2>10:00 - 10:45 - Keynote</h2>
 </hgroup>
 </header>
 <section class="program-session" id="day-2-timeslot-2-session-1">
@@ -1602,11 +1602,11 @@
 <section class="program-session" id="day-2-timeslot-16-session-1">
 <header class="program-session-header">
 <hgroup>
-<h2>TBA</h2>
+<h2>Free software and the shifting landscape of online cooperation</h2>
 </hgroup>
 </header>
 <div class="program-session-speaker">
-<a href="https://libreplanet.org/2018/speakers/#">TBA</a>
+<a href="https://libreplanet.org/2018/speakers/#hill">Benjamin Mako Hill</a>
 </div>
 <div class="program-session-shelf">
 <div class="program-session-room-details">