From 41573d486fb933012ffb411b49b5cb56b3605865 Mon Sep 17 00:00:00 2001
From: Erik Faye-Lund <erik.faye-lund@collabora.com>
Date: Thu, 18 Apr 2019 16:12:08 +0200
Subject: [PATCH] docs: close paragraphs before preformatted text

It's illegal to nest block-level elements such as <pre> inside <p> in
HTML. This means that when the paragraphs gets closed after a <pre>-tag,
we end up closing a non-existent tag, so the browser inserts a dummy
<p>-tag. This is entirely pointless, so let's just close these tags
before the <pre>-tag instead.

Signed-off-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
---
 docs/application-issues.html | 2 ++
 docs/download.html           | 4 ++--
 docs/meson.html              | 6 +++---
 docs/submittingpatches.html  | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/application-issues.html b/docs/application-issues.html
index 005d9f585fb..a0fdf9c30f4 100644
--- a/docs/application-issues.html
+++ b/docs/application-issues.html
@@ -62,9 +62,11 @@ older than the given year.
 
 <p>
 For example, if the game was released in 2001, do
+</p>
 <pre>
 export MESA_EXTENSION_MAX_YEAR=2001
 </pre>
+<p>
 before running the game.
 </p>
 
diff --git a/docs/download.html b/docs/download.html
index 840f363cdf6..3807f836d14 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -46,14 +46,14 @@ Mesa releases are available in two formats: <tt>.tar.xz</tt> and <tt>.tar.gz</tt
 
 <p>
 To unpack the tarball:
+</p>
 <pre>
 	tar xf mesa-Y.N.P.tar.xz
 </pre>
-or
+<p>or</p>
 <pre>
 	tar xf mesa-Y.N.P.tar.gz
 </pre>
-</p>
 
 
 <h1>Contents</h1>
diff --git a/docs/meson.html b/docs/meson.html
index b516a459c3a..f52ec08fbbf 100644
--- a/docs/meson.html
+++ b/docs/meson.html
@@ -357,6 +357,7 @@ of those, as they'll have the right values for your system:
 
 <p>
 32-bit build on x86 linux:
+</p>
 <pre>
 [binaries]
 c = '/usr/bin/gcc'
@@ -378,10 +379,10 @@ cpu_family = 'x86'
 cpu = 'i686'
 endian = 'little'
 </pre>
-</p>
 
 <p>
 64-bit build on ARM linux:
+</p>
 <pre>
 [binaries]
 c = '/usr/bin/aarch64-linux-gnu-gcc'
@@ -397,10 +398,10 @@ cpu_family = 'aarch64'
 cpu = 'aarch64'
 endian = 'little'
 </pre>
-</p>
 
 <p>
 64-bit build on x86 windows:
+</p>
 <pre>
 [binaries]
 c = '/usr/bin/x86_64-w64-mingw32-gcc'
@@ -416,7 +417,6 @@ cpu_family = 'x86_64'
 cpu = 'i686'
 endian = 'little'
 </pre>
-</p>
 
 </div>
 </body>
diff --git a/docs/submittingpatches.html b/docs/submittingpatches.html
index 6b9a07357b3..4afa56f5e0b 100644
--- a/docs/submittingpatches.html
+++ b/docs/submittingpatches.html
@@ -239,8 +239,8 @@ your email administrator for this.)
 <p>
   Tick the following when creating the MR. It allows developers to
   rebase your work on top of master.
-  <pre>Allow commits from members who can merge to the target branch</pre>
 </p>
+<pre>Allow commits from members who can merge to the target branch</pre>
 <p>
   If you revise your patches based on code review and push an update
   to your branch, you should maintain a <strong>clean</strong> history
-- 
2.30.2