updates for 6.0 release

6 files changed, 57 insertions, 5 deletions

diff --git a/docs/RELNOTES-6.0 b/docs/RELNOTES-6.0
index 73208dbe94c..72681fe3582 100644
--- a/docs/RELNOTES-6.0
+++ b/docs/RELNOTES-6.0
@@ -17,7 +17,9 @@ Even numbered versions (such as 6.0) designate stable releases.
 Mesa version 6.0 signifies two things:
 
   1. A stabilization of the 5.1 development release
-  2. Implementation of the OpenGL 1.5 specification
+  2. Implementation of the OpenGL 1.5 specification.  When you query
+     glGetString(GL_VERSION) "1.5" will be returned (as long as the
+     driver supports all the required features).
 
 
 Note that the Mesa major version number is incremented with the OpenGL
@@ -81,4 +83,4 @@ See the VERSIONS file for more details about bug fixes, etc. in Mesa 6.0.
 
 
 ----------------------------------------------------------------------
-$Id: RELNOTES-6.0,v 1.1 2003/12/21 04:06:31 brianp Exp $
+$Id: RELNOTES-6.0,v 1.2 2004/01/07 14:51:30 brianp Exp $
diff --git a/docs/VERSIONS b/docs/VERSIONS
index 493bb876e96..80076518876 100644
--- a/docs/VERSIONS
+++ b/docs/VERSIONS
@@ -1190,7 +1190,9 @@ Mesa Version History
     New:
 	- full OpenGL 1.5 support
     Bug fixes:
-	- fixed bug UNCLAMPED_FLOAT_TO_UBYTE macro; solves a color clamping issue
+	- fixed bug in UNCLAMPED_FLOAT_TO_UBYTE macro; solves a color
+	  clamping issue
 	- updated suno5-gcc configs
+	- glColor3 functions sometimes resulted in undefined alpha values
 
 
diff --git a/docs/contents.html b/docs/contents.html
index 76ce458bc56..08cc0b10358 100644
--- a/docs/contents.html
+++ b/docs/contents.html
@@ -20,7 +20,7 @@
 
 <b>Download / Install</b>
 <ul>
-<li><a href="http://www.sourceforge.net/projects/mesa3d" target="_parent">Stable Release (5.0.2)</a>
+<li><a href="http://www.sourceforge.net/projects/mesa3d" target="_parent">Stable Release (6.0)</a>
 <li><a href="download.html" target="MainFrame">Downloading/Unpacking</a>
 <li><a href="install.html" target="MainFrame">Compilation/Installation</a>
 <li><a href="glu.html" target="MainFrame">SGI's GLU</a>
diff --git a/docs/install.html b/docs/install.html
index 5e8b047f311..4e17a6d7136 100644
--- a/docs/install.html
+++ b/docs/install.html
@@ -40,7 +40,7 @@ adding it again.
 <h3>1.1 Compilation</h3>
 
 <p>
-If you've obtained Mesa through CVS, do this to first:
+Note: if you've obtained Mesa through CVS, do this first:
 </p>
 <pre>
     cd Mesa-newtree
diff --git a/docs/intro.html b/docs/intro.html
index 4f82e6f81c3..0d4cb1d3ea5 100644
--- a/docs/intro.html
+++ b/docs/intro.html
@@ -125,6 +125,13 @@ It implements the OpenGL 1.4 specification.
 </p>
 
 <p>
+January 2003: Mesa 6.0 is released.  It implements the OpenGL 1.5
+specification as well as the GL_ARB_vertex_program and
+GL_ARB_fragment_program extensions.
+</p>
+
+
+<p>
 Ongoing: Mesa is used as the core of many hardware OpenGL drivers for XFree86
 within the
 <A href="http://dri.sourceforge.net/" target="_parent">DRI project</A>.
@@ -141,6 +148,46 @@ version number tracks OpenGL's minor version number.
 </p>
 
 
+<H2>Version 6.x features</H2>
+<p>
+Version 6.x of Mesa implements the OpenGL 1.5 API with the following
+extensions incorporated as standard features:
+</p>
+<ul>
+<li>GL_ARB_occlusion_query
+<li>GL_ARB_vertex_buffer_object
+<li>GL_ARB_texture_non_power_of_two
+<li>GL_EXT_shadow_funcs
+</ul>
+<p>
+Also note that several OpenGL tokens were renamed in OpenGL 1.5
+for the sake of consistency.  The old names will still be valid.
+</p>
+<pre>
+New Name                    Old Name
+------------------------------------------------------------
+GL_FOG_COORD_SRC            GL_FOG_COORDINATE_SOURCE
+GL_FOG_COORD                GL_FOG_COORDINATE
+GL_CURRENT_FOG_COORD        GL_CURRENT_FOG_COORDINATE
+GL_FOG_COORD_ARRAY_TYPE     GL_FOG_COORDINATE_ARRAY_TYPE
+GL_FOG_COORD_ARRAY_STRIDE   GL_FOG_COORDINATE_ARRAY_STRIDE
+GL_FOG_COORD_ARRAY_POINTER  GL_FOG_COORDINATE_ARRAY_POINTER
+GL_FOG_COORD_ARRAY          GL_FOG_COORDINATE_ARRAY
+GL_SRC0_RGB                 GL_SOURCE0_RGB
+GL_SRC1_RGB                 GL_SOURCE1_RGB
+GL_SRC2_RGB                 GL_SOURCE2_RGB
+GL_SRC0_ALPHA               GL_SOURCE0_ALPHA
+GL_SRC1_ALPHA               GL_SOURCE1_ALPHA
+GL_SRC2_ALPHA               GL_SOURCE2_ALPHA
+</pre>
+<p>
+See the
+<a href="http://www.opengl.org/documentation/spec.html" target="_parent">
+OpenGL specification</a> for more details.
+</p>
+
+
+
 <H2>Version 5.x features</H2>
 <p>
 Version 5.x of Mesa implements the OpenGL 1.4 API with the following
diff --git a/docs/relnotes.html b/docs/relnotes.html
index e793482492f..0a2ca6e7c06 100644
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@ -11,6 +11,7 @@ The release notes summarize what's new or changed in each Mesa release.
 </p>
 
 <UL>
+<LI><A HREF="RELNOTES-6.0">RELNOTES-6.0</A>
 <LI><A HREF="RELNOTES-5.1">RELNOTES-5.1</A>
 <LI><A HREF="RELNOTES-5.0.2">RELNOTES-5.0.2</A>
 <LI><A HREF="RELNOTES-5.0.1">RELNOTES-5.0.1</A>