From f64bae2e2a4181a6e9b0890e178b96b9bd3a00ae Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 19 Apr 2012 08:56:02 -0600
Subject: docs: freshen up the download/unpack instructions

---
 docs/download.html | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/docs/download.html b/docs/download.html
index 4e8fc2f02f0..6a9533aaeb3 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -20,26 +20,12 @@ When a new release is coming, release candidates (betas) may be found
 </p>
 
 
+<H1>Unpacking</H1>
+
 <p>
-The Mesa package is named MesaLib-x.y.z.{tar.bz2, tar.gz, zip} where x.y.z
-is the version.  There are three types of compressed archives.
-</p>
-<p>
-In the past, there was also MesaGLUT-x.y.z.{tar.bz2, tar.gz, zip} packages which
-contained Mark Kilgard's GLUT library.
-Most Linux distributions include an implementation of GLUT (such as freeglut).
-</p>
-<p>
-In the past, the Mesa demos collection was distributed as
-MesaDemos-x.y.z.{tar.bz2, tar.gz, zip}.
-Now, the
-<a href="ftp://ftp.freedesktop.org/pub/mesa/demos/" target="_parent">
-Mesa demos</a> are distributed separately.
+Mesa releases are available in three formats: .tar.bz2, .tar.gz, and .zip
 </p>
 
-
-<H1>Unpacking</H1>
-
 <p>
 To unpack .tar.gz files:
 </p>
@@ -86,10 +72,6 @@ src/glu		- libGLU source code
 src/glx		- sources for building libGL with full GLX and DRI support
 </pre>
 
-If you downloaded and unpacked the MesaGLUT.x.y.z package:
-<pre>
-src/glut	- GLUT library source code
-</pre>
 
 <p>
 Proceed to the <a href="install.html">compilation and installation
@@ -97,5 +79,24 @@ instructions</a>.
 </p>
 
 
+<H1>Demos and GLUT</H2>
+
+<p>
+A package of Mark Kilgard's GLUT library is available
+<a href="ftp://ftp.freedesktop.org/pub/mesa/glut/" target="_parent">here</a>
+</p>
+
+<p>
+The Mesa demos collection is available
+<a href="ftp://ftp.freedesktop.org/pub/mesa/demos/" target="_parent">here</a>
+</p>
+
+<p>
+In the past, GLUT and the Mesa demos were released in conjunction with
+Mesa releases.  But since GLUT and the demos change infrequently, they
+were split off some time ago.
+</p>
+
+
 </BODY>
 </HTML>
-- 
cgit v1.2.3