updates for 6.3.2 release, plus other assorted clean-ups
diff --git a/docs/intro.html b/docs/intro.html
index b63d313..374d124 100644
--- a/docs/intro.html
+++ b/docs/intro.html
@@ -146,7 +146,8 @@
<p>
This is a summary of the major versions of Mesa. Note that Mesa's major
-version number tracks OpenGL's minor version number.
+version number tracks OpenGL's minor version number (+1).
+Work is underway to implement the OpenGL 2.0 specification.
</p>
@@ -162,10 +163,11 @@
</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.
+for the sake of consistency.
+The old tokens are still available.
</p>
<pre>
-New Name Old Name
+New Token Old Token
------------------------------------------------------------
GL_FOG_COORD_SRC GL_FOG_COORDINATE_SOURCE
GL_FOG_COORD GL_FOG_COORDINATE