[GRASS-SVN] r50651 - grass-web/trunk/download

[svn_grass at osgeo.org]

Author: hamish
Date: 2012-02-04 20:48:40 -0800 (Sat, 04 Feb 2012)
New Revision: 50651

Modified:
   grass-web/trunk/download/cdrom.inc
   grass-web/trunk/download/cdrom.php
Log:
move broken urls away from the top, promote the osgeo live dvd, more live dvds and usb sticks now so move around sections

Modified: grass-web/trunk/download/cdrom.inc
===================================================================
--- grass-web/trunk/download/cdrom.inc	2012-02-05 03:53:58 UTC (rev 50650)
+++ grass-web/trunk/download/cdrom.inc	2012-02-05 04:48:40 UTC (rev 50651)
@@ -1,41 +1,24 @@
 <!-- MN -->
 
-<h4>Hard copy distributions</h4>
 
-<ul>
-<li> Fresh <a href="http://www.gdf-hannover.de/order">GRASS Web Server Snapshot</a>
- on CDROM (this server on DVD)</li>
-<li> <a href="http://openosx.com/grass/">OpenOSX Grass CDROM</a>
-  for Mac OSX users
-</ul>
-
-
 <h3>GRASS GIS Live Software</h3>
 
 GRASS is available on various live CDROMs/DVDs/USB sticks.
-E.g., <a href="http://www.knoppix.net">Knoppix</a> 
-is a bootable Linux CD, the variants below offer pre-installed GIS
-software (Live Linux). 
+<!-- E.g., <a href="http://www.knoppix.net">Knoppix</a> 
+is a bootable Linux CD, -->
+The variants below offer pre-installed GIS software (Live Linux). 
 No need to install anything on the hard disk, you can just run it out
-of-the-box by booting from the CDROM. No need to install Linux.
-The hard disk remains untouched.
+of-the-box by booting from the CD-ROM, DVD, or USB-stick. There is
+no need to install or configure Linux. The hard disk remains untouched.
 <P>
 
-<h4>USB stick:</h4>
-
-<ul>
-<li><a href="http://geomatica.como.polimi.it/software/slaxGIS.php">slaxGIS</a>:
-  All in one USB stick!</li>
-<li><a href="http://www.ubc.uevora.pt/index.php?option=com_content&task=view&id=38&Itemid=62">FOSSGIS on USB Stick</a>:
-  All in one USB stick!</li>
-</ul>
-
 <P>
-<h4>CDROM/DVD:</h4>
+<h4>CD-ROM/DVD</h4>
 <ul>
-<li><B><a href="http://live.osgeo.org/en/">OSGeo Live GIS Disc</a></B> -
+<li><B>The <a href="http://live.osgeo.org/en/">OSGeo Live GIS Disc</a></B> -
   The Live DVD contains a collection of the best Geospatial Open Source
-  software, pre-configured with sample data.</li>
+  software, pre-configured with sample data. Also available in USB-stick
+  and Virtual Machine forms<BR></li>
 <li><a href="http://www.arc-team.com/archeos/index.html">ArcheOS</a>:
   The first GNU/Linux distribution for archaeology
   (<a href="http://www.arc-team.com/archeos/wiki/doku.php?id=screenshots">screenshots</a>)
@@ -72,14 +55,38 @@
 </ul>
 
 
+<!-- many broken URLs follow! -->
+
+
 <P>
-<h4>Virtual Machine:</h4>
+<h4>USB stick</h4>
+
 <ul>
+<li><a href="http://geomatica.como.polimi.it/software/slaxGIS.php">slaxGIS</a>:
+  All in one USB stick!</li>
+<li><a href="http://www.ubc.uevora.pt/index.php?option=com_content&task=view&id=38&Itemid=62">FOSSGIS on USB Stick</a>:
+  All in one USB stick!</li>
+</ul>
+
+
+<P>
+<h4>Virtual Machine</h4>
+<ul>
 <li><a href="http://gisvm.com/">GISVM</a> -
  A ready to use anywhere GIS Virtual Machine (based on VMWare)</li>
 </ul>
 
 
+<h3>Hard copy distributions</h3>
+
+<ul>
+<li> Fresh <a href="http://www.gdf-hannover.de/order">GRASS Web Server Snapshot</a>
+ on CDROM (this server on DVD)</li>
+<li> <a href="http://openosx.com/grass/">OpenOSX Grass CDROM</a>
+  for Mac OSX users
+</ul>
+
+
 <div align="right">
 <i>Last change: $Date$ </i><br>
 <i>$Author$</i>

Modified: grass-web/trunk/download/cdrom.php
===================================================================
--- grass-web/trunk/download/cdrom.php	2012-02-05 03:53:58 UTC (rev 50650)
+++ grass-web/trunk/download/cdrom.php	2012-02-05 04:48:40 UTC (rev 50651)
@@ -72,7 +72,7 @@
    </td>
   <td valign="top" class="leftmenu"> <!-- MAIN PART -->
        
-     <h3>GRASS GIS on CDROM</h3>
+     <h3>GRASS GIS on CD-ROM, DVD, and USB sticks</h3>
      <?php
        include("cdrom.inc");
      ?>