Removing CfP from sidebar.

diff --git a/2016/includes/sidebar.html b/2016/includes/sidebar.html
index cb2da8ede484fcded1c922c65cb70dbf479b76d2..abde1d65194648e257971a64586e23471b7f1148 100755 (executable)
--- a/2016/includes/sidebar.html
+++ b/2016/includes/sidebar.html
@@ -19,15 +19,12 @@
                        <li><a href="/2016/program/social.html">Social Events</a></li>
                        <li id="exhibit-link"><a href="/2016/program/exhibit-hall.html">Exhibit Hall</a></li>
                        <li><a href="/2016/sponsors">Sponsors</a></li>
+            <li id="cfs-link"><a href="https://my.fsf.org/civicrm/profile/create?gid=325&amp;reset=1">Propose a session</a></li>
                -->
 
 
                <ul class="nav nav-pills nav-stacked">
-                       <li id="cfs-link"><a href="https://my.fsf.org/civicrm/profile/create?gid=325&amp;reset=1">Propose a session</a></li>
                        <li id="scholarship-link"><a href="https://my.fsf.org/civicrm/profile/create?gid=334&reset=1">Apply for a scholarship</a></li>
-</ul>
-
-               <ul class="nav nav-pills nav-stacked">
                        <li><a href="https://media.libreplanet.org/">Videos of previous conferences</a></li>
                        <li><a href="https://www.libreplanet.org/2015/program">Last year's program</a></li>
                </ul>

diff --git a/2016/index.html b/2016/index.html
index 672a884f9c73e97e3907f51e953c1ef7970f30bf..9df5d0e5b66583c6d410a218c992eaae7c01bd3c 100755 (executable)
--- a/2016/index.html
+++ b/2016/index.html
@@ -28,7 +28,7 @@
                        <img src="//static.fsf.org/nosvn/images/best-event-photos/fsf30-crypto-session-848x477.jpg"
                        alt="[ Crypto panel at the FSF 30th Anniversary User Freedom Summit ]">
                        <p class="carousel-caption-bottom">
-                               <a href="https://lists.gnu.org/mailman/listinfo/libreplanet-discuss">Join the discussion list now and meet the people you'll spend time with at LibrePlanet</p>
+                               <a href="https://lists.gnu.org/mailman/listinfo/libreplanet-discuss">Join the discussion list now</a> and meet the people you'll spend time with at LibrePlanet.</p>
                        </li>
        </ul>