Putting up exhibitors and replacing exhibit hall application witha link to them.

diff --git a/2015/program/exhibit-hall.html b/2015/program/exhibit-hall.html
index 621182e2d71bb6a9fb9d6a4e0fbe345c370646a7..7ad5e9a58a3e6a945ce707b1e6176eba3a2a9c00 100755 (executable)
--- a/2015/program/exhibit-hall.html
+++ b/2015/program/exhibit-hall.html
@@ -12,30 +12,13 @@
 <p>The exhibit hall at LibrePlanet will be open from 09:30 - 18:00 on both conference days, and will have something for everyone. Be sure to take a stroll around and chat with our friends from:  </p>
 
 <ul>
-<li><a href="https://civicrm.org">CiviCRM</a>  </li>
-<li><a href="https://commotionwireless.net">Commotion Wireless Hacklab</a>  </li>
 <li><a href="https://shop.fsf.org">GNU Press</a></li>
-<li><a href="http://informatics.mit.edu">MIT Libraries/Program on Information Science</a>  </li>
-<li><a href="https://openitp.org">OpenITP</a></li>
-<li><a href="https://redhat.com">Red Hat</a>  </li>
+<li><a href="http://www.maidsafe.net">MaidSafe</a></li>
 <li><a href="https://sipb.mit.edu">Student Information Processing Board (SIPB) at MIT</a></li>
 <li><a href="https://www.thinkpenguin.com">ThinkPenguin</a></li>
-<li><a href="https://www.torproject.org">Tor</a></li>
-<li><a href="https://wikimediafoundation.org/wiki/Home">Wikimedia Foundation</a></li>
+<li><a href="http://www.vermontlaw.edu/academics/centers-and-programs/center-for-legal-innovation">Vermont Law School Center for Legal Innovation</a></li>
 </ul>
 
-<h3>Commotion Wireless Hacklab</h3>
-
-<p><em>Who needs the Internet?</em>  </p>
-
-<p>For the exhibit hall, the Open Technology Institute's <a href="https://commotionwireless.net/">Commotion Wireless</a> team will provide a wireless mesh Intranet that other project teams can use to provide easy public access to public demos of their own software, and everyone can use to share notes, chat, and perhaps even play a few games. Additionally, members of the Commotion team will be available throughout the conference to provide:</p>
-
-<ul>
-<li>ongoing support for the Commotion network</li>
-<li>a safe testbed for people to experiment with setting up and using their own local and secure services</li>
-<li>a forum for brainstorming how to apply free software technologies to strengthen communities, safeguard communications, create dynamic media projects, etc.</li>
-<li>tools and resources for those interested in working on exciting new features for free software mesh networking</li>
-</ul>
 
 <!--#include virtual="/server/2015/footer.html"-->
 <!--#include virtual="/server/2015/common_js.html"-->

diff --git a/server/2015/program-menu.html b/server/2015/program-menu.html
index b53d3a37d679b54cb8017240c3d6714bfdc6ff46..6499ecc3b75df50e5c515aa6759b680faae7d5c0 100644 (file)
--- a/server/2015/program-menu.html
+++ b/server/2015/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="social.html">Social Events</a> / <a href="speakers.html">Speakers</a></h3>
+    <h3><a href="index.html">Sessions</a> / <a href="speakers.html">Speakers</a> / <a href="exhibit-hall.html">Exhibit Hall</a> / <a href="social.html">Social Events</a></h3>
   </div>
 </div>
 </div>

diff --git a/server/2015/sidebar.html b/server/2015/sidebar.html
index 908177d040b57bd34e4f875ecf1f489b8d1cbd7d..11e1d1a347fc91e34f9db5f41d1135cc3368d0aa 100755 (executable)
--- a/server/2015/sidebar.html
+++ b/server/2015/sidebar.html
@@ -13,7 +13,7 @@
         <!--<li id="cfs-link"><a href="/2015/call_for_sessions">Propose a Session</a></li>-->
         <li><a href="/2015/program">Program</a></li>
         <!--<li><a href="/2015/program/exhibit_hall.html">Exhibit hall</a></li>-->
-        <li id="exhibit-link"><a href="/2015/exhibit">Join the Exhibit Hall</a></li>
+        <li id="exhibit-link"><a href="/2015/program/exhibit-hall.html">Exhibit Hall</a></li>
         <li id="volunteer-link"><a href="/2015/volunteer">Volunteer</a></li>
         <!--<li id="scholarship-link"><a href="/2015/scholarships">Apply for a Scholarship</a></li>-->