From 338e51b9e60fbc0f537802fafac1f86b724cf261 Mon Sep 17 00:00:00 2001
From: Zak Rogoff <zak@fsf.org>
Date: Sat, 10 Oct 2015 10:41:44 -0400
Subject: [PATCH] Working on the index for the homepage.

---
 2016/index.html | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/2016/index.html b/2016/index.html
index 5acc0832..6b9277b7 100755
--- a/2016/index.html
+++ b/2016/index.html
@@ -11,16 +11,21 @@
 	<!-- wrapper for slides -->
 	<ul class="carousel-inner list-unstyled">
 			<li class="item active">
-				<img src="//static.fsf.org/nosvn/libreplanet/2015/site/graphics/carousel/lp2015-open-house-carousel.jpg" alt="[ The Friday open house before the conference ]">
-				<p class="carousel-caption-tl" style="font-size: larger; font-weight: bold;">Thanks for making LibrePlanet 2016 great! <a href="https://www.fsf.org/blogs/community/libreplanet-2016-highlights-and-what-comes-next">Read the wrap-up</a> or use the form above to subscribe for updates on the 2016 conference.</p>
-			</li>
-
+				<img src="//static.fsf.org/nosvn/libreplanet/2015/site/graphics/crockford_and_levy_2014.jpg"
+				alt="[ Two speakers at LibrePlanet 2014]">
+				<p class="carousel-caption-tr">
+					Call for Sessions open until November 16th.<br><a href="https://my.fsf.org/civicrm/profile/create?gid=325&reset=1">Submit a proposal today.</a><br>
+				</li>
 		</ul>
 
 		<!-- CAROUSEL FEATURES THAT HAVE BEEN COMMENTED OUT -->
 
 		<!--
 
+		<li class="item active">
+		<img src="//static.fsf.org/nosvn/libreplanet/2015/site/graphics/carousel/lp2015-open-house-carousel.jpg" alt="[ The Friday open house before the conference ]">
+		<p class="carousel-caption-tl" style="font-size: larger; font-weight: bold;">Thanks for making LibrePlanet 2016 great! <a href="https://www.fsf.org/blogs/community/libreplanet-2016-highlights-and-what-comes-next">Read the wrap-up</a> or use the form above to subscribe for updates on the 2016 conference.</p>
+	</li>
 		<li class="item">
 		<img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/gnu30_hackers.jpg"
 		alt="[ Apply for a scholarship ]">
@@ -76,13 +81,6 @@ alt="[ Apply for a scholarship ]">
 </p>
 </li>
 
-<li class="item active">
-<img src="//static.fsf.org/nosvn/libreplanet/2016/site/graphics/crockford_and_levy_2014.jpg"
-alt="[ Two speakers at LibrePlanet 2014]">
-<p class="carousel-caption-tr">
-Call for Sessions open until November 9th.<br><a href="call_for_sessions">Submit a proposal today.</a><br>
-</li>
-
 <li class="item active">
 <img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/stata_center.jpg"
 alt="[MIT's Stata Center]">
@@ -128,15 +126,16 @@ and be part of LibrePlanet 2014!
 </li> -->
 
 
+<!-- These are the controls fors the carousel. Comment them in if you want the little navigation chevrons and the skrims that appear when you mouse over the edges of the active image.
 
-<!-- controls -->
+<!-- controls
 <a class="left carousel-control" href="#lpc-carousel" data-slide="prev">
 	<span class="glyphicon glyphicon-chevron-left"></span>
 </a>
 <a class="right carousel-control" href="#lpc-carousel" data-slide="next">
 	<span class="glyphicon glyphicon-chevron-right"></span>
 </a>
-</div> <!-- end of carousel -->
+</div>  end of carousel -->
 
 
 <!-- start of notification area -->
@@ -151,9 +150,10 @@ and be part of LibrePlanet 2014!
 				<p>If you attended LibrePlanet 2016, please fill out our <a href="https://libreplanet.org/2016/feedback">feedback survey</a> so we can make the conference even better next year!</p></div>
 			</div>
 		</div>-->
+<!-- This is an SSI include for the media status box we use after the conference. To make it work, remove this comment and comment *in* the #include line.
 <div class="col-md-12">
-			<!--#include virtual="/server/2016/media-status.html"-->
-		</div>
+			#include virtual="/server/2016/media-status.html"
+		</div>-->
 	</div>
 
 	<!-- // next year's site available
@@ -165,9 +165,9 @@ and be part of LibrePlanet 2014!
 
 <p class="lead">LibrePlanet is an annual conference for free software enthusiasts. LibrePlanet brings together software developers, policy experts, activists and computer users to learn skills, share accomplishments and face challenges to software freedom. Newcomers are always welcome, and LibrePlanet 2016 will feature programming for all ages and experience levels.</p>
 
-<p>This year, the theme of LibrePlanet is "Free Software Everywhere." The weekend's sessions touch on the many places and ways that free software is used around the world, as well as strategizing ways to make free software ubiquitous. We'll talk about some contexts where free software is thriving, and some others where it needs a push. We'll hear from people who have worked to gain a foothold for free software in their workplace or community. We'll explore the state of software freedom on all of the myriad pieces of hardware we use, including laptops, phones, tablets, and even coffee makers. At LibrePlanet, we're taking software freedom around the world, to outer space, and through all kinds of industries, governments, organizations, fields of study, and communities.</p>
+<p>This year, the theme of LibrePlanet is "For the System." Instead of focusing on software, we'll look at the role of forks in our lives. Big forks, small forks, forks stuck in pasta and forks in the home and bath section of National Wholesale Liquidators. If you wanted to come to a conference about free software, sorry!</p>
 
-<p>FSF members and students attend LibrePlanet at no cost! <a href="https://my.fsf.org/associate/support_freedom">Become a member now</a>.<!-- Registration opens in October - sign up above to receive updates.--></p>
+<p>FSF members and students attend LibrePlanet at no cost! <a href="https://crm.fsf.org/join">Become a member now</a>.<!-- Registration opens in October - sign up above to receive updates.--></p>
 
 <!--#include virtual="/server/2016/footer.html"-->
 <!--#include virtual="/server/2016/common_js.html"-->
-- 
2.25.1