Many updates. I forgot to keep doing one commit for each change :(.

diff --git a/2017/getting-around/index.html b/2017/getting-around/index.html
index 1defe4674a0700c7ae559c47ce37ff1b703cdac1..9df0dfb016d332121e0fbed8ea0cf6d8700a853b 100755 (executable)
--- a/2017/getting-around/index.html
+++ b/2017/getting-around/index.html
@@ -110,7 +110,7 @@
       <ul>
         <li>Address: 51 Franklin Street, 5th Floor, Boston, MA 02110</li>
         <li>Closest subway stops: <ul><li>Green/Red lines: <a href="http://www.mbta.com/schedules_and_maps/subway/lines/stations/?stopId=13771">Park Street Station</a></li> <li>Green/Orange lines: <a href="http://mbta.com/schedules_and_maps/subway/lines/stations/?stopId=11473">Downtown Crossing Station</a></li></ul></li>
-        <li>Directions: Each of these subway stations is only a blocks away from the FSF. State Street and Government Center are also in easy walking distance. Our office is in a non-descript office building at the foot of a collossal glass condominium, just a block away from the hub of Downtown Crossing, Washington Street.</li>
+        <li>Directions: Each of these subway stations is only a blocks away from the FSF. State Street and Government Center are also in easy walking distance. Our office is in a nondescript office building at the foot of a collossal glass condominium, just a block away from the hub of Downtown Crossing, Washington Street.</li>
       </ul>
 
       <p>The door is unlocked during the day, so you can just come right on inside to the 5th floor. If the door happens to be locked, the intercom outside will connect you to a phone in the office to be let up - or call us: +1 617 542 5942.</p>
@@ -125,7 +125,7 @@
         <li>Massachusetts Avenue and side streets around MIT have metered street parking. These meters have limits of 30, 60, or 120 minutes, so they are not good for parking to attend an all-day conference.</li>
         <li>One Broadway Garage - 1 Broadway - $20 for 4 hours, $30 for 24 hours</li>
         <li>Technology Square Garage - 800 Technology Square - $20 for 3 hours, $30 for 24 hours</li>
-        <li>Kendall Square South Garage - 350 Kendall Street - $25 for 10 hours, $28 for 24 hours</li>
+        <li>Kendall Square South Garage - 350 Kendall Street - $11 per day on weekends</li>
         <li>Kendall Center Yellow Garage - 77 Ames Street - $31 for 3 hours, $42 for 24 hours</li>
         <li>Kendall Center Green Garage - 90 Broadway - $31 for 3 hours, $42 for 24 hours</li>
         <li>Kendall Center Blue Garage - 290 Binney Street - $31 for 3 hours, $42 for 24 hours</li></ul>

diff --git a/2017/includes/program-menu.html b/2017/includes/program-menu.html
index 428d2eb0a70414f2b954a282e86822d4e6b76ed5..b01862d42e48c43c5a3f28b9461507c402b0246f 100644 (file)
--- a/2017/includes/program-menu.html
+++ b/2017/includes/program-menu.html
@@ -6,7 +6,7 @@
       <ol class="breadcrumb text-center">
         <li id="p-sessions"><a href="/2017/program/index.html">Sessions</a></li>
         <li id="p-grid-sch"><a href="/2017/program/grid-schedule.html">Grid Schedule</a></li>
-        <li><a href="import.html">Import Schedule File</a></li>
+        <li><a href="other.html">Other ways to use the schedule</a></li>
         <!--<li id="p-speakers"><a href="/2017/program/speakers.html">Speakers</a></li>-->
         <!--<li id="p-social"><a href="/2017/program/social.html">Social &amp; Community Events</a>-->
       </ol>

diff --git a/2017/program/generated-bios.html b/2017/program/generated-bios.html
index 9e6b6ee32ede15ac23281249cb2669cfbc364214..635de234a834b9d4205bf6eea465e8d5583a9089 100644 (file)
--- a/2017/program/generated-bios.html
+++ b/2017/program/generated-bios.html
@@ -953,8 +953,12 @@ Boston, MA, with long-time partner John M. Crisman.</p>
 </section>
 <section class="speaker-block" id="lp-speaker-35">
 <div class="row"> <!-- speaker-35 row start -->
+<!-- speaker-35 img column start -->
+<div class="col-md-2 col-sm-3 col-xs-4">
+<img alt="[ Photo of Deborah Nicholson ]" class="img-responsive" src="https://my.fsf.org/civicrm/contact/imagefile?photo=ChichenItza_small_2df43158a05e0e193b3c20d2ef13b2b9.png"/>
+</div> <!-- speaker-35 img column end -->
 <!-- speaker-35 content column start -->
-<div class="col-md-offset-2 col-sm-offset-3 col-xs-offset-4 col-md-10 col-sm-9 col-xs-8">
+<div class="col-md-10 col-sm-9 col-xs-8">
 <header class="speaker-header" id="nicholson">
 <hgroup>
 <h2>Deborah Nicholson</h2>
@@ -980,6 +984,7 @@ stopped? It won't be easy, but there are some things you can do.</p>
 sense policies in place. You'll learn about some likely avenues for
 political disruption, aka lobbying, voting and affecting
 policy. Consider attending this talk, for the children.</p>
+<p><em>Photo under <a href="http://creativecommons.org/licenses/by/4.0/">CC-BY 4.0</a> and courtesy of Ernie Kim.</em></p>
 </div> <!-- speaker-35 content column end -->
 </div> <!-- speaker-35 row end -->
 </section>

diff --git a/2017/program/generated-sessions.html b/2017/program/generated-sessions.html
index da6ca56d1abf776bf31d3f694e2ed0fc7ed0152e..045922b08401c430c3c245a7291727ee335caf8e 100644 (file)
--- a/2017/program/generated-sessions.html
+++ b/2017/program/generated-sessions.html
@@ -297,6 +297,7 @@ The ambitious goal of the <a href="https://www.softwareheritage.org/">Software H
 </hgroup>
 </header>
 <p class="program-session-room-details">
+<span class="room label label-default">Room All</span>
 <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
                   <span aria-hidden="true" class="glyphicon glyphicon-menu-down"></span>
@@ -760,7 +761,13 @@ Whether this is your first conference or you've been a part of the FLOSS communi
 </span>
 <p class="program-session-room-details">
 <span class="room label label-default">Room 26-142</span>
+<button aria-controls="day-1-timeslot-15-session-5-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-1-timeslot-15-session-5-collapse" data-toggle="collapse">
+                  Show details
+                  <span aria-hidden="true" class="glyphicon glyphicon-menu-down"></span>
+</button>
 </p>
+<div class="session-desc collapse in" id="day-1-timeslot-15-session-5-collapse">
+</div> <!-- day-1-timeslot-15-session-5-collapse end -->
 </section> <!-- day-1-timeslot-15-session-5 end -->
 </article> <!-- day-1-timeslot-15 end -->
 <article class="program-timeslot" id="day-1-timeslot-16">
@@ -807,40 +814,17 @@ Whether this is your first conference or you've been a part of the FLOSS communi
 <article class="program-timeslot" id="day-2-timeslot-1">
 <header class="program-timeslot-header">
 <hgroup>
-<h2>All day</h2>
-</hgroup>
-</header>
-<section class="program-session" id="day-2-timeslot-1-session-1">
-<header class="program-session-header">
-<hgroup>
-<h2>Free Software Directory sprint</h2>
+<h2>09:00 - 09:45: Registration and Breakfast</h2>
 </hgroup>
 </header>
-<p class="program-session-room-details">
-<button aria-controls="day-2-timeslot-1-session-1-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-1-session-1-collapse" data-toggle="collapse">
-                  Show details
-                  <span aria-hidden="true" class="glyphicon glyphicon-menu-down"></span>
-</button>
-</p>
-<div class="session-desc collapse in" id="day-2-timeslot-1-session-1-collapse">
-<p>Join us to help improve the Free Software Directory. Tens of thousands of people visit <a href="directory.fsf.org">the Free Software Directory</a> each month to discover free software. During this sprint we will train new volunteers on vetting and updating free software entries in the Directory. Bring a laptop!</p>
-</div> <!-- day-2-timeslot-1-session-1-collapse end -->
-</section> <!-- day-2-timeslot-1-session-1 end -->
 </article> <!-- day-2-timeslot-1 end -->
 <article class="program-timeslot" id="day-2-timeslot-2">
 <header class="program-timeslot-header">
 <hgroup>
-<h2>09:00 - 09:45: Registration and Breakfast</h2>
-</hgroup>
-</header>
-</article> <!-- day-2-timeslot-2 end -->
-<article class="program-timeslot" id="day-2-timeslot-3">
-<header class="program-timeslot-header">
-<hgroup>
 <h2>09:45 - 10:00: Morning Announcement</h2>
 </hgroup>
 </header>
-<section class="program-session" id="day-2-timeslot-3-session-1">
+<section class="program-session" id="day-2-timeslot-2-session-1">
 <header class="program-session-header">
 <hgroup>
 <h2>Welcome to LibrePlanet  (Day 2)</h2>
@@ -851,22 +835,22 @@ Whether this is your first conference or you've been a part of the FLOSS communi
 </span>
 <p class="program-session-room-details">
 <span class="room label label-default">Room 32-123</span>
-<button aria-controls="day-2-timeslot-3-session-1-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-3-session-1-collapse" data-toggle="collapse">
+<button aria-controls="day-2-timeslot-2-session-1-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-2-session-1-collapse" data-toggle="collapse">
                   Show details
                   <span aria-hidden="true" class="glyphicon glyphicon-menu-down"></span>
 </button>
 </p>
-<div class="session-desc collapse in" id="day-2-timeslot-3-session-1-collapse">
-</div> <!-- day-2-timeslot-3-session-1-collapse end -->
-</section> <!-- day-2-timeslot-3-session-1 end -->
-</article> <!-- day-2-timeslot-3 end -->
-<article class="program-timeslot" id="day-2-timeslot-4">
+<div class="session-desc collapse in" id="day-2-timeslot-2-session-1-collapse">
+</div> <!-- day-2-timeslot-2-session-1-collapse end -->
+</section> <!-- day-2-timeslot-2-session-1 end -->
+</article> <!-- day-2-timeslot-2 end -->
+<article class="program-timeslot" id="day-2-timeslot-3">
 <header class="program-timeslot-header">
 <hgroup>
 <h2>10:00 - 10:45: Keynote, Cory Doctorow</h2>
 </hgroup>
 </header>
-<section class="program-session" id="day-2-timeslot-4-session-1">
+<section class="program-session" id="day-2-timeslot-3-session-1">
 <header class="program-session-header">
 <hgroup>
 <h2>Beyond unfree: The software you can go to jail for talking about</h2>
@@ -877,30 +861,30 @@ Whether this is your first conference or you've been a part of the FLOSS communi
 </span>
 <p class="program-session-room-details">
 <span class="room label label-default">Room 32-123</span>
-<button aria-controls="day-2-timeslot-4-session-1-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-4-session-1-collapse" data-toggle="collapse">
+<button aria-controls="day-2-timeslot-3-session-1-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-3-session-1-collapse" data-toggle="collapse">
                   Show details
                   <span aria-hidden="true" class="glyphicon glyphicon-menu-down"></span>
 </button>
 </p>
-<div class="session-desc collapse in" id="day-2-timeslot-4-session-1-collapse">
+<div class="session-desc collapse in" id="day-2-timeslot-3-session-1-collapse">
 <p>Software has eaten the world, and all too often, that code is a black box — not just designed to be unauditable, but to be illegal to audit, to improve, to reconfigure. Software freedom is human freedom: not because 'information wants to be free,' but because people can't be free in an information age when their information technology is designed to control them.</p>
-</div> <!-- day-2-timeslot-4-session-1-collapse end -->
-</section> <!-- day-2-timeslot-4-session-1 end -->
-</article> <!-- day-2-timeslot-4 end -->
-<article class="program-timeslot" id="day-2-timeslot-5">
+</div> <!-- day-2-timeslot-3-session-1-collapse end -->
+</section> <!-- day-2-timeslot-3-session-1 end -->
+</article> <!-- day-2-timeslot-3 end -->
+<article class="program-timeslot" id="day-2-timeslot-4">
 <header class="program-timeslot-header">
 <hgroup>
 <h2>10:45 - 10:55: Break</h2>
 </hgroup>
 </header>
-</article> <!-- day-2-timeslot-5 end -->
-<article class="program-timeslot" id="day-2-timeslot-6">
+</article> <!-- day-2-timeslot-4 end -->
+<article class="program-timeslot" id="day-2-timeslot-5">
 <header class="program-timeslot-header">
 <hgroup>
 <h2>10:55 - 11:40: Session block 1B</h2>
 </hgroup>
 </header>
-<section class="program-session" id="day-2-timeslot-6-session-1">
+<section class="program-session" id="day-2-timeslot-5-session-1">
 <header class="program-session-header">
 <hgroup>
 <h2>Contacts to connections: CRM funneling for FLOSS projects</h2>
@@ -911,18 +895,18 @@ Whether this is your first conference or you've been a part of the FLOSS communi
 </span>
 <p class="program-session-room-details">
 <span class="room label label-default">Room 31-123</span>
-<button aria-controls="day-2-timeslot-6-session-1-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-6-session-1-collapse" data-toggle="collapse">
+<button aria-controls="day-2-timeslot-5-session-1-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-5-session-1-collapse" data-toggle="collapse">
                   Show details
                   <span aria-hidden="true" class="glyphicon glyphicon-menu-down"></span>
 </button>
 </p>
-<div class="session-desc collapse in" id="day-2-timeslot-6-session-1-collapse">
+<div class="session-desc collapse in" id="day-2-timeslot-5-session-1-collapse">
 <p>Do you have a pile of sticky notes and a folder full of spreadsheets with contacts? Have you ever had a donor approached by two people trying to gather the same information?
 As an organization or project grows, it often becomes hard to keep track of the various community members, donors, and volunteers who are connected. An answer to this is the often used sales tool, a contact relationship manager (CRM).
 You will learn about a non-sales focused tool, CiviCRM and see how it can be combined with Discourse and various Drupal forms to clean up and funnel your contact data.</p>
-</div> <!-- day-2-timeslot-6-session-1-collapse end -->
-</section> <!-- day-2-timeslot-6-session-1 end -->
-<section class="program-session" id="day-2-timeslot-6-session-2">
+</div> <!-- day-2-timeslot-5-session-1-collapse end -->
+</section> <!-- day-2-timeslot-5-session-1 end -->
+<section class="program-session" id="day-2-timeslot-5-session-2">
 <header class="program-session-header">
 <hgroup>
 <h2>Procedural 3D animation in Blender</h2>
@@ -933,16 +917,16 @@ You will learn about a non-sales focused tool, CiviCRM and see how it can be com
 </span>
 <p class="program-session-room-details">
 <span class="room label label-default">Room 32-141</span>
-<button aria-controls="day-2-timeslot-6-session-2-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-6-session-2-collapse" data-toggle="collapse">
+<button aria-controls="day-2-timeslot-5-session-2-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-5-session-2-collapse" data-toggle="collapse">
                   Show details
                   <span aria-hidden="true" class="glyphicon glyphicon-menu-down"></span>
 </button>
 </p>
-<div class="session-desc collapse in" id="day-2-timeslot-6-session-2-collapse">
+<div class="session-desc collapse in" id="day-2-timeslot-5-session-2-collapse">
 <p>While Blender's typical interface is aimed squarely at 3D artists, and it's Python API provides a powerful way to make great procedural art through coding, there is also a third way in between, via two animation addons, Sverchok and Animation Nodes. This workshop will walk through using Animation Nodes to create procedural animation without writing a line of code - instead we'll do 'visual programming' via node trees, to create procedural art.</p>
-</div> <!-- day-2-timeslot-6-session-2-collapse end -->
-</section> <!-- day-2-timeslot-6-session-2 end -->
-<section class="program-session" id="day-2-timeslot-6-session-3">
+</div> <!-- day-2-timeslot-5-session-2-collapse end -->
+</section> <!-- day-2-timeslot-5-session-2 end -->
+<section class="program-session" id="day-2-timeslot-5-session-3">
 <header class="program-session-header">
 <hgroup>
 <h2>The surreptitious assault on privacy, security, and freedom</h2>
@@ -953,18 +937,18 @@ You will learn about a non-sales focused tool, CiviCRM and see how it can be com
 </span>
 <p class="program-session-room-details">
 <span class="room label label-default">Room 32-144</span>
-<button aria-controls="day-2-timeslot-6-session-3-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-6-session-3-collapse" data-toggle="collapse">
+<button aria-controls="day-2-timeslot-5-session-3-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-5-session-3-collapse" data-toggle="collapse">
                   Show details
                   <span aria-hidden="true" class="glyphicon glyphicon-menu-down"></span>
 </button>
 </p>
-<div class="session-desc collapse in" id="day-2-timeslot-6-session-3-collapse">
+<div class="session-desc collapse in" id="day-2-timeslot-5-session-3-collapse">
 <p>Privacy, security, and personal freedom: each of these essential rights are being surreptitiously assaulted by governments, corporations, and ill-minded individuals that are spying and preying upon us with unprecedented frequency and breadth.
 This talk will survey the most pressing issues of today, including topics of government surveillance and espionage; advertisers and data analytics; IoT; policy and the crypto wars; the Web, "cloud", and centralization; vehicles; societal pressures and complacency; and more.
 Attendees will be presented with an overview of mitigations and dozens of resources.</p>
-</div> <!-- day-2-timeslot-6-session-3-collapse end -->
-</section> <!-- day-2-timeslot-6-session-3 end -->
-<section class="program-session" id="day-2-timeslot-6-session-4">
+</div> <!-- day-2-timeslot-5-session-3-collapse end -->
+</section> <!-- day-2-timeslot-5-session-3 end -->
+<section class="program-session" id="day-2-timeslot-5-session-4">
 <header class="program-session-header">
 <hgroup>
 <h2>Text, layout, and calligraphy on the Arabic Web</h2>
@@ -975,30 +959,30 @@ Attendees will be presented with an overview of mitigations and dozens of resour
 </span>
 <p class="program-session-room-details">
 <span class="room label label-default">Room 32-155</span>
-<button aria-controls="day-2-timeslot-6-session-4-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-6-session-4-collapse" data-toggle="collapse">
+<button aria-controls="day-2-timeslot-5-session-4-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-5-session-4-collapse" data-toggle="collapse">
                   Show details
                   <span aria-hidden="true" class="glyphicon glyphicon-menu-down"></span>
 </button>
 </p>
-<div class="session-desc collapse in" id="day-2-timeslot-6-session-4-collapse">
+<div class="session-desc collapse in" id="day-2-timeslot-5-session-4-collapse">
 <p>In this workshop, you will learn principles of internationalization to support Arabic and other right-to-left languages. The focus will be on practical examples where you can adapt CSS and JavaScript to support both languages. Some of the real examples will include: the OpenStreetMap iD editor, right-to-left text in the HTML5 Canvas, a calligraphy editor, and use of the zero-width-join character to stylize Arabic text.</p>
-</div> <!-- day-2-timeslot-6-session-4-collapse end -->
-</section> <!-- day-2-timeslot-6-session-4 end -->
-</article> <!-- day-2-timeslot-6 end -->
-<article class="program-timeslot" id="day-2-timeslot-7">
+</div> <!-- day-2-timeslot-5-session-4-collapse end -->
+</section> <!-- day-2-timeslot-5-session-4 end -->
+</article> <!-- day-2-timeslot-5 end -->
+<article class="program-timeslot" id="day-2-timeslot-6">
 <header class="program-timeslot-header">
 <hgroup>
 <h2>11:40 - 11:50: Break</h2>
 </hgroup>
 </header>
-</article> <!-- day-2-timeslot-7 end -->
-<article class="program-timeslot" id="day-2-timeslot-8">
+</article> <!-- day-2-timeslot-6 end -->
+<article class="program-timeslot" id="day-2-timeslot-7">
 <header class="program-timeslot-header">
 <hgroup>
 <h2>11:50 - 12:35: Session block 2B</h2>
 </hgroup>
 </header>
-<section class="program-session" id="day-2-timeslot-8-session-1">
+<section class="program-session" id="day-2-timeslot-7-session-1">
 <header class="program-session-header">
 <hgroup>
 <h2>Birds of a feather</h2>
@@ -1009,46 +993,46 @@ Attendees will be presented with an overview of mitigations and dozens of resour
     </span>
 <p class="program-session-room-details">
 <span class="room label label-default">Room 32-123, Room 31-141, Room 32-144, Room 32-155</span>
-<button aria-controls="day-2-timeslot-8-session-1-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-8-session-1-collapse" data-toggle="collapse">
+<button aria-controls="day-2-timeslot-7-session-1-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-7-session-1-collapse" data-toggle="collapse">
                   Show details
                   <span aria-hidden="true" class="glyphicon glyphicon-menu-down"></span>
 </button>
 </p>
-<div class="session-desc collapse in" id="day-2-timeslot-8-session-1-collapse">
+<div class="session-desc collapse in" id="day-2-timeslot-7-session-1-collapse">
 <p>Birds of a feather sessions are a time for conference attendees to put together ad-hoc sessions to discuss shared interests.</p>
-</div> <!-- day-2-timeslot-8-session-1-collapse end -->
-</section> <!-- day-2-timeslot-8-session-1 end -->
-</article> <!-- day-2-timeslot-8 end -->
-<article class="program-timeslot" id="day-2-timeslot-9">
+</div> <!-- day-2-timeslot-7-session-1-collapse end -->
+</section> <!-- day-2-timeslot-7-session-1 end -->
+</article> <!-- day-2-timeslot-7 end -->
+<article class="program-timeslot" id="day-2-timeslot-8">
 <header class="program-timeslot-header">
 <hgroup>
 <h2>12:35 - 13:50: Lunch</h2>
 </hgroup>
 </header>
-<section class="program-session" id="day-2-timeslot-9-session-1">
+<section class="program-session" id="day-2-timeslot-8-session-1">
 <header class="program-session-header">
 <hgroup>
 <h2>Lunchtime BoFs</h2>
 </hgroup>
 </header>
 <p class="program-session-room-details">
-<button aria-controls="day-2-timeslot-9-session-1-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-9-session-1-collapse" data-toggle="collapse">
+<button aria-controls="day-2-timeslot-8-session-1-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-8-session-1-collapse" data-toggle="collapse">
                   Show details
                   <span aria-hidden="true" class="glyphicon glyphicon-menu-down"></span>
 </button>
 </p>
-<div class="session-desc collapse in" id="day-2-timeslot-9-session-1-collapse">
+<div class="session-desc collapse in" id="day-2-timeslot-8-session-1-collapse">
 <p>Want to organize or attend a lunchtime BoF? <a href="https://libreplanet.org/wiki/BoFs">Sign up on the wiki</a>!</p>
-</div> <!-- day-2-timeslot-9-session-1-collapse end -->
-</section> <!-- day-2-timeslot-9-session-1 end -->
-</article> <!-- day-2-timeslot-9 end -->
-<article class="program-timeslot" id="day-2-timeslot-10">
+</div> <!-- day-2-timeslot-8-session-1-collapse end -->
+</section> <!-- day-2-timeslot-8-session-1 end -->
+</article> <!-- day-2-timeslot-8 end -->
+<article class="program-timeslot" id="day-2-timeslot-9">
 <header class="program-timeslot-header">
 <hgroup>
 <h2>13:50 - 14:35: Session block 3B</h2>
 </hgroup>
 </header>
-<section class="program-session" id="day-2-timeslot-10-session-1">
+<section class="program-session" id="day-2-timeslot-9-session-1">
 <header class="program-session-header">
 <hgroup>
 <h2>A free software portfolio: The importance of free software in computer science</h2>
@@ -1059,16 +1043,16 @@ Attendees will be presented with an overview of mitigations and dozens of resour
 </span>
 <p class="program-session-room-details">
 <span class="room label label-default">Room 32-123</span>
-<button aria-controls="day-2-timeslot-10-session-1-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-10-session-1-collapse" data-toggle="collapse">
+<button aria-controls="day-2-timeslot-9-session-1-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-9-session-1-collapse" data-toggle="collapse">
                   Show details
                   <span aria-hidden="true" class="glyphicon glyphicon-menu-down"></span>
 </button>
 </p>
-<div class="session-desc collapse in" id="day-2-timeslot-10-session-1-collapse">
+<div class="session-desc collapse in" id="day-2-timeslot-9-session-1-collapse">
 <p>As Free Software becomes more widespread in technology solutions across all industries, there is demand for workers who not only have experience with Free Software tools, but also for those who can help organizations to become involved in those communities. Companies are increasingly looking to take the leap from consumer to contributor, but they are often unsure how to actually proceed. I will discuss the idea of exposing students to the ideas and tools that Free Software depends on, with the explicit goal of enabling students to build a technology portfolio that helps them to stand out and teaches them how to work collaboratively and transparently. There are some success stories to tell, but I hope that this talk will inspire other educators to incorporate Free Software concepts into their standard curriculum.</p>
-</div> <!-- day-2-timeslot-10-session-1-collapse end -->
-</section> <!-- day-2-timeslot-10-session-1 end -->
-<section class="program-session" id="day-2-timeslot-10-session-2">
+</div> <!-- day-2-timeslot-9-session-1-collapse end -->
+</section> <!-- day-2-timeslot-9-session-1 end -->
+<section class="program-session" id="day-2-timeslot-9-session-2">
 <header class="program-session-header">
 <hgroup>
 <h2>SecureDrop: Leaking safely to modern news organizations</h2>
@@ -1079,16 +1063,16 @@ Attendees will be presented with an overview of mitigations and dozens of resour
 </span>
 <p class="program-session-room-details">
 <span class="room label label-default">Room 32-141</span>
-<button aria-controls="day-2-timeslot-10-session-2-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-10-session-2-collapse" data-toggle="collapse">
+<button aria-controls="day-2-timeslot-9-session-2-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-9-session-2-collapse" data-toggle="collapse">
                   Show details
                   <span aria-hidden="true" class="glyphicon glyphicon-menu-down"></span>
 </button>
 </p>
-<div class="session-desc collapse in" id="day-2-timeslot-10-session-2-collapse">
+<div class="session-desc collapse in" id="day-2-timeslot-9-session-2-collapse">
 <p>Whistleblowing and leaking have dominated news coverage in recent years. Learn how Freedom of the Press Foundation maintains a free software anonymous whistleblowing platform used by major news organizations. Discussion will center on challenges of principled centralization when partnering with media outlets, and managing a largely decentralized platform with high security requirements.</p>
-</div> <!-- day-2-timeslot-10-session-2-collapse end -->
-</section> <!-- day-2-timeslot-10-session-2 end -->
-<section class="program-session" id="day-2-timeslot-10-session-3">
+</div> <!-- day-2-timeslot-9-session-2-collapse end -->
+</section> <!-- day-2-timeslot-9-session-2 end -->
+<section class="program-session" id="day-2-timeslot-9-session-3">
 <header class="program-session-header">
 <hgroup>
 <h2>Machine learning: Key battleground for free technology</h2>
@@ -1099,16 +1083,16 @@ Attendees will be presented with an overview of mitigations and dozens of resour
 </span>
 <p class="program-session-room-details">
 <span class="room label label-default">Room 32-144</span>
-<button aria-controls="day-2-timeslot-10-session-3-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-10-session-3-collapse" data-toggle="collapse">
+<button aria-controls="day-2-timeslot-9-session-3-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-9-session-3-collapse" data-toggle="collapse">
                   Show details
                   <span aria-hidden="true" class="glyphicon glyphicon-menu-down"></span>
 </button>
 </p>
-<div class="session-desc collapse in" id="day-2-timeslot-10-session-3-collapse">
+<div class="session-desc collapse in" id="day-2-timeslot-9-session-3-collapse">
 <p>Machine learning (ML) has a long legacy of proprietary technology. As ML becomes more popular with industry-scale applications, new proprietary pushes have been entering parts of the ML application stack. We need to prepare for the challenges of keeping free technology, which come from the legacy side and the new proprietary push. Although many free software alternatives have made ways into ML research, development, and industry applications, the topic is frequently overlooked. In this session, we will look at the history of ML stack in research and development; explore ML's proprietary legacy and its status quo; look at where the proprietary army is coming (again) while we were not looking; and strategies about what we can do to keep ML research and development free. Your thoughts, questions, and further discussions are also cordially welcome!</p>
-</div> <!-- day-2-timeslot-10-session-3-collapse end -->
-</section> <!-- day-2-timeslot-10-session-3 end -->
-<section class="program-session" id="day-2-timeslot-10-session-4">
+</div> <!-- day-2-timeslot-9-session-3-collapse end -->
+</section> <!-- day-2-timeslot-9-session-3 end -->
+<section class="program-session" id="day-2-timeslot-9-session-4">
 <header class="program-session-header">
 <hgroup>
 <h2>Algorithmic bias: Where it comes from and what to do about it</h2>
@@ -1122,19 +1106,46 @@ Attendees will be presented with an overview of mitigations and dozens of resour
 </span>
 <p class="program-session-room-details">
 <span class="room label label-default">Room 32-155</span>
-<button aria-controls="day-2-timeslot-10-session-4-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-10-session-4-collapse" data-toggle="collapse">
+<button aria-controls="day-2-timeslot-9-session-4-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-9-session-4-collapse" data-toggle="collapse">
                   Show details
                   <span aria-hidden="true" class="glyphicon glyphicon-menu-down"></span>
 </button>
 </p>
-<div class="session-desc collapse in" id="day-2-timeslot-10-session-4-collapse">
+<div class="session-desc collapse in" id="day-2-timeslot-9-session-4-collapse">
 <p>Algorithms are the new boogie men in social control and institutional discrimination. There is bias and lack of accountability in the algorithms that determine who gets hired for a job, who can get a loan, who qualifies for insurance, and even who goes to jail.</p>
 <p>Well-designed algorithms can eliminate natural human bias. But with black-box algorithms, humans seem to be losing control over the machines that control our lives.</p>
 <p>Sharing the source code implementing algorithms isn’t enough. Bias may be built into algorithms: for instance, an algorithm using actual random stops and arrests could recommend harsh treatment for blacks, as they are targeted more frequently by cops.</p>
 <p>Research suggests a counter-intuitive approach to ameliorating bias. One must not be blind to demographic categories who experience discrimination--instead one must actively monitor these factors.</p>
 <p>Panelists will present their views for a few minutes, then taking comments and questions from the audience.</p>
-</div> <!-- day-2-timeslot-10-session-4-collapse end -->
-</section> <!-- day-2-timeslot-10-session-4 end -->
+</div> <!-- day-2-timeslot-9-session-4-collapse end -->
+</section> <!-- day-2-timeslot-9-session-4 end -->
+</article> <!-- day-2-timeslot-9 end -->
+<article class="program-timeslot" id="day-2-timeslot-10">
+<header class="program-timeslot-header">
+<hgroup>
+<h2>14:00 - 17:00 Workshop</h2>
+</hgroup>
+</header>
+<section class="program-session" id="day-2-timeslot-10-session-1">
+<header class="program-session-header">
+<hgroup>
+<h2>Free Software Directory sprint</h2>
+</hgroup>
+</header>
+<span class="program-session-speaker">
+          Donald Robertson and Ted Teah
+    </span>
+<p class="program-session-room-details">
+<span class="room label label-default">Room 26-142</span>
+<button aria-controls="day-2-timeslot-10-session-1-collapse" aria-expanded="false" class="btn btn-default btn-xs" data-target="#day-2-timeslot-10-session-1-collapse" data-toggle="collapse">
+                  Show details
+                  <span aria-hidden="true" class="glyphicon glyphicon-menu-down"></span>
+</button>
+</p>
+<div class="session-desc collapse in" id="day-2-timeslot-10-session-1-collapse">
+<p>Join us to help improve the Free Software Directory. Tens of thousands of people visit <a href="directory.fsf.org">the Free Software Directory</a> each month to discover free software. Feel free to drop in at any time. During this sprint we will train new volunteers on vetting and updating free software entries in the Directory. Bring a laptop!</p>
+</div> <!-- day-2-timeslot-10-session-1-collapse end -->
+</section> <!-- day-2-timeslot-10-session-1 end -->
 </article> <!-- day-2-timeslot-10 end -->
 <article class="program-timeslot" id="day-2-timeslot-11">
 <header class="program-timeslot-header">

diff --git a/2017/program/import.html b/2017/program/import.html
deleted file mode 100755 (executable)
index 7114f13..0000000
--- a/2017/program/import.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--#include virtual="/2017/includes/header.html"-->
-<title>LibrePlanet 2017 &mdash; Schedule File &mdash</title>
-<!--#include virtual="/2017/includes/banner.html"-->
-<!--#include virtual="/2017/includes/sidebar.html"-->
-
-<h1>Program <small>Import Schedule File</small></h1>
-<!--#include virtual="/2017/includes/program-menu.html"-->
-
-<p><strong>Calendar file (free iCal format):</strong> <a href="https://libreplanet.org/2017/lp2017-schedule.ics">https://libreplanet.org/2017/lp2017-schedule.ics</a></p>
-
-<p>On Replicant and Android devices, you can subscribe to the calendar file with either:</p>
-
-<ul>
-  <li>Etar and ICSdroid (the Libreplanet schedule must show up in the &ldquo;Agenda&rdquo; view on Etar.) or;</li>
-    <li>Giggity</li>
-    </ul>
-
-<p>We recommend you install apps from <a href="https://f-droid.org">F-Droid</a> instead of the Google Play store.</p>
-
-
-    <hr/>
-<!--#include virtual="/2017/includes/footer.html"-->
-<!--#include virtual="/2017/includes/close.html"-->

diff --git a/2017/program/other.html b/2017/program/other.html
new file mode 100755 (executable)
index 0000000..007c128
--- /dev/null
+++ b/2017/program/other.html
@@ -0,0 +1,18 @@
+<!--#include virtual="/2017/includes/header.html"-->
+<title>LibrePlanet 2017 &mdash; Schedule</title>
+<!--#include virtual="/2017/includes/banner.html"-->
+<!--#include virtual="/2017/includes/sidebar.html"-->
+
+<h1>Program <small>Other ways to use the schedule</small></h1>
+<!--#include virtual="/2017/includes/program-menu.html"-->
+
+<p><strong>Install the Giggity app</strong> on Replicant or Android. The LibrePlanet 2017 schedule will appear at the top of the app's home screen.</p>
+
+<p><strong>Download the calendar file</strong> (free iCal format) from <a href="https://libreplanet.org/2017/lp2017-schedule.ics">https://libreplanet.org/2017/lp2017-schedule.ics</a> and import it to any calendar program. On Replicant and Android devices, you can subscribe to the calendar file with eEtar and ICSdroid (the Libreplanet schedule must show up in the &ldquo;Agenda&rdquo; view on Etar).</p>
+
+<p>We recommend you install Android/Replicant apps from the <a href="https://f-droid.org">F-Droid</a> free software app repository instead of the Google Play store.</p>
+
+
+    <hr/>
+<!--#include virtual="/2017/includes/footer.html"-->
+<!--#include virtual="/2017/includes/close.html"-->