From 4b7b9b5808e651d41237a9b39067e8e0c1432e72 Mon Sep 17 00:00:00 2001
From: Molly de Blanc <molly@fsf.org>
Date: Mon, 28 Aug 2017 15:43:11 -0400
Subject: [PATCH] updates to main page.

---
 2018/index.html | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/2018/index.html b/2018/index.html
index 33905625..49a2b842 100755
--- a/2018/index.html
+++ b/2018/index.html
@@ -6,18 +6,18 @@
 <!--#include virtual="/2018/includes/sidebar.html"-->
 
 <!-- start of carousel -->
-<div id="lpc-carousel" class="carousel slide">
+<!--<div id="lpc-carousel" class="carousel slide">-->
 
 	<!-- wrapper for slides -->
 	<ul class="carousel-inner list-unstyled">
 
 		<li class="item active">
-			<img src="https://static.fsf.org/nosvn/libreplanet/feature-images/keynotes-2017.png"
-			alt="[ 2018 Keynote Speakers: Cory Doctorow, Kade Crockford, Richard Stallman, Sumana Harihareswara ]">
+			<img src="http://static.fsf.org/nosvn/libreplanet/2018/assets/banner_no_year.svg"
+			alt="[ Libreplanet logo, consisting of several stars and connected green planets and the text "LibrePlanet" ]">
 			<p class="carousel-caption-bottom" style="background-color: white;"><br></p>
 			</li>
 
-			<li class="item">
+	<!--		<li class="item">
 			<img src="//static.fsf.org/nosvn/libreplanet/feature-images/libreluna-feature.png"
 			alt="[ Can't come to the conference? Host a LibreLuna viewing party. ]">
 			<p class="carousel-caption-bottom">
@@ -30,7 +30,7 @@
 			<p class="carousel-caption-bottom" style="background-color: white;"><br></p></a>
 		</li>
 
-				</ul>
+				</ul> -->
 
 				<!-- CAROUSEL FEATURES THAT HAVE BEEN COMMENTED OUT. Their formatting might not be quite right, but reusing them is much faster than making them from scratch.
 				<li class="item">
@@ -199,12 +199,11 @@ Get excited for our keynote speakers!
 
 <!-- end of notification area -->
 
-<p class="lead">LibrePlanet is an annual conference hosted by the <a href="https://www.fsf.org">Free Software Foundation</a> for people who care about their digital freedoms, bringing together software developers, policy experts, activists, and computer users to learn skills, share accomplishments, and address challenges facing the free software movement. LibrePlanet 2018 will feature programming for a wide range of ages and experience levels.</p>
+<p class="lead">LibrePlanet is an annual conference hosted by the <a href="https://www.fsf.org">Free Software Foundation</a> for free software enthusiasts and anyone who cares about the intersection of technology and social justice. For the past ten years, LibrePlanet has brought together software developers, law and policy experts, activists, students and computer users to learn skills, celebrate free software accomplishments, and face challenges to software freedom. Newcomers are always welcome, and LibrePlanet 2018 will feature programming for all ages and experience levels.</p>
 
 <!--Theme paragraph.-->
 
-<p>This year's theme is <em>The Roots of Freedom</em>. Many talks will explore the historical roots of free software, including the Four Freedoms, copyleft through the GNU General Public License, and the rights to security and privacy. Others will focus on the movement that roots free software, and the contributions of its members to activism, the arts, education, entrepreneurship, and innovation.</p>
-
+<!-- <p>This year's theme is <em>The Roots of Freedom</em>. Many talks will explore the historical roots of free software, including the Four Freedoms, copyleft through the GNU General Public License, and the rights to security and privacy. Others will focus on the movement that roots free software, and the contributions of its members to activism, the arts, education, entrepreneurship, and innovation.</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 soon - sign up above to receive updates.</p>-->
 
-- 
2.25.1