Remove obsolete live images and Twitter link.

8 files changed, 2 insertions, 94 deletions

diff --git a/english/blends/gis/about.wml b/english/blends/gis/about.wml
index f8c3b1a7d69..1ae925bd8f3 100644
--- a/english/blends/gis/about.wml
+++ b/english/blends/gis/about.wml
@@ -24,13 +24,3 @@ the packaging system to install a group of other packages.</p>
 information on which metapackages are available and how to install the
 metapackages on an existing Debian system.</p>
 
-<h2>Live Images</h2>
-
-<p>If you're new to Debian and you'd like to try the Debian GIS Pure Blend
-without installing it on your computer, or if you'd like to perform a fresh
-installation of Debian with all the GIS software ready-to-go, you
-might find the live images useful. Images are produced that can be run from
-DVDs or USB sticks on both 32-bit and 64-bit Intel architectures.</p>
-
-<p>See the <a href="./get/live">live images page</a> for more information.</p>
-
diff --git a/english/blends/gis/contact.wml b/english/blends/gis/contact.wml
index e0e280820ea..c61adb768bc 100644
--- a/english/blends/gis/contact.wml
+++ b/english/blends/gis/contact.wml
@@ -3,7 +3,7 @@
 # $Id$
 
 <p>The primary point of contact for GIS related topics in Debian is the
-Debian GIS Pure Blend team. You can contact the team by email or by
+Debian GIS team. You can contact the team by email or by
 IRC. Note that if you contact the team by email, this email will be publicly
 available <a href="https://lists.debian.org/debian-gis/">in the list
 archives</a>.</p>
diff --git a/english/blends/gis/deriv.wml b/english/blends/gis/deriv.wml
index bcacde6a88d..90c208f567d 100644
--- a/english/blends/gis/deriv.wml
+++ b/english/blends/gis/deriv.wml
@@ -27,7 +27,7 @@ command line, just like any other package.</p>
 <h2><img src="Pics/OSGeo-Live.png" alt="OSGeo-Live"></h2>
 
 <ul>
-<li>Website: <a href="http://live.osgeo.org/">http://live.osgeo.org/</a></li>
+<li>Website: <a href="https://live.osgeo.org/">https://live.osgeo.org/</a></li>
 </ul>
 
 <p>OSGeo-Live is a self-contained bootable DVD, USB thumb drive or Virtual
diff --git a/english/blends/gis/get/Makefile b/english/blends/gis/get/Makefile
index c39783318a5..d0e9dd2c272 100644
--- a/english/blends/gis/get/Makefile
+++ b/english/blends/gis/get/Makefile
@@ -10,5 +10,3 @@ include $(WMLBASE)/Make.lang
 index.$(LANGUAGE).html: index.wml $(TEMPLDIR)/blend.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/basic.wml ../navbar.inc
 
 metapackages.$(LANGUAGE).html: metapackages.wml $(TEMPLDIR)/blend.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/basic.wml ../navbar.inc
-
-live.$(LANGUAGE).html: live.wml $(TEMPLDIR)/blend.wml $(TEMPLDIR)/template.wml $(TEMPLDIR)/basic.wml ../navbar.inc
diff --git a/english/blends/gis/get/index.wml b/english/blends/gis/get/index.wml
index e18d85ed660..ae241606faa 100644
--- a/english/blends/gis/get/index.wml
+++ b/english/blends/gis/get/index.wml
@@ -5,7 +5,6 @@
 
 <p>The Debian GIS Pure Blend is distributed <a href="../../../intro/free">freely</a>
 over Internet.</p>
-<p>If you want to use the Blend, these are your options:</p>
 <div class="line">
   <div class="item col50">
     <h2><a href="./metapackages">Use the metapackages</a></h2>
@@ -29,20 +28,6 @@ over Internet.</p>
 	         href="https://packages.debian.org/unstable/gis-workstation">gis-workstation</a></li>
     </ul>
   </div>
-  <div class="item col50 lastcol">
-    <h2><a href="./live">Download a live image</a></h2>
-    <p>
-      You can try the Blend by booting a live system from a DVD or USB key
-      without installing any files to the computer. When you are ready, you can
-      run the included installer.
-    </p>
-    <ul class="quicklist downlist">
-      <li><a title="Download live image for 64-bit Intel and AMD PC"
-	     href="<stable-amd64-url/>">64-bit PC live</a></li>
-      <li><a title="Download live image 32-bit Intel and AMD PC"
-	     href="<stable-i386-url/>">32-bit PC live</a></li>
-    </ul>
-  </div>
 </div>
 <div class="clr"></div>
 
diff --git a/english/blends/gis/get/live.wml b/english/blends/gis/get/live.wml
deleted file mode 100644
index 6fa73962c55..00000000000
--- a/english/blends/gis/get/live.wml
+++ /dev/null
@@ -1,56 +0,0 @@
-#use wml::debian::blend title="Download Live Images"
-#use wml::debian::blends::gis
-#use "../navbar.inc"
-# $Id$
-
-<p>The Debian GIS Pure Blend produces <b>Live DVD images</b> that can
-be used to try out the Debian GIS Pure Blend on a computer without
-having to install it first. The images also contain an installer which can
-be used to install Debian along with the packages from the blend.</p>
-
-<h2>Debian GIS Blend <em>stable</em></h2>
-
-<p>A preview release of the Debian GIS Blend Live DVD is available
-for download.</p>
-
-<p>The latest stable release is: <strong><stable-version/></strong>.</p>
-
-<ul>
-        <li><a href="<stable-amd64-url/>">amd64 Live DVD image (ISO)</a> 
-        <li><a href="<stable-i386-url/>">i386 Live DVD image (ISO)</a> 
-        <li><a href="<stable-source-url/>">Live DVD image Source Archive (tar)</a> 
-</ul>
-
-<p>For webboot images, checksums and GPG signatures, see the <a
-href="https://cdimage.debian.org/cdimage/blends-live/">full file
-listing</a>.</p>
-
-<h2>Debian GIS Blend <em>testing</em></h2>
-
-<p>In the near future, live DVDs will be built for stretch (the current
-Debian testing distribution) although these are not currently
-available.</p>
-
-<h2>Getting Started</h2>
-
-<h3>Using a DVD</h3>
-
-<p>Most modern operating systems will have provisions for burning ISO images
-to DVD media. The Debian CD FAQ provides instructions for burning ISO images
-using <a href="https://www.debian.org/CD/faq/index#record-unix">Linux</a>, <a
-href="https://www.debian.org/CD/faq/index#record-windows">Windows</a> and <a
-href="https://www.debian.org/CD/faq/index#record-mac">Mac OS</a>. If you are
-having difficulty, using a web search engine should provide the answers you
-need.</p>
-
-<h3>Using a USB stick</h3>
-
-<p>The ISO images are built as hybrid images, so you can copy them directly to
-a USB stick without using any special software like unetbootin. On a Linux
-system, you can do this like so:</p>
-
-<pre>sudo dd if=/path/to/debian-gis-live-image.iso of=/dev/sd<b>X</b></pre>
-
-<p>The output of the dmesg command should let you know the device name of the
-USB stick where you will need to change the <b>X</b> to the letter given.</p>
-
diff --git a/english/blends/gis/index.wml b/english/blends/gis/index.wml
index 23fbb59e5ee..0ed6e9f81b3 100644
--- a/english/blends/gis/index.wml
+++ b/english/blends/gis/index.wml
@@ -5,9 +5,6 @@
 
 # translators: you need to translate the navbar.inc file so this page (when translated) is correctly built and shown
 
-<span class="download"><a href="<stable-amd64-url/>">
-Download Debian GIS <stable-version/><br/><em>(64-bit LiveDVD)</em></a>
-</span>
 <div id="splash">
         <h1 id="gis">Debian GIS Pure Blend</h1>
 </div>
@@ -38,7 +35,6 @@ distribution.</p>
 <ul id="hometoc-colb">
   <li><a href="./get/">Getting the blend</a>
   <ul>
-    <li><a href="./get/live">Download live images</a></li>
     <li><a href="./get/metapackages">Using the metapackages</a></li>
   </ul></li>
 </ul>
@@ -52,9 +48,6 @@ distribution.</p>
     </ul>
   </li>
 </ul>
-<ul id="hometoc-cole">
-  <li><a href="https://twitter.com/DebianGIS"><img src="Pics/twitter.gif" alt="Twitter" width="80" height="15" /></a></li>
-</ul>
 </div>
 
 
diff --git a/english/blends/gis/navbar.inc b/english/blends/gis/navbar.inc
index c1493481832..3e0b111e517 100644
--- a/english/blends/gis/navbar.inc
+++ b/english/blends/gis/navbar.inc
@@ -8,7 +8,6 @@
       <li><a href="$(HOME)/blends/gis/contact">Contact</a></li>
       <li><a href="$(HOME)/blends/gis/get/">Getting&nbsp;the&nbsp;Blend</a>
          <ul>
-         <li><a href="$(HOME)/blends/gis/get/live">Download&nbsp;live&nbsp;images</a></li>
          <li><a href="$(HOME)/blends/gis/get/metapackages">Using&nbsp;the&nbsp;metapackages</a></li>
 	 </ul>
       </li>
@@ -18,7 +17,6 @@
         <li><a href="<gis-policy-html/>">GIS Team Policy</a></li>
         </ul>
       </li>
-      <li><a href="https://twitter.com/DebianGIS"><img src="$(HOME)/blends/gis/Pics/twitter.gif" alt="Twitter" width="80" height="15"></a></li>
     </ul>
    </div>
 :#alternate_navbar#}