remove items requiring access

[libreplanet-static.git] / 2017 / live / index.html

diff --git a/2017/live/index.html b/2017/live/index.html
index 6cdd4a58e23f52591858b02f8769b7ae6fac79af..84976f3c1e0a93c3ab00b719d1f8180d89ca9cb7 100755 (executable)
--- a/2017/live/index.html
+++ b/2017/live/index.html
@@ -10,12 +10,17 @@
 <div class="row margin-top">
   <div class="col-sm-8"> <!-- start of main content -->
 
+
+    <p>To watch LibrePlanet 2017 vidoes, please visit our <a href="https://media.libreplanet.org">MediaGoblin instance</a>.</p>
+
+    <!-- linking to conference video recordings
+
     <noscript>
       <p>
         Our conference streaming web interface requires JavaScript, but
         all of our streams are readily available on
-        <a href="http://live2.fsf.org">
-          live2.fsf.org
+        <a href="http://live.fsf.org">
+          live.fsf.org
         </a>
         and can be played with the video client of your
         choice, such as VLC or mplayer.
@@ -23,26 +28,26 @@
       <p>
        You can watch the streams directly by using vlc or some other media players with the following URLs:<br><br>
 
-       https://live2.fsf.org/stream-123.webm <br>
-       https://live2.fsf.org/stream-141.webm <br>
-       https://live2.fsf.org/stream-144.webm <br>
-       https://live2.fsf.org/stream-155.webm <br><br>
+       https://live.fsf.org/stream-123.webm <br>
+       https://live.fsf.org/stream-141.webm <br>
+       https://live.fsf.org/stream-144.webm <br>
+       https://live.fsf.org/stream-155.webm <br><br>
 
-       https://live2.fsf.org/slides-123.webm <br>
-       https://live2.fsf.org/slides-141.webm <br>
-       https://live2.fsf.org/slides-144.webm <br>
-       https://live2.fsf.org/slides-155.webm <br><br>
+       https://live.fsf.org/slides-123.webm <br>
+       https://live.fsf.org/slides-141.webm <br>
+       https://live.fsf.org/slides-144.webm <br>
+       https://live.fsf.org/slides-155.webm <br><br>
 
-       https://live2.fsf.org/stream-123-480p.webm <br>
-       https://live2.fsf.org/stream-141-480p.webm <br>
-       https://live2.fsf.org/stream-144-480p.webm <br>
-       https://live2.fsf.org/stream-155-480p.webm <br><br>
+       https://live.fsf.org/stream-123-480p.webm <br>
+       https://live.fsf.org/stream-141-480p.webm <br>
+       https://live.fsf.org/stream-144-480p.webm <br>
+       https://live.fsf.org/stream-155-480p.webm <br><br>
 
        or using something like this on a terminal:
 <pre>
-vlc https://live2.fsf.org/stream-123.webm
-mpv https://live2.fsf.org/stream-141.webm
-ffplay https://live2.fsf.org/stream-155.webm
+vlc https://live.fsf.org/stream-123.webm
+mpv https://live.fsf.org/stream-141.webm
+ffplay https://live.fsf.org/stream-155.webm
 </pre>
       </p>
     </noscript>
@@ -52,6 +57,9 @@ ffplay https://live2.fsf.org/stream-155.webm
     <iframe src="https://irc0d.libreplanet.org/irc/irc.freenode.net/?theme=mini&amp;#libreplanet"
             class="irc-client">
     </iframe>
+
+    -->
+
   </div> <!-- end of main content -->
 
   <div class="col-sm-4"> <!-- start of right sidebar column -->