From e3bfa5f30022fba1006356f127d91e54c355ba6d Mon Sep 17 00:00:00 2001
From: Zak Rogoff <zak@fsf.org>
Date: Fri, 11 Mar 2016 17:54:32 -0500
Subject: [PATCH] So many things.

---
 2016/index.html                      | 37 ++++++++++----------
 2016/program/generated-bios.html     |  2 +-
 2016/program/generated-sessions.html | 50 ++++++++++++++--------------
 2016/speakers.noids                  |  1 -
 2016/sponsors/index.html             |  2 ++
 5 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/2016/index.html b/2016/index.html
index bf1d29ea..6065134f 100755
--- a/2016/index.html
+++ b/2016/index.html
@@ -10,7 +10,14 @@
 
 	<!-- wrapper for slides -->
 	<ul class="carousel-inner list-unstyled">
+
 		<li class="item active">
+			<a href="https://media.libreplanet.org/u/libreplanet/m/libreplanet-2016-fork-the-system/"><img src="//static.fsf.org/nosvn/libreplanet/feature-images/lp2016-video.png"
+			alt="[ LibrePlanet 2016 promotional video ]"></a>
+			<p class="carousel-caption-bottom"><a href="https://media.libreplanet.org/u/libreplanet/m/libreplanet-2016-fork-the-system/">Watch the video for a taste of what's to come at LibrePlanet</a></p>
+			</li>
+
+		<li class="item">
 			<img src="//static.fsf.org/nosvn/libreplanet/feature-images/snowden-feature.png"
 			alt="[ Snowden Keynote ]">
 			<p class="carousel-caption-bottom">
@@ -24,29 +31,21 @@
 					<a href="https://www.libreplanet.org/conference/libreluna">Register your party</a> with the FSF.</p>
 				</li>
 
-		<li class="item">
-			<img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-printer.jpg"
-			alt="[ Aleph Objects' Lulzbot 3D printer ]">
-			<p class="carousel-caption-bottom">
-				<a href="https://my.fsf.org/civicrm/profile/create?gid=326&reset=1">
-					Apply for an exhibition table</a> for your free software business or project.
-				</p>
-			</li>
-
-		<li class="item">
-		  <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp_2016_video.png"
-		       alt="[ Libre Planet: Fork the System Video ]">
-		  <p class="carousel-caption-bottom">
-		    <a href="http://media.libreplanet.org/u/libreplanet/m/libreplanet-2016-fork-the-system/">
-		      Libre Planet: Fork the system. </a>
-		    
-		  </p>
-		</li>
-		
 				</ul>
 
 				<!-- CAROUSEL FEATURES THAT HAVE BEEN COMMENTED OUT
 
+
+						<li class="item">
+							<img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp13-printer.jpg"
+							alt="[ Aleph Objects' Lulzbot 3D printer ]">
+							<p class="carousel-caption-bottom">
+								<a href="https://my.fsf.org/civicrm/profile/create?gid=326&reset=1">
+									Apply for an exhibition table</a> for your free software business or project.
+								</p>
+							</li>
+
+
 				<li class="item ">
 					<img src="//static.fsf.org/nosvn/images/best-event-photos/fsf30-crypto-session-848x477.jpg"
 					alt="[ Crypto panel at the FSF 30th Anniversary User Freedom Summit ]">
diff --git a/2016/program/generated-bios.html b/2016/program/generated-bios.html
index 22ac5bbc..a80c09f6 100755
--- a/2016/program/generated-bios.html
+++ b/2016/program/generated-bios.html
@@ -504,7 +504,7 @@ Source Citizen Award</a> in 2011. She lives in New York City.</p>
 <div class="row"> <!-- speaker-21 row start -->
 <!-- speaker-21 img column start -->
 <div class="col-md-2 col-sm-3 col-xs-4">
-<img alt="[ Placeholder - Photo ]" class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/placeholder.png"/>
+<img alt="[ Parker Higgins - Photo ]" class="img-responsive" src="//static.fsf.org/nosvn/libreplanet/speaker-pics/higgins.jpg"/>
 </div> <!-- speaker-21 img column end -->
 <!-- speaker-21 content column start -->
 <div class="col-md-10 col-sm-9 col-xs-8">
diff --git a/2016/program/generated-sessions.html b/2016/program/generated-sessions.html
index dd7ed701..c5137ae4 100755
--- a/2016/program/generated-sessions.html
+++ b/2016/program/generated-sessions.html
@@ -20,7 +20,7 @@
 <section class="program-session" id="day-1-timeslot-2-session-1">
 <header class="program-session-header">
 <hgroup>
-<h2>The last lighthouse: Free software in dark times</h2>
+<h2>The last lighthouse: free software in dark times</h2>
 </hgroup>
 </header>
 <span class="program-session-speaker">
@@ -107,7 +107,7 @@ corporations to do their computing for them. What can GNU do to turn
 the tide here? Enter GNU Guix and GuixSD! This talk will walk
 through Guix's unique positioning to provide totally free and
 reproducible systems. A path will be laid out on how Guix could be
-used as a foundation for easy to run and maintain computing for
+used as a foundation to run and maintain computing for
 everyone, how you can get Guix and GuixSD running, and how to get
 involved in the most hacking-friendly package manager/distro duo ever!</p>
 </div> <!-- day-1-timeslot-4-session-2-collapse end -->
@@ -115,7 +115,7 @@ involved in the most hacking-friendly package manager/distro duo ever!</p>
 <section class="program-session" id="day-1-timeslot-4-session-3">
 <header class="program-session-header">
 <hgroup>
-<h2>GNU/Linux and chill: Free software on a college campus</h2>
+<h2>GNU/Linux and chill: free software on a college campus</h2>
 </hgroup>
 </header>
 <span class="program-session-speaker">
@@ -257,7 +257,7 @@ their coding energy to best increase human freedom.</p>
 <div class="collapse in" id="day-1-timeslot-6-session-3-collapse">
 <p>The MAME Project's main stated goal is to preserve historical computer
 hardware. The strategy for achieving that objective is to inspect the
-devices and then to develop emulators for them. While most hardware is
+devices and then develop emulators for them. While most hardware is
 undocumented and relies on proprietary firmware, the MAME development
 community has nurtured strong reverse engineering practices since its
 origins back in 1997.</p>
@@ -383,7 +383,7 @@ grassroots movements using free/libre tools.</p>
 <section class="program-session" id="day-1-timeslot-8-session-3">
 <header class="program-session-header">
 <hgroup>
-<h2>Loomio: Creating a world where anyone, anywhere can participate in decisions that affect them</h2>
+<h2>Loomio: creating a world where anyone, anywhere can participate in decisions that affect them</h2>
 </hgroup>
 </header>
 <span class="program-session-speaker">
@@ -454,11 +454,11 @@ knowledgeable people. Make sure everything is backed up first!</p>
 <section class="program-session" id="day-1-timeslot-10-session-1">
 <header class="program-session-header">
 <hgroup>
-<h2>The state of free: Revising the High Priority Projects list</h2>
+<h2>The state of free: revising the High Priority Projects list</h2>
 </hgroup>
 </header>
 <span class="program-session-speaker">
-        Benjamin Mako Hill,
+<a href="speakers.html#hill">Benjamin Mako Hill</a>,
         <a href="speakers.html#sandler">Karen Sandler</a>,
         <a href="speakers.html#zacchiroli">Stefano Zacchiroli</a>
 </span>
@@ -469,7 +469,7 @@ knowledgeable people. Make sure everything is backed up first!</p>
         </button>
 </p>
 <div class="collapse in" id="day-1-timeslot-10-session-1-collapse">
-<p>The FSF High-Priority Projects List guides volunteers and supporters
+<p>The FSF High Priority Projects List guides volunteers and supporters
 to projects where their skills can be utilized, whether they be in
 coding, graphic design, writing, or activism.</p>
 <p>Members of the committee convened to revise the list will give an
@@ -514,7 +514,7 @@ concepts.</p>
 <section class="program-session" id="day-1-timeslot-10-session-3">
 <header class="program-session-header">
 <hgroup>
-<h2>LittleSis: Mapping the powers that be</h2>
+<h2>LittleSis: mapping the powers that be</h2>
 </hgroup>
 </header>
 <span class="program-session-speaker">
@@ -586,7 +586,7 @@ knowledgeable people. Make sure everything is backed up first!</p>
 <section class="program-session" id="day-1-timeslot-12-session-1">
 <header class="program-session-header">
 <hgroup>
-<h2>Free/Libre alternatives to GAFAM's Internet: A review of French initiatives</h2>
+<h2>Free/Libre alternatives to GAFAM's Internet: a review of French initiatives</h2>
 </hgroup>
 </header>
 <span class="program-session-speaker">
@@ -790,10 +790,10 @@ speech and privacy, not only providing access to information and
 technology freely, but also by fighting back against threats to civil
 liberties like the USA PATRIOT Act and National Security Letters. In
 the post-Snowden era, libraries have taken this activism further and are
-teaching FOSS privacy-enhancing technologies to their patrons in free
+teaching FLOSS privacy-enhancing technologies to their patrons in free
 computer classes, and installing these tools on library PCs. Nima Fatemi
 and Alison Macrina of Library Freedom Project will talk about how LFP
-kickstarted this movement of radical crypto-librarians, and how FOSS
+kickstarted this movement of radical crypto-librarians, and how FLOSS
 tools like Tor Browser, Signal, OTR, GPG, and Tails are being deployed
 and taught in libraries to an overwhelmingly positive reception. Nima
 and Alison will also discuss LFP's newest project, bringing Tor exit
@@ -857,10 +857,10 @@ sustainability.</p>
 made 85% of the Debian archive reproducible, what steps are left to
 reach 100% and what steps are needed beyond reproducible builds, so
 that every user can easily and meaningful benefit from them.</p>
-<p>The presentation will be largely about the the Debian work on the
-area, but it will also portrait other projects work on reproducible
-builds, as our goal is to make reproducible builds the norm for Free
-Software. ""It's not free software if it's not reproducible."</p>
+<p>The presentation will be largely about the Debian work on the
+area, but it will also portray other projects work on reproducible
+builds, as our goal is to make reproducible builds the norm for free
+software: "It's not free software if it's not reproducible."</p>
 </div> <!-- day-2-timeslot-4-session-3-collapse end -->
 </section> <!-- day-2-timeslot-4-session-3 end -->
 <section class="program-session" id="day-2-timeslot-4-session-4">
@@ -1019,7 +1019,7 @@ is an essential tool for the future and how Ring defends freedom.</p>
 <section class="program-session" id="day-2-timeslot-6-session-4">
 <header class="program-session-header">
 <hgroup>
-<h2>LibreBoot: Free your BIOS today!</h2>
+<h2>Libreboot: free your BIOS today!</h2>
 </hgroup>
 </header>
 <span class="program-session-speaker">
@@ -1071,7 +1071,7 @@ and Trisquel GNU/Linux pre-installed.</p>
 <section class="program-session" id="day-2-timeslot-8-session-1">
 <header class="program-session-header">
 <hgroup>
-<h2>Advocate for yourself at work: Use more free software and keep contributing to the community</h2>
+<h2>Advocate for yourself at work: use more free software and keep contributing to the community</h2>
 </hgroup>
 </header>
 <span class="program-session-speaker">
@@ -1096,7 +1096,7 @@ technologies or contributing changes back upstream when they do rely
 on free software. We'll address what's possible, what your legal
 department is likely to be concerned about and how to be a smooth
 negotiator at work. Many companies could benefit tremendously from
-using FOSS, but free software enthusiasts and institutional
+using FLOSS, but free software enthusiasts and institutional
 gatekeepers are coming from very different perspectives. Free software
 developers and users tend to be most familiar with free software's
 benefits when compared to proprietary solutions; user freedom, reusing
@@ -1266,7 +1266,7 @@ software and creative commons content.</p>
 <section class="program-session" id="day-2-timeslot-10-session-3">
 <header class="program-session-header">
 <hgroup>
-<h2>Artificial scarcity: Beyond the digital</h2>
+<h2>Artificial scarcity: beyond the digital</h2>
 </hgroup>
 </header>
 <span class="program-session-speaker">
@@ -1354,14 +1354,14 @@ researchers have contributed greatly to free software, they usually do
 so outside of the scope of their regular jobs and to the detriment of
 their academic careers. At CUNY, we have taken steps to change this
 unacceptable situation. Please come to this session and exchange ideas
-and strategies for having contribtions to free software valued by the
+and strategies for having contributions to free software valued by the
 University.</p>
 </div> <!-- day-2-timeslot-12-session-1-collapse end -->
 </section> <!-- day-2-timeslot-12-session-1 end -->
 <section class="program-session" id="day-2-timeslot-12-session-2">
 <header class="program-session-header">
 <hgroup>
-<h2>Taking back our freedom: Free software for sousveillance</h2>
+<h2>Taking back our freedom: free software for sousveillance</h2>
 </hgroup>
 </header>
 <span class="program-session-speaker">
@@ -1390,7 +1390,7 @@ people can use our tools to investigate issues they care about.</p>
 <section class="program-session" id="day-2-timeslot-12-session-3">
 <header class="program-session-header">
 <hgroup>
-<h2>Trans Code: Free software as model &amp; critique of diversity by transgender hackers</h2>
+<h2>Trans Code: free software as model &amp; critique of diversity by transgender hackers</h2>
 </hgroup>
 </header>
 <span class="program-session-speaker">
@@ -1513,7 +1513,7 @@ of publicly available free software.</p>
 </p>
 <div class="collapse in" id="day-2-timeslot-14-session-2-collapse">
 <p>A look back at free software history, with a live demonstration of
-software from the past being used to deliver a presentation in 2016.</p>
+software from the past being used to deliver a presentation in 2016</p>
 </div> <!-- day-2-timeslot-14-session-2-collapse end -->
 </section> <!-- day-2-timeslot-14-session-2 end -->
 <section class="program-session" id="day-2-timeslot-14-session-3">
@@ -1564,7 +1564,7 @@ live-streaming).</p>
 <div class="collapse in" id="day-2-timeslot-14-session-4-collapse">
 <p>We have a unique opportunity to make our voices heard at this LibrePlanet. At 18:45 (immediately after the day's closing keynote), we'll be publicly demonstrating against a proposal by Hollywood and major software companies to weave DRM (Digital Restrictions Management) into Web standards.</p>
 <p><strong>Read more about the demonstration in the <a href="https://libreplanet.org/2016/program/social.html#demonstration">Social &amp; Community Events section</a>.</strong> You do not need to attend this session to attend the demonstration.</p>
-<p>The session will start with an overview of the campaign's history, by organizers centrally involved in the effort to stop the proposal. There will be materials on hand to make signs for the demonstration, and volunteer signup and training for two roles: marshaling the demonstration and flyering the W3C meeting in shifts leading up to the demonstration. <strong>Please attend this session if you'd like to volunteer.</strong></p>
+<p>The session will start with an overview of the campaign's history, by organizers centrally involved in the effort to stop the proposal. There will be materials on hand to make signs for the demonstration, and volunteer signup and training for two roles: marshaling the demonstration and flyering a meeting of the W3C standards body in shifts leading up to the demonstration. <strong>Please attend this session if you'd like to volunteer.</strong></p>
 </div> <!-- day-2-timeslot-14-session-4-collapse end -->
 </section> <!-- day-2-timeslot-14-session-4 end -->
 </article> <!-- day-2-timeslot-14 end -->
diff --git a/2016/speakers.noids b/2016/speakers.noids
index 03736317..7f5e0004 100644
--- a/2016/speakers.noids
+++ b/2016/speakers.noids
@@ -1,5 +1,4 @@
 [
-    "Benjamin Mako Hill", 
     "Donald Robertson", 
     "Donald Robertson", 
     "Kat Walsh"
diff --git a/2016/sponsors/index.html b/2016/sponsors/index.html
index 4f91acd0..a099d2fc 100755
--- a/2016/sponsors/index.html
+++ b/2016/sponsors/index.html
@@ -13,6 +13,8 @@
 
 <img class="spnsr-logo" alt="[ Sponsor - Whole Foods Market ]" src="//static.fsf.org/nosvn/libreplanet/2015/site/graphics/sponsors/whole-foods.jpg">
 
+<img class="spnsr-logo" alt="[ Sponsor - Google ]" src="//static.fsf.org/nosvn/libreplanet/sponsor-logos/google.png">
+
       <!--#include virtual="/2016/includes/footer.html"-->
       <!--#include virtual="/2016/includes/common_js.html"-->
       <!--#include virtual="/2016/includes/sponsors_js.html"-->
-- 
2.25.1