updated pages to include speakers.

diff --git a/2018/includes/generated-bios.html b/2018/includes/generated-bios.html
index da9365551dd59e7d49f0fbff7c4dba943dbd6b2e..3710db64962c1665c660dfc95e8bb68ecd717534 100644 (file)
--- a/2018/includes/generated-bios.html
+++ b/2018/includes/generated-bios.html
@@ -91,10 +91,10 @@ symbolic debugger (gdb), GNU Emacs, and various others.</p>
 </article>
 <p>Image credits:
 <ul>
-<li>Photo of Deb Nicholson by <a href="https://www.flickr.com/photos/rhiannonstone/2744017707/">Misty Smith</a> CC-BY-NC-SA</li>.
-<li>Photo of Gabriella Coleman by <a href="https://www.flickr.com/photos/biella/15837092652/in/album-72157671619097096/">Victor Jeffreys II</a> CC-BY-NC-SA.</li>
-<li>Photo of Richard Stallman by <a href="https://twitter.com/KoriFeener">Kori Feener</a> CC-BY-SA</li>.
-<li>Photo of Seth David Schoen by <a href="https://eff.org">Electronic Frontier Foundation</a> CC-BY.</li>
+<li>Photo of Deb Nicholson by <a href="https://www.flickr.com/photos/rhiannonstone/2744017707/">Misty Smith</a> CC-BY-NC-SA</li>
+<li>Photo of Gabriella Coleman by <a href="https://www.flickr.com/photos/biella/15837092652/in/album-72157671619097096/">Victor Jeffreys II</a> CC-BY-NC-SA</li>
+<li>Photo of Richard Stallman by <a href="https://twitter.com/KoriFeener">Kori Feener</a> CC-BY-SA</li>
+<li>Photo of Seth David Schoen by <a href="https://eff.org">Electronic Frontier Foundation</a> CC-BY</li>
 </ul>
 </p>
 

diff --git a/2018/includes/nav-list-2.html b/2018/includes/nav-list-2.html
index 8627923c642b7fc3df02c8d79326c4ef9080bc54..a3b247c675e19622ce384e7cc31c979fe7de7d37 100644 (file)
--- a/2018/includes/nav-list-2.html
+++ b/2018/includes/nav-list-2.html
@@ -1,4 +1,4 @@
-<!-- <li class="ahp-link"><a href="/2018/speakers/">Speakers</a></li> -->
+<li class="ahp-link"><a href="/2018/speakers/">Speakers</a></li>
 <li class="getting-around-link"><a href="/2018/getting-around">Travel, Food & Lodging</a></li>
 <li class="ahp-link"><a href="/2018/safe-space-policy/">Safe Space Policy</a></li>
 <li><a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&id=60">Build the scholarship fund</a></li>

diff --git a/2018/index.html b/2018/index.html
index 7b4ae1e93ef806f40325f254b9fbfcf228efe624..4dc3894f12e18003ba4bf72bc9b13e45bdef5e8c 100755 (executable)
--- a/2018/index.html
+++ b/2018/index.html
@@ -13,14 +13,15 @@
        <ul class="carousel-inner list-unstyled">
 
                        
-<!--           <li class="item active"> -->
-<!--                           <img src="//static.fsf.org/nosvn/libreplanet/2018/assets/keynote_banner.png" -->
-<!--                           alt="[A banner image, with the faces of Deb Nicholson, Gabriella Coleman, and Richard Stallman in circles.]"> -->
-<!--  <p class="carousel-caption-bottom">                       -->
-<!-- <a href="/2018/speakers">Learn more about the LibrePlanet keynote speakers</a> -->
-<!--                   </p> -->
-<!--           </li> -->
+       <li class="item active">
+                               <img src="//static.fsf.org/nosvn/libreplanet/2018/assets/keynote_banner.png"
+                               alt="[A banner image, with the faces of Deb Nicholson, Gabriella Coleman, Richard Stallman, and Seth David Schoen in circles.]">
+ <p class="carousel-caption-bottom">                    -->
+ <a href="/2018/speakers">Learn more about the LibrePlanet keynote speakers</a> 
+                       </p> 
+               </li> 
 
+<!--
        <li class="item active">
                                <img src="//static.fsf.org/nosvn/libreplanet/2018/assets/di_dinner-2017.png"
                                alt="[A photo of a group of individuals (women, non-binary, and other gender minorities) sitting at dinner.]" height="475">
@@ -163,15 +164,6 @@ Share your ideas
 </p>
 </li>
 
-<li class="item active">
-<img src="//static.fsf.org/nosvn/libreplanet/2014/site/carousel/lp14_keynotes.png"
-alt="[ Keynote speakers]">
-<p class="carousel-caption-tl">
-<a class="btn btn-default btn-carousel" href="https://libreplanet.org/2014/speakers">
-Get excited for our keynote speakers!
-</a></p>
-</li> -->
-
 <!--                   <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. ]">