diff --git a/docs/devinfo.html b/docs/devinfo.html
index 02d6473266f..62982f5b4f5 100644
--- a/docs/devinfo.html
+++ b/docs/devinfo.html
@@ -25,6 +25,7 @@
 
 <p>
 To add a new GL extension to Mesa you have to do at least the following.
+</p>
 
 <ul>
 <li>
@@ -73,7 +74,6 @@ To add a new GL extension to Mesa you have to do at least the following.
    tests are run using 'meson test'
 </li>
 </ul>
-</p>
 
 
 
diff --git a/docs/meson.html b/docs/meson.html
index 6fe8def812e..b516a459c3a 100644
--- a/docs/meson.html
+++ b/docs/meson.html
@@ -349,11 +349,11 @@ will likely have to alter them for your system.</p>
 <p>
 Those running on ArchLinux can use the AUR-maintained packages for some
 of those, as they'll have the right values for your system:
+</p>
 <ul>
   <li><a href="https://aur.archlinux.org/packages/meson-cross-x86-linux-gnu">meson-cross-x86-linux-gnu</a></li>
   <li><a href="https://aur.archlinux.org/packages/meson-cross-aarch64-linux-gnu">meson-cross-aarch64-linux-gnu</a></li>
 </ul>
-</p>
 
 <p>
 32-bit build on x86 linux:
diff --git a/docs/precompiled.html b/docs/precompiled.html
index 97dc1ff4bd8..12c4388817e 100644
--- a/docs/precompiled.html
+++ b/docs/precompiled.html
@@ -24,13 +24,13 @@ Some Linux distributions closely follow the latest Mesa releases. On others one
 has to use unofficial channels.
 <br>
 There are some general directions:
+</p>
 <ul>
 <li>Debian/Ubuntu based distros - PPA: xorg-edgers, oibaf and padoka</li>
 <li>Fedora - Corp: erp and che</li>
 <li>OpenSuse/SLES - OBS: X11:XOrg and pontostroy:X11</li>
 <li>Gentoo/Archlinux - officially provided/supported</li>
 </ul>
-</p>
 
 </div>
 </body>
diff --git a/docs/shading.html b/docs/shading.html
index 76f25316f86..174337b41f2 100644
--- a/docs/shading.html
+++ b/docs/shading.html
@@ -71,6 +71,7 @@ Shaders can be dumped and replaced on runtime for debugging purposes. This
 feature is not currently supported by SCons build.
 
 This is controlled via following environment variables:
+</p>
 <ul>
 <li><b>MESA_SHADER_DUMP_PATH</b> - path where shader sources are dumped
 <li><b>MESA_SHADER_READ_PATH</b> - path where replacement shaders are read
@@ -79,7 +80,6 @@ Note, path set must exist before running for dumping or replacing to work.
 When both are set, these paths should be different so the dumped shaders do 
 not clobber the replacement shaders. Also, the filenames of the replacement shaders
 should match the filenames of the corresponding dumped shaders.
-</p>
 
 <h3 id="capture">Capturing Shaders</h3>
 
diff --git a/docs/submittingpatches.html b/docs/submittingpatches.html
index 957fdcd5cdc..6b9a07357b3 100644
--- a/docs/submittingpatches.html
+++ b/docs/submittingpatches.html
@@ -228,14 +228,14 @@ your email administrator for this.)
 </p>
 <p>
   Add labels to your MR to help reviewers find it. For example:
-  <ul>
-    <li>Mesa changes affecting all drivers: mesa
-    <li>Hardware vendor specific code: amd, intel, nvidia, ...
-    <li>Driver specific code: anvil, freedreno, i965, iris, radeonsi,
-      radv, vc4, ...
-    <li>Other tag examples: gallium, util
-  </ul>
 </p>
+<ul>
+  <li>Mesa changes affecting all drivers: mesa
+  <li>Hardware vendor specific code: amd, intel, nvidia, ...
+  <li>Driver specific code: anvil, freedreno, i965, iris, radeonsi,
+    radv, vc4, ...
+  <li>Other tag examples: gallium, util
+</ul>
 <p>
   Tick the following when creating the MR. It allows developers to
   rebase your work on top of master.
@@ -255,18 +255,18 @@ your email administrator for this.)
 </p>
 <p>
   Some other notes:
-  <ul>
-    <li>Make changes and update your branch based on feedback
-    <li>Old, stale MR may be closed, but you can reopen it if you
-      still want to pursue the changes
-    <li>You should periodically check to see if your MR needs to be
-      rebased
-    <li>Make sure your MR is closed if your patches get pushed outside
-      of GitLab
-    <li>Please send MRs from a personal fork rather than from the main
-      Mesa repository, as it clutters it unnecessarily.
-  </ul>
 </p>
+<ul>
+  <li>Make changes and update your branch based on feedback
+  <li>Old, stale MR may be closed, but you can reopen it if you
+    still want to pursue the changes
+  <li>You should periodically check to see if your MR needs to be
+    rebased
+  <li>Make sure your MR is closed if your patches get pushed outside
+    of GitLab
+  <li>Please send MRs from a personal fork rather than from the main
+    Mesa repository, as it clutters it unnecessarily.
+</ul>
 
 <h2 id="reviewing">Reviewing Patches</h2>
 
diff --git a/docs/vmware-guest.html b/docs/vmware-guest.html
index e73f2005f42..1bf497bd6c7 100644
--- a/docs/vmware-guest.html
+++ b/docs/vmware-guest.html
@@ -30,6 +30,7 @@ MacOS are all supported.
 With the August 2015 Workstation 12 / Fusion 8 releases, OpenGL 3.3
 is supported in the guest.
 This requires:
+</p>
 <ul>
 <li>The VM is configured for virtual hardware version 12.
 <li>The host OS, GPU and graphics driver supports DX11 (Windows) or
@@ -37,7 +38,6 @@ This requires:
 <li>On Linux, the vmwgfx kernel module must be version 2.9.0 or later.
 <li>A recent version of Mesa with the updated svga gallium driver.
 </ul>
-</p>
 
 <p>
 Otherwise, OpenGL 2.1 is supported.