diff --git a/docs/shading.html b/docs/shading.html
index ebb3927..175e024 100644
--- a/docs/shading.html
+++ b/docs/shading.html
@@ -20,7 +20,7 @@
 </p>
 <ul>
 <li><a href="#envvars">Environment variables</a>
-<li><a href="#120">GLSL 1.20 support</a>
+<li><a href="#glsl120">GLSL 1.20 support</a>
 <li><a href="#unsup">Unsupported Features</a>
 <li><a href="#notes">Implementation Notes</a>
 <li><a href="#hints">Programming Hints</a>
@@ -30,9 +30,7 @@
 </ul>
 
 
-
-<a name="envvars">
-<h2>Environment Variables</h2>
+<h2 id="envvars">Environment Variables</h2>
 
 <p>
 The <b>MESA_GLSL</b> environment variable can be set to a comma-separated
@@ -59,8 +57,7 @@
 </p>
 
 
-<a name="120">
-<h2>GLSL Version</h2>
+<h2 id="glsl120">GLSL Version</h2>
 
 <p>
 The GLSL compiler currently supports version 1.20 of the shading language.
@@ -77,8 +74,7 @@
 </ul>
 
 
-<a name="unsup">
-<h2>Unsupported Features</h2>
+<h2 id="unsup">Unsupported Features</h2>
 
 <p>XXX update this section</p>
 
@@ -101,8 +97,7 @@
 </p>
 
 
-<a name="notes">
-<h2>Implementation Notes</h2>
+<h2 id="notes">Implementation Notes</h2>
 
 <ul>
 <li>Shading language programs are compiled into low-level programs
@@ -125,8 +120,7 @@
 </p>
 
 
-<a name="hints">
-<h2>Programming Hints</h2>
+<h2 id="hints">Programming Hints</h2>
 
 <ul>
 <li>Use the built-in library functions whenever possible.
@@ -142,8 +136,7 @@
 </ul>
 
 
-<a name="standalone">
-<h2>Stand-alone GLSL Compiler</h2>
+<h2 id="standalone">Stand-alone GLSL Compiler</h2>
 
 <p>
 The stand-alone GLSL compiler program can be used to compile GLSL shaders
@@ -180,10 +173,7 @@
 </ul>
 
 
-
-
-<a name="implementation">
-<h2>Compiler Implementation</h2>
+<h2 id="implementation">Compiler Implementation</h2>
 
 <p>
 The source code for Mesa's shading language compiler is in the
@@ -245,8 +235,7 @@
 </ul>
 
 
-<a name="validation">
-<h2>Compiler Validation</h2>
+<h2 id="validation">Compiler Validation</h2>
 
 <p>
 Developers working on the GLSL compiler should test frequently to avoid