Adding Spinachcon to social events page, and changing its name to Social events and...

diff --git a/2016/includes/program-menu.html b/2016/includes/program-menu.html
index 1c0ff9095342a38ef9e3025fa72a2388f450c2ef..9e99de21be25d8edcbfcd25043d529f974331d1a 100644 (file)
--- a/2016/includes/program-menu.html
+++ b/2016/includes/program-menu.html
@@ -2,7 +2,7 @@
 <div class="contain-fluid">
   <div class="row margin-top">
     <div class="col-sm-9">
-      <h3><a href="index.html">SESSIONS</a> <!--/ <a href="grid-schedule.html">Schedule</a> -->/ <a href="speakers.html">SPEAKERS</a> / <a href="social.html">SOCIAL EVENTS</a><!-- / <a href="exhibit-hall.html">Exhibit Hall</a>--></h3>
+      <h3><a href="index.html">SESSIONS</a> <!--/ <a href="grid-schedule.html">Schedule</a> -->/ <a href="speakers.html">SPEAKERS</a> / <a href="social.html">SOCIAL EVENTS & SEPARATE EVENTS</a><!-- / <a href="exhibit-hall.html">Exhibit Hall</a>--></h3>
   </div>
 </div>
 </div>

diff --git a/2016/program/social.html b/2016/program/social.html
index e0a8041bb2645ea458c2b4b062a4efedfec6ecea..cffd5eed132f2806cfb9d712f90ffe790ea7adcd 100755 (executable)
--- a/2016/program/social.html
+++ b/2016/program/social.html
@@ -1,43 +1,53 @@
 <!--#include virtual="/2016/includes/header.html"-->
 
-<title>LibrePlanet &mdash; Social events </title>
+<title>LibrePlanet &mdash; Events </title>
 
 <!--#include virtual="/2016/includes/banner.html"-->
 <!--#include virtual="/2016/includes/sidebar.html"-->
-<h1>Program <small>Social Events</small></h1>
+<h1>Program <small>Events</small></h1>
 <!--#include virtual="../includes/program-menu.html"-->
 <div class="row"> <!-- session row start -->
        <div class="col-sm-9"> <!-- session column start -->
-                       <h1>Friday, March 18</h1>
-
-                       <div class="session">
-                               <h4>Free Software Foundation Open House</h4>
-                               <p>Mingle at the FSF office before the conference with speakers and other attendees. Refreshments will be served.</p>
-                               <p class="session-details">
-                                       <strong>When:</strong> 17:00 - 19:30, Friday 3/18<br>
-                                       <strong>Where:</strong> FSF Office (<a href="../getting_around/index.html#office">transportation tips</a>) at 51 Franklin Street, Fifth Floor, Boston, MA 02110 near Downtown Crossing Station on the Red and Orange Lines
-                               </p>
-                       </div>
-
-                               <h1>Saturday, March 19</h1>
-                               <div class="session">
-                                       <h4>LibrePlanet Party!</h4>
-                                       <p>Spend time with the LibrePlanet community and enjoy appetizers provided by the FSF. The location is TBD, but it will be wheelchair-accessible and open to all ages.</p>
-                                       <p class="session-details">
-                                               <strong>When:</strong> Approximately 19:00 - 21:00<br>
-                                               <strong>Where:</strong> Cambridge, MA, near the conference<br>
-                                       </p>
-
-                               </div>
-
-
-                               </div> <!-- session column end -->
-                       </div> <!-- session row end -->
-
-       <!--#include virtual="/2016/includes/footer.html"-->
-       <!--#include virtual="/2016/includes/common_js.html"-->
-       <!--#include virtual="/2016/includes/program_js.html"-->
-       <script type="text/javascript">
-       $("#p-social").addClass("active").text("Social Events");
-       </script>
-       <!--#include virtual="/2016/includes/close.html" -->
+
+               <h1>Friday, March 18</h1>
+               <div class="session">
+                       <h3>The Return of SpinachCon!</h3>
+                       <a href="https://libreplanet.org/wiki?title=Event:LibrePlanet/LibrePlanet/3-18-2016_-Event_1">RSVP instructions and more information.</a>
+<p>SpinachCon is an afternoon-long open house aimed at improving the experience of using and contributing to free software projects. Volunteers come by and try out basic tasks provided by participating projects. This year, we'll be doing two types of testing: user testing and new contributor testing. Volunteers can try out either or both types of testing. Every project at the event will have at least two people representing it, so volunteers can get to know - and get help from - the people behind the projects.</p>
+                       <p class="session-details">
+                               <strong>When:</strong> 12:30 - 17:00, Friday 3/18<br>
+                               <strong>Where:</strong> Bocoup at 201-207 South Street, Suite 102 Boston near South Station on the Red Line<br>
+                       </p>
+               </div>
+
+               <div class="session">
+                       <h3>Free Software Foundation Open House</h3>
+                       <p>Mingle at the FSF office before the conference with speakers and other attendees. Refreshments will be served.</p>
+                       <p class="session-details">
+                               <strong>When:</strong> 17:00 - 19:30, Friday 3/18<br>
+                               <strong>Where:</strong> FSF Office (<a href="../getting_around/index.html#office">transportation tips</a>) at 51 Franklin Street, Fifth Floor, Boston, MA 02110 near Downtown Crossing Station on the Red and Orange Lines
+                       </p>
+               </div>
+
+               <h1>Saturday, March 19</h1>
+               <div class="session">
+                       <h3>LibrePlanet Party!</h3>
+                       <p>Spend time with the LibrePlanet community and enjoy appetizers provided by the FSF. The location is TBD, but it will be wheelchair-accessible and open to all ages.</p>
+                       <p class="session-details">
+                               <strong>When:</strong> Approximately 19:00 - 21:00<br>
+                               <strong>Where:</strong> Cambridge, MA, near the conference<br>
+                       </p>
+
+               </div>
+
+
+       </div> <!-- session column end -->
+</div> <!-- session row end -->
+
+<!--#include virtual="/2016/includes/footer.html"-->
+<!--#include virtual="/2016/includes/common_js.html"-->
+<!--#include virtual="/2016/includes/program_js.html"-->
+<script type="text/javascript">
+$("#p-social").addClass("active").text("Social Events");
+</script>
+<!--#include virtual="/2016/includes/close.html" -->