From: Zak Rogoff <zak@fsf.org>
Date: Wed, 12 Mar 2014 21:00:31 +0000 (-0400)
Subject: Adding SpinachCon.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=57f0bf4ecc194c4ad3b80d8651310a07df60da9a;p=libreplanet-static.git

Adding SpinachCon.
---

diff --git a/2014/index.html b/2014/index.html
index 31013ac7..d96f01d9 100644
--- a/2014/index.html
+++ b/2014/index.html
@@ -208,7 +208,7 @@ Watch and share our volunteer-created LibrePlanet video<br>
 			  </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>. We encourage you to <a href="https://crm.fsf.org/civicrm/event/register?reset=1&amp;id=13">register in advance</a>, but registration will be available at the door on both days of the conference.</p>
 
-<p>On Monday, March 24th (the day after LibrePlanet), the Free Software Foundation will hold a GPL Enforcement and Legal Ethics seminar at Suffolk University. <a href="https://www.fsf.org/events/seminar-on-gpl-enforcement-and-legal-ethics">This is a separate event and requires separate registration</a>.</p>
+<p>There are two other events, with separate registration, taking place before and after the conference. On Friday, community-members will hold the <a href="https://www.fsf.org/blogs/community/the-0th-spinachcon">0th SpinachCon</a>, where users and developers will improve the user experience of free software programs. On Monday, March 24th (the day after LibrePlanet), the Free Software Foundation will hold a GPL Enforcement and Legal Ethics seminar at Suffolk University. <a href="https://www.fsf.org/events/seminar-on-gpl-enforcement-and-legal-ethics">This is a separate event and requires separate registration</a>.</p>
 			</div> <!-- end of LP14 text -->
 
 		  </div> <!-- end of content column -->
diff --git a/2014/program/sessions.html b/2014/program/sessions.html
index c51248a1..6c818448 100644
--- a/2014/program/sessions.html
+++ b/2014/program/sessions.html
@@ -91,7 +91,7 @@
 		  <div id="lp-content" class="col-sm-9"> <!-- start of content column -->
 			<h2>Program</h2>
 <!--MAKE SURE YOU KEEP AN EYE ON THE URLS IN THIS BAR AS YOU CHANGE THINGS-->
-			<p><span style="color:grey;">Sessions</span> | <a href="speakers.html">Speakers</a> | <a href="legal_seminar.html">Legal seminar</a></p>
+			<p><span style="color:grey;">Sessions</span> | <a href="speakers.html">Speakers</a> | Separate events: <a href="https://www.fsf.org/blogs/community/the-0th-spinachcon">SpinachCon</a> and <a href="https://www.fsf.org/events/seminar-on-gpl-enforcement-and-legal-ethics">Legal seminar</a></p>
 <!--Syntax for anchor links on the page: <a name="saturday">-->
 
 <div class="panel panel-default margin-top" style="width:200px; float:right; margin-right: 25px">
diff --git a/2014/program/speakers.html b/2014/program/speakers.html
index c7a897f3..3063fb5c 100644
--- a/2014/program/speakers.html
+++ b/2014/program/speakers.html
@@ -91,7 +91,7 @@
 		  <div id="lp-content" class="col-sm-9"> <!-- start of content column -->
 			<h2>Program</h2>
 <!--MAKE SURE YOU KEEP AN EYE ON THE URLS IN THIS BAR AS YOU CHANGE THINGS-->
-<p><a href="sessions.html">Sessions</a> | <span style="color:grey;">Speakers</span> | <a href="legal_seminar.html">Legal seminar</a></p>
+<p><a href="sessions.html">Sessions</a> | <span style="color:grey;">Speakers</span> | Separate events: <a href="https://www.fsf.org/blogs/community/the-0th-spinachcon">SpinachCon</a> and <a href="https://www.fsf.org/events/seminar-on-gpl-enforcement-and-legal-ethics">Legal seminar</a></p>
 
 <h1>Keynote speakers</h1>
 <table>