diff --git a/docs/autoconf.html b/docs/autoconf.html
index 5f94b7e88bb..4f1ad8d646c 100644
--- a/docs/autoconf.html
+++ b/docs/autoconf.html
@@ -209,7 +209,6 @@ options are 16- and 32-bit color channels, which will add the bit size
 to the library name. For example, <code>--with-osmesa-bits=16</code>
 will create the libOSMesa16 library with a 16-bit color channel.
 </dl>
-</dl>
 
 
 <h2 id="library">3. Library Options</h2>
diff --git a/docs/banner.html b/docs/banner.html
index 30b476dc0e5..10ace2c7d3b 100644
--- a/docs/banner.html
+++ b/docs/banner.html
@@ -20,7 +20,6 @@ BORDER-TOP: 0PX; BORDER-BOTTOM: 0PX;
 border-image: url(gears.png) 100%; -WEBKIT-border-image: url(gears.png) 100%; 
 }
 */
-} 
 -->
 </STYLE >
 </head>
diff --git a/docs/contents.html b/docs/contents.html
index 94bd94aefba..08ec97799a9 100644
--- a/docs/contents.html
+++ b/docs/contents.html
@@ -6,7 +6,7 @@
   <link rel="stylesheet" type="text/css" href="mesa.css">
 
 <!--Override a few values from the style sheet: -->
-<style>
+<style type="text/css">
 <!--
 body {
 	background-color: #cccccc;
diff --git a/docs/download.html b/docs/download.html
index b0b7f7e2cb1..207d879f0f2 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -80,7 +80,7 @@ instructions</a>.
 </p>
 
 
-<H1>Demos and GLUT</H2>
+<H1>Demos and GLUT</H1>
 
 <p>
 A package of Mark Kilgard's GLUT library is available
diff --git a/docs/faq.html b/docs/faq.html
index e1f7b3dcb53..333ba8d7ecd 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -89,6 +89,7 @@ Still, Mesa serves at least these purposes:
 <em>Stand-alone Mesa</em> is the original incarnation of Mesa.
 On systems running the X Window System it does all its rendering through
 the Xlib API:
+</p>
 <ul>
 <li>The GLX API is supported, but it's really just an emulation of the
      real thing.
@@ -98,7 +99,6 @@ the Xlib API:
 <li>The OpenGL library, libGL.so, contains everything (the programming API,
     the GLX functions and all the rendering code).
 </ul>
-</p>
 <p>
 Alternately, Mesa acts as the core for a number of OpenGL hardware drivers
 within the DRI (Direct Rendering Infrastructure):
diff --git a/docs/helpwanted.html b/docs/helpwanted.html
index 4241e24f35b..444c12b5a9b 100644
--- a/docs/helpwanted.html
+++ b/docs/helpwanted.html
@@ -55,14 +55,14 @@ Then post a message to propose what you want to do, just to make sure
 there's no issues.
 </p>
 
-</p>
+<p>
 Anyone is welcome to contribute code to the Mesa project.
 By doing so, it's assumed that you agree to the code's licensing terms.
 </p>
 
 <p>
 Finally:
-<p>
+</p>
 
 <ol>
 <li>Try to write high-quality code that follows the existing style.
diff --git a/docs/install.html b/docs/install.html
index 2a59545b2e2..52fa3bcd5d7 100644
--- a/docs/install.html
+++ b/docs/install.html
@@ -19,7 +19,7 @@
 <li><a href="#scons">Building with SCons (Windows/Linux)</a>
 <li><a href="#other">Building for other systems</a>
 <li><a href="#libs">Library Information</a>
-<li><a href="#pkg-config">Building OpenGL programs with pkg-config
+<li><a href="#pkg-config">Building OpenGL programs with pkg-config</a>
 </ol>
 
 
@@ -61,10 +61,10 @@ version 2.4.33 or later
 <li>Xorg server version 1.5 or later
 <li>Linux 2.6.28 or later
 </ul>
-</p>
 <p>
 If you're using a fedora distro the following command should install all
 the needed dependencies:
+</p>
 <pre>
   sudo yum install flex bison imake libtool xorg-x11-proto-devel libdrm-devel \
   gcc-c++ xorg-x11-server-devel libXi-devel libXmu-devel libXdamage-devel git \
@@ -82,11 +82,13 @@ The primary method to build Mesa on Unix systems is with autoconf.
 
 <p>
 The general approach is the standard:
+</p>
 <pre>
   ./configure
   make
   sudo make install
 </pre>
+<p>
 But please read the <a href="autoconf.html">detailed autoconf instructions</a>
 for more details.
 </p>
diff --git a/docs/lists.html b/docs/lists.html
index c79d615db0b..d288cc81458 100644
--- a/docs/lists.html
+++ b/docs/lists.html
@@ -14,26 +14,23 @@
 </p>
 
 <ul>
-<li><a href="http://lists.freedesktop.org/mailman/listinfo/mesa-users"
+<li><p><a href="http://lists.freedesktop.org/mailman/listinfo/mesa-users"
 target="_parent">mesa-users</a> - intended for end-users of Mesa and DRI
 drivers.  Newbie questions are OK, but please try the general OpenGL
-resources and Mesa/DRI documentation first.
+resources and Mesa/DRI documentation first.</p>
 </li>
-<br>
-<li><a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev"
+<li><p><a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev"
 target="_parent">mesa-dev</a> - for Mesa, Gallium and DRI development
-discussion.  Not for beginners.
+discussion.  Not for beginners.</p>
 </li>
-<br>
-<li><a href="http://lists.freedesktop.org/mailman/listinfo/mesa-commit"
+<li><p><a href="http://lists.freedesktop.org/mailman/listinfo/mesa-commit"
 target="_parent">mesa-commit</a> - relays git check-in messages
 (for developers).
-In general, people should not post to this list.
+In general, people should not post to this list.</p>
 </li>
-<br>
-<li><a href="http://lists.freedesktop.org/mailman/listinfo/mesa-announce"
+<li><p><a href="http://lists.freedesktop.org/mailman/listinfo/mesa-announce"
 target="_parent">mesa-announce</a> - announcements of new Mesa
-versions are sent to this list.  Very low traffic.
+versions are sent to this list.  Very low traffic.</p>
 </li>
 </ul>
 
diff --git a/docs/llvmpipe.html b/docs/llvmpipe.html
index 87d1fd44d35..9fc9674ce1f 100644
--- a/docs/llvmpipe.html
+++ b/docs/llvmpipe.html
@@ -36,8 +36,8 @@ It's the fastest software rasterizer for Mesa.
    </p>
 </li>
 <li>
-	 <p>LLVM: version 2.9 recommended; 2.6 or later required.</p>
-   <b>NOTE</b>: LLVM 2.8 and earlier will not work on systems that support the
+   <p>LLVM: version 2.9 recommended; 2.6 or later required.</p>
+   <p><b>NOTE</b>: LLVM 2.8 and earlier will not work on systems that support the
    Intel AVX extensions (e.g. Sandybridge).  LLVM's code generator will
    fail when trying to emit AVX instructions.  This was fixed in LLVM 2.9.
    </p>
@@ -47,6 +47,7 @@ It's the fastest software rasterizer for Mesa.
 <pre>
      aptitude install llvm-dev
 </pre>
+   <p>
    For a RPM-based distribution do:
    </p>
 <pre>
@@ -165,7 +166,7 @@ Building will also create several unit tests in
 build/linux-???-debug/gallium/drivers/llvmpipe:
 </p>
 
-</ul>
+<ul>
 <li> lp_test_blend: blending
 <li> lp_test_conv: SIMD vector conversion
 <li> lp_test_format: pixel unpacking/packing
diff --git a/docs/mangling.html b/docs/mangling.html
index 3d88c15d6d0..2ff628c342a 100644
--- a/docs/mangling.html
+++ b/docs/mangling.html
@@ -21,10 +21,10 @@ This results in all the Mesa functions being prefixed with
 To do this, recompile Mesa with the compiler flag -DUSE_MGL_NAMESPACE.
 Add the flag to CFLAGS in the configuration file which you want to use.
 For example:
+</p>
 <pre>
 CFLAGS += -DUSE_MGL_NAMESPACE
 </pre>
-</p>
 
 
 </body>
diff --git a/docs/news.html b/docs/news.html
index df7a1232b72..bb1bb77dcac 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -309,7 +309,7 @@ shading language and built-in functions.
 <h2>April 2007</h2>
 <p>
 Thomas Hellstr&ouml;m of Tungsten Graphics has written a whitepaper
-describing the new DRI memory management system</a>.
+describing the new DRI memory management system.
 </p>
 
 <h2>December 5, 2006</h2>
@@ -547,6 +547,7 @@ release).
 	- fixed triangle color interpolation bug on AIX (Shane Blackett)
 	- fixed a number of minor memory leaks (bug #1002030)
 </pre>
+<p>
 The MD5 checksums are:
 </p>
 <pre>
@@ -598,6 +599,7 @@ This release basically just fixes bugs since the 6.0. release.
 	- fragment program XPD instruction was incorrect
 	- glGetMaterial() didn't work reliably
 </pre>
+<p>
 The MD5 checksums are:
 </p>
 <pre>
@@ -697,7 +699,7 @@ OpenGL 1.5 features.
 	- glTexImage1/2/3D now allows width/height/depth = 0
 	- disable SPARC asm code on Linux (bug 852204)
 </pre>
-
+<p>
 The MD5 checksums are:
 </p>
 <pre>
diff --git a/docs/relnotes-6.5.2.html b/docs/relnotes-6.5.2.html
index db2038ab06d..ec220f3acdf 100644
--- a/docs/relnotes-6.5.2.html
+++ b/docs/relnotes-6.5.2.html
@@ -52,7 +52,7 @@ copy texturing).
 <li>New <code>minstall</code> script to replace normal install program
 <li>Faster fragment program execution in software
 <li>Added (or fixed) support for <a href="http://www.opengl.org/registry/specs/SGI/make_current_read.txt">
-    GLX_SGI_make_current_read</a> to the following drivers:</li>
+    GLX_SGI_make_current_read</a> to the following drivers:
     <ul>
     <li>radeon</li>
     <li>savage</li>
diff --git a/docs/relnotes-7.1.html b/docs/relnotes-7.1.html
index e8a39c8d34b..f7a61287241 100644
--- a/docs/relnotes-7.1.html
+++ b/docs/relnotes-7.1.html
@@ -17,7 +17,7 @@ It should be relatively stable, but those who are especially concerned about
 stability should wait for Mesa 7.2 or use Mesa 7.0.4 (the previous stable
 release).
 </p>
-</>
+<p>
 Note that this version of Mesa does not use the GEM memory manager.
 The master branch of git uses GEM.
 </p>
diff --git a/docs/relnotes-7.10.1.html b/docs/relnotes-7.10.1.html
index fd01230befb..134591e3326 100644
--- a/docs/relnotes-7.10.1.html
+++ b/docs/relnotes-7.10.1.html
@@ -374,7 +374,5 @@ with <tt>in</tt>, <tt>out</tt>, <tt>attribute</tt>, and <tt>varying</tt>.</li>
   <li>glx: Put null check before use</li>
 </ul></p>
 
-</p>
-
 </body>
 </html>
diff --git a/docs/relnotes-7.9.2.html b/docs/relnotes-7.9.2.html
index 65929cc2ac2..82240441b6b 100644
--- a/docs/relnotes-7.9.2.html
+++ b/docs/relnotes-7.9.2.html
@@ -330,7 +330,6 @@ with <tt>in</tt>, <tt>out</tt>, <tt>attribute</tt>, and <tt>varying</tt>.</li>
 <ul>
   <li>glx: Put null check before use</li>
 </ul></p>
-</p>
 
 </body>
 </html>
diff --git a/docs/relnotes-8.0.2.html b/docs/relnotes-8.0.2.html
index d73ba9f926e..88f730c164a 100644
--- a/docs/relnotes-8.0.2.html
+++ b/docs/relnotes-8.0.2.html
@@ -86,7 +86,7 @@ d5e5cdb85d2afdbcd1c0623d3ed1c54d  MesaLib-8.0.2.zip
 <p>Daniel Vetter (1):
 <ul>
       <li>i965: fixup W-tile offset computation to take swizzling into account</li>
-<ul></p>
+</ul></p>
 
 <p>Dylan Noblesmith (1):
 <ul>
diff --git a/docs/relnotes.html b/docs/relnotes.html
index 41ef9e30bd8..d2261fae0ac 100644
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@ -57,7 +57,7 @@ The release notes summarize what's new or changed in each Mesa release.
 <LI><A HREF="relnotes-6.4.2.html">6.4.2 release notes</A>
 <LI><A HREF="relnotes-6.4.1.html">6.4.1 release notes</A>
 <LI><A HREF="relnotes-6.4.html">6.4 release notes</A>
-</UL
+</UL>
 
 <p>
 Versions of Mesa prior to 6.4 are summarized in the
diff --git a/docs/repository.html b/docs/repository.html
index cd895a37211..094b30d992d 100644
--- a/docs/repository.html
+++ b/docs/repository.html
@@ -14,6 +14,7 @@ Mesa uses <a href="http://git.or.cz/"target="_parent">git</a>
 as its source code management system.
 </p>
 
+<p>
 The master git repository is hosted on
 <a href="http://www.freedesktop.org" target="_parent">freedesktop.org</a>.
 </p>
@@ -145,6 +146,7 @@ branch, try:
     git config branch.master.remote origin
     git config branch.master.merge master
 </pre>
+<p>
 Otherwise, you have to say<code> git pull origin master </code>
 each time you do a pull.
 </p>
@@ -163,6 +165,7 @@ If it has been awhile since you've done the initial clone, try
 <pre>
     git pull
 </pre>
+<p>
 to get the latest files before you start working.
 </p>
 <p>
@@ -171,6 +174,7 @@ Make your changes and use
     git add &lt;files to commit&gt;
     git commit
 </pre>
+<p>
 to get your changes ready to push back into the fd.o repository.
 </p>
 <p>
@@ -186,12 +190,13 @@ To avoid this,
     git pull --rebase
     git push
 </pre>
+<p>
 If you are familiar with CVS or similar system, this is similar to doing a
 <code> cvs update </code> in order to update your source tree to
 the current repository state, instead of the time you did the last update.
 (CVS doesn't work like git in this respect, but this is easiest way
 to explain it.)
-</br>
+<br>
 In any case, your repository now looks like you made your changes after
 all the other changes.
 </p>
diff --git a/docs/science.html b/docs/science.html
index 102593c75c3..9834cfd2407 100644
--- a/docs/science.html
+++ b/docs/science.html
@@ -49,7 +49,6 @@
 	<li><a href="http://orsa.sourceforge.net/" target="_parent">ORSA</a> - An interactive tool for Celestial Mechanics
 	</li>
 	<li><a href="http://www.paraview.org/" target="_parent">ParaView</a> - Scientific visualization package
-	</li>
 	</li><li><a href="http://root.cern.ch/" target="_parent">ROOT</a> - Object Oriented Data
 	Analysis Framework
 	</li><li><a href="http://www.slffea.com/" target="_parent">SLFFEA</a> - GNU finite element
diff --git a/docs/shading.html b/docs/shading.html
index 604bd1d37a6..ebb3927ad47 100644
--- a/docs/shading.html
+++ b/docs/shading.html
@@ -152,7 +152,7 @@ into low-level GPU code.
 
 <p>
 This tool is useful for:
-<p>
+</p>
 <ul>
 <li>Inspecting GPU code to gain insight into compilation
 <li>Generating initial GPU code for subsequent hand-tuning
@@ -241,8 +241,7 @@ This option is only relevant if EmitHighLevelInstructions is set.
 <br>
 If set, instructions will be annoted with comments to help with debugging.
 Extra NOP instructions will also be inserted.
-</br>
-
+</li>
 </ul>
 
 
diff --git a/docs/systems.html b/docs/systems.html
index 1192405632f..7b1d3483a7e 100644
--- a/docs/systems.html
+++ b/docs/systems.html
@@ -81,7 +81,7 @@ The list includes:
 <li>DOS
 <li>fbdev
 <li>DEC/VMS
-<ul>
+</ul>
 
 </body>
 </html>
diff --git a/docs/versions.html b/docs/versions.html
index 8ada33724bd..eb135995508 100644
--- a/docs/versions.html
+++ b/docs/versions.html
@@ -897,9 +897,9 @@ New:
 <li>demos/texenv.c demo
 <li>GL_EXT_texture_env_combine extension (by Holger Waechtler)
 <li>Xlib driver is now thread-safe (see xdemos/glthreads)
-<ul>
-Bug Fixes:
 </ul>
+Bug Fixes:
+<ul>
 <li>various GL conformance failures fixed since 3.2.1
 </ul>
 Changes:
@@ -935,9 +935,9 @@ Bug Fixes:
 <li>texture matrix changes weren't always detected (GLUT projtex demo)
 <li>fixed random color problem in vertex fog code
 <li>fixed Glide-related bug that let Quake get a 24-bit Z buffer
-<ul>
-Changes:
 </ul>
+Changes:
+<ul>
 <li>finished internal support for compressed textures for DRI
 </ul>
 
diff --git a/docs/vmware-guest.html b/docs/vmware-guest.html
index 7faa315d4ed..1fe4a059fa9 100644
--- a/docs/vmware-guest.html
+++ b/docs/vmware-guest.html
@@ -186,9 +186,11 @@ OpenGL renderer string: Gallium 0.4 on SVGA3D; build: RELEASE;
 OpenGL version string: 2.1 Mesa 8.0
 </pre>
 
+<p>
 If you don't see this, try setting this environment variable:
   <pre>
   export LIBGL_DEBUG=verbose</pre>
+<p>
 then rerun glxinfo and examine the output for error messages.
 </p>