X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=2016%2Fprogram%2Findex.html;h=21ce802bd7dfe01d313111e5ecf8fc257ce3727d;hb=ff07d169fc3b01a5f7bb13f19441682a3ab54b51;hp=63d97059549d66abb62d666fc05e0563e701727c;hpb=0ddb3901918f0282c6f7982f31a7dbdeac761731;p=libreplanet-static.git

diff --git a/2016/program/index.html b/2016/program/index.html
index 63d97059..21ce802b 100755
--- a/2016/program/index.html
+++ b/2016/program/index.html
@@ -8,47 +8,35 @@
 
 <h1>Program <small>Sessions</small></h1>
 
-<!--#include virtual="../includes/program-menu.html"-->
-
-<!--<div id="lp-panel-fixed" class="panel panel-default hidden-xs">
-	<div class="panel-heading">
-		<h2 class="panel-title">
-			<span class="glyphicon glyphicon-list"></span>
-			Contents
-		</h2>
-	</div>
-	<div class="panel-body">
-		<p><a href="#saturday">Saturday sessions</a></p>
-		<p><a href="#sunday">Sunday sessions</a></p>
-	</div>
+<!--#include virtual="/2016/includes/program-menu.html"-->
+
+<!--NOTE: when you comment this in, also comment in the mini-nav at the bottom of the file. <div id="lp-panel-fixed" class="panel panel-default hidden-xs">
+<div class="panel-heading">
+<h2 class="panel-title">
+<span class="glyphicon glyphicon-list"></span>
+Contents
+</h2>
+</div>
+<div class="panel-body">
+<p><a href="#saturday">Saturday sessions</a></p>
+<p><a href="#sunday">Sunday sessions</a></p>
+</div>
 </div>-->
 
 <div class="row"> <!-- session row start -->
 	<div class="col-sm-9"> <!-- session column start -->
 
-<p>The program is still being filled in, so check back for updates. <a href="https://libreplanet.org/2015/program/index.html">See last year's full program</a>.</p>
-
-		<div class="session">
-			<h3>The last lighthouse: Free software in dark times
-</h3>
-			 <span class="program-session-speaker"><a href="speakers.html#snowden">Edward Snowden</a>, <a href="speakers.html#dkg">Daniel Kahn Gillmor</a></span>
-			<p>Join NSA Whistleblower Edward Snowden and ACLU Technologist Daniel Kahn Gillmor for a discussion about free software, surveillance, power, and control of the future.</p>
-		</div>
+<!--#include virtual="generated-sessions.html"-->
 
-		<div class="session">
-			<h3>Challenges and future growth in libre media and conference video production</h3>
-			 <span class="program-session-speaker">George Chriss and others TBA, Kat Walsh (moderator)</span>
-			<p>An "intermediate" panel designed to provide a working overview of diversified libre media communities blended with per-project technical development updates, organizational adoption challenges, community-centric user-experience goals and other novel discussions regarding video production both generally and as it relates to conference video production (e.g., session recording and live-streaming).</p>
-		</div>
 </div> <!-- session column end -->
 </div> <!-- session row end -->
 
-<div id="lp-mini-nav" class="visible-xs">
-  <ul class="list-inline">
-	<li><a class="btn btn-default btn-xs" href="#saturday">Saturday sessions</a></li>
-	<li><a class="btn btn-default btn-xs" href="#sunday">Sunday sessions</a></li>
-  </ul>
-</div>
+<!--<div id="lp-mini-nav" class="visible-xs">
+<ul class="list-inline">
+<li><a class="btn btn-default btn-xs" href="#saturday">Saturday sessions</a></li>
+<li><a class="btn btn-default btn-xs" href="#sunday">Sunday sessions</a></li>
+</ul>
+</div>-->
 
 
 <!--#include virtual="/2016/includes/footer.html"-->