From 672ab6384a0dbec0f5a09ca7d5437f28aa21c5fe Mon Sep 17 00:00:00 2001
From: David Waern <david.waern@gmail.com>
Date: Fri, 25 Nov 2011 02:13:38 +0100
Subject: Accept test output.

---
 tests/html-tests/tests/A.html.ref                |  21 +-
 tests/html-tests/tests/B.html.ref                |  24 +-
 tests/html-tests/tests/Bug1.html.ref             |  30 +-
 tests/html-tests/tests/Bug2.html.ref             |  24 +-
 tests/html-tests/tests/Bug3.html.ref             |  30 +-
 tests/html-tests/tests/Bug4.html.ref             |  30 +-
 tests/html-tests/tests/Bug6.html.ref             | 102 ++-
 tests/html-tests/tests/Bug7.html.ref             |  48 +-
 tests/html-tests/tests/Bug8.html.ref             |  33 +-
 tests/html-tests/tests/Bugs.html.ref             |  24 +-
 tests/html-tests/tests/CrossPackageDocs.html.ref | 191 ++++--
 tests/html-tests/tests/Examples.html.ref         |  39 +-
 tests/html-tests/tests/FunArgs.html.ref          |  33 +-
 tests/html-tests/tests/GADTRecords.html.ref      |  99 ++-
 tests/html-tests/tests/Hash.html.ref             | 159 +++--
 tests/html-tests/tests/NamedDoc.html.ref         |  21 +-
 tests/html-tests/tests/NoLayout.html.ref         |  33 +-
 tests/html-tests/tests/NonGreedy.html.ref        |  30 +-
 tests/html-tests/tests/QuasiExpr.html.ref        |  60 +-
 tests/html-tests/tests/QuasiQuote.html.ref       |  24 +-
 tests/html-tests/tests/TH.html.ref               |  21 +-
 tests/html-tests/tests/TH2.html.ref              |  21 +-
 tests/html-tests/tests/Test.html.ref             | 815 +++++++++++++++--------
 tests/html-tests/tests/Ticket112.html.ref        |  27 +-
 tests/html-tests/tests/Ticket61.html.ref         |  21 +-
 tests/html-tests/tests/Ticket75.html.ref         |  39 +-
 tests/html-tests/tests/TypeFamilies.html.ref     |  54 +-
 tests/html-tests/tests/TypeOperators.html.ref    |  60 +-
 tests/html-tests/tests/Visible.html.ref          |  27 +-
 29 files changed, 1487 insertions(+), 653 deletions(-)

(limited to 'tests')

diff --git a/tests/html-tests/tests/A.html.ref b/tests/html-tests/tests/A.html.ref
index eeeadc93..cb25ba99 100644
--- a/tests/html-tests/tests/A.html.ref
+++ b/tests/html-tests/tests/A.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>A</p
 	></div
       ><div id="interface"
@@ -60,8 +70,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");};
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/B.html.ref b/tests/html-tests/tests/B.html.ref
index 6eddf53b..bbb67c2a 100644
--- a/tests/html-tests/tests/B.html.ref
+++ b/tests/html-tests/tests/B.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_B.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_B.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>B</p
 	></div
       ><div id="interface"
@@ -36,15 +46,17 @@ window.onload = function () {pageLoad();setSynopsis("mini_B.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  >module <A HREF="">A</a
+	  >module <a href=""
+	    >A</a
 	    ></p
 	  ></div
 	></div
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/Bug1.html.ref b/tests/html-tests/tests/Bug1.html.ref
index 8a09e162..409ebce9 100644
--- a/tests/html-tests/tests/Bug1.html.ref
+++ b/tests/html-tests/tests/Bug1.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug1.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug1.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>Bug1</p
 	></div
       ><div id="synopsis"
@@ -38,8 +48,10 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug1.html");};
 	><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    >  <A HREF="">T</a
-	    >  = <A HREF="">T</a
+	    >  <a href=""
+	    >T</a
+	    >  = <a href=""
+	    >T</a
 	    ></li
 	  ></ul
 	></div
@@ -57,7 +69,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug1.html");};
 	  ><p
 	    >We should have different anchors for constructors and types/classes.  This
  hyperlink should point to the type constructor by default: <code
-	      ><A HREF="">T</a
+	      ><a href=""
+		>T</a
 		></code
 	      >.
 </p
@@ -81,8 +94,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug1.html");};
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/Bug2.html.ref b/tests/html-tests/tests/Bug2.html.ref
index dd54b953..e570c263 100644
--- a/tests/html-tests/tests/Bug2.html.ref
+++ b/tests/html-tests/tests/Bug2.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug2.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug2.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>Bug2</p
 	></div
       ><div id="interface"
@@ -38,15 +48,17 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug2.html");};
 	><p class="src"
 	  ><a name="v:x" class="def"
 	    >x</a
-	    > :: <A HREF="">A</a
+	    > :: <a href=""
+	    >A</a
 	    ></p
 	  ></div
 	></div
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/Bug3.html.ref b/tests/html-tests/tests/Bug3.html.ref
index 98636a37..369ad9be 100644
--- a/tests/html-tests/tests/Bug3.html.ref
+++ b/tests/html-tests/tests/Bug3.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug3.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug3.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>Bug3</p
 	></div
       ><div id="synopsis"
@@ -36,8 +46,10 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug3.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><A HREF="">foo</a
-	    > :: <A HREF="">Int</a
+	  ><a href=""
+	    >foo</a
+	    > :: <a href=""
+	    >Int</a
 	    ></li
 	  ></ul
 	></div
@@ -48,7 +60,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug3.html");};
 	><p class="src"
 	  ><a name="v:foo" class="def"
 	    >foo</a
-	    > :: <A HREF="">Int</a
+	    > :: <a href=""
+	    >Int</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -61,8 +74,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug3.html");};
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/Bug4.html.ref b/tests/html-tests/tests/Bug4.html.ref
index 6c866839..986ef626 100644
--- a/tests/html-tests/tests/Bug4.html.ref
+++ b/tests/html-tests/tests/Bug4.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug4.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug4.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>Bug4</p
 	></div
       ><div id="synopsis"
@@ -36,8 +46,10 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug4.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><A HREF="">foo</a
-	    > :: <A HREF="">Int</a
+	  ><a href=""
+	    >foo</a
+	    > :: <a href=""
+	    >Int</a
 	    ></li
 	  ></ul
 	></div
@@ -48,7 +60,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug4.html");};
 	><p class="src"
 	  ><a name="v:foo" class="def"
 	    >foo</a
-	    > :: <A HREF="">Int</a
+	    > :: <a href=""
+	    >Int</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -60,8 +73,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug4.html");};
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/Bug6.html.ref b/tests/html-tests/tests/Bug6.html.ref
index eef6c4c8..50484559 100644
--- a/tests/html-tests/tests/Bug6.html.ref
+++ b/tests/html-tests/tests/Bug6.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>Bug6</p
 	></div
       ><div id="description"
@@ -47,52 +57,72 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    >  <A HREF="">A</a
-	    >  = <A HREF="">A</a
-	    > <A HREF="">Int</a
+	    >  <a href=""
+	    >A</a
+	    >  = <a href=""
+	    >A</a
+	    > <a href=""
+	    >Int</a
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    >  <A HREF="">B</a
-	    >  = <A HREF="">B</a
+	    >  <a href=""
+	    >B</a
+	    >  = <a href=""
+	    >B</a
 	    > {<ul class="subs"
 	    ><li
-	      ><A HREF="">b</a
-		> :: <A HREF="">Int</a
+	      ><a href=""
+		>b</a
+		> :: <a href=""
+		>Int</a
 		></li
 	      ></ul
 	    >}</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    >  <A HREF="">C</a
-	    >  = <A HREF="">C</a
+	    >  <a href=""
+	    >C</a
+	    >  = <a href=""
+	    >C</a
 	    > {<ul class="subs"
 	    ><li
-	      ><A HREF="">c1</a
-		> :: <A HREF="">Int</a
+	      ><a href=""
+		>c1</a
+		> :: <a href=""
+		>Int</a
 		></li
 	      ><li
-	      ><A HREF="">c2</a
-		> :: <A HREF="">Int</a
+	      ><a href=""
+		>c2</a
+		> :: <a href=""
+		>Int</a
 		></li
 	      ></ul
 	    >}</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    >  <A HREF="">D</a
-	    >  = <A HREF="">D</a
-	    > <A HREF="">Int</a
-	    > <A HREF="">Int</a
+	    >  <a href=""
+	    >D</a
+	    >  = <a href=""
+	    >D</a
+	    > <a href=""
+	    >Int</a
+	    > <a href=""
+	    >Int</a
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >newtype</span
-	    >  <A HREF="">E</a
-	    >  = <A HREF="">E</a
-	    > <A HREF="">Int</a
+	    >  <a href=""
+	    >E</a
+	    >  = <a href=""
+	    >E</a
+	    > <a href=""
+	    >Int</a
 	    ></li
 	  ></ul
 	></div
@@ -119,7 +149,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	      ><td class="src"
 		><a name="v:A" class="def"
 		  >A</a
-		  > <A HREF="">Int</a
+		  > <a href=""
+		  >Int</a
 		  ></td
 		><td class="doc empty"
 		>&nbsp;</td
@@ -161,7 +192,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 		    ><dt class="src"
 		      ><a name="v:b" class="def"
 			>b</a
-			> :: <A HREF="">Int</a
+			> :: <a href=""
+			>Int</a
 			></dt
 		      ><dd class="doc empty"
 		      >&nbsp;</dd
@@ -207,14 +239,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 		    ><dt class="src"
 		      ><a name="v:c1" class="def"
 			>c1</a
-			> :: <A HREF="">Int</a
+			> :: <a href=""
+			>Int</a
 			></dt
 		      ><dd class="doc empty"
 		      >&nbsp;</dd
 		      ><dt class="src"
 		      ><a name="v:c2" class="def"
 			>c2</a
-			> :: <A HREF="">Int</a
+			> :: <a href=""
+			>Int</a
 			></dt
 		      ><dd class="doc empty"
 		      >&nbsp;</dd
@@ -248,8 +282,10 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	      ><td class="src"
 		><a name="v:D" class="def"
 		  >D</a
-		  > <A HREF="">Int</a
-		  > <A HREF="">Int</a
+		  > <a href=""
+		  >Int</a
+		  > <a href=""
+		  >Int</a
 		  ></td
 		><td class="doc empty"
 		>&nbsp;</td
@@ -277,7 +313,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	      ><td class="src"
 		><a name="v:E" class="def"
 		  >E</a
-		  > <A HREF="">Int</a
+		  > <a href=""
+		  >Int</a
 		  ></td
 		><td class="doc empty"
 		>&nbsp;</td
@@ -289,8 +326,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/Bug7.html.ref b/tests/html-tests/tests/Bug7.html.ref
index 5d86b051..3c774585 100644
--- a/tests/html-tests/tests/Bug7.html.ref
+++ b/tests/html-tests/tests/Bug7.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>Bug7</p
 	></div
       ><div id="description"
@@ -48,13 +58,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");};
 	><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    >  <A HREF="">Foo</a
-	    >  = <A HREF="">Foo</a
+	    >  <a href=""
+	    >Foo</a
+	    >  = <a href=""
+	    >Foo</a
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >class</span
-	    >  <A HREF="">Bar</a
+	    >  <a href=""
+	    >Bar</a
 	    > x y </li
 	  ></ul
 	></div
@@ -94,9 +107,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");};
 	    ><table
 	      ><tr
 		><td class="src"
-		  ><A HREF="">Bar</a
-		    > <A HREF="">Foo</a
-		    > <A HREF="">Foo</a
+		  ><a href=""
+		    >Bar</a
+		    > <a href=""
+		    >Foo</a
+		    > <a href=""
+		    >Foo</a
 		    ></td
 		  ><td class="doc"
 		  ><p
@@ -127,9 +143,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");};
 	    ><table
 	      ><tr
 		><td class="src"
-		  ><A HREF="">Bar</a
-		    > <A HREF="">Foo</a
-		    > <A HREF="">Foo</a
+		  ><a href=""
+		    >Bar</a
+		    > <a href=""
+		    >Foo</a
+		    > <a href=""
+		    >Foo</a
 		    ></td
 		  ><td class="doc"
 		  ><p
@@ -145,8 +164,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");};
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/Bug8.html.ref b/tests/html-tests/tests/Bug8.html.ref
index 1c39a97d..51494258 100644
--- a/tests/html-tests/tests/Bug8.html.ref
+++ b/tests/html-tests/tests/Bug8.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>Bug8</p
 	></div
       ><div id="interface"
@@ -49,8 +59,10 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");};
 	      ><td class="src"
 		><a name="v:Type" class="def"
 		  >Type</a
-		  > (<A HREF="">String</a
-		  >, [<A HREF="">Typ</a
+		  > (<a href=""
+		  >String</a
+		  >, [<a href=""
+		  >Typ</a
 		  >])</td
 		><td class="doc empty"
 		>&nbsp;</td
@@ -59,8 +71,10 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");};
 	      ><td class="src"
 		><a name="v:TFree" class="def"
 		  >TFree</a
-		  > (<A HREF="">String</a
-		  >, [<A HREF="">String</a
+		  > (<a href=""
+		  >String</a
+		  >, [<a href=""
+		  >String</a
 		  >])</td
 		><td class="doc empty"
 		>&nbsp;</td
@@ -72,8 +86,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");};
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/Bugs.html.ref b/tests/html-tests/tests/Bugs.html.ref
index 0fd5f596..4c40b3ac 100644
--- a/tests/html-tests/tests/Bugs.html.ref
+++ b/tests/html-tests/tests/Bugs.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bugs.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bugs.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>Bugs</p
 	></div
       ><div id="interface"
@@ -49,7 +59,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bugs.html");};
 	      ><td class="src"
 		><a name="v:A" class="def"
 		  >A</a
-		  > a (a -&gt; <A HREF="">Int</a
+		  > a (a -&gt; <a href=""
+		  >Int</a
 		  >)</td
 		><td class="doc empty"
 		>&nbsp;</td
@@ -61,8 +72,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bugs.html");};
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/CrossPackageDocs.html.ref b/tests/html-tests/tests/CrossPackageDocs.html.ref
index 3a92128e..6d6903a2 100644
--- a/tests/html-tests/tests/CrossPackageDocs.html.ref
+++ b/tests/html-tests/tests/CrossPackageDocs.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_CrossPackageDocs.html"
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_CrossPackageDocs.html"
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>CrossPackageDocs</p
 	></div
       ><div id="synopsis"
@@ -36,44 +46,64 @@ window.onload = function () {pageLoad();setSynopsis("mini_CrossPackageDocs.html"
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><A HREF="">map</a
+	  ><a href=""
+	    >map</a
 	    > ::  (a -&gt; b) -&gt; [a] -&gt; [b]</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >class</span
-	    >  <A HREF="">Monad</a
+	    >  <a href=""
+	    >Monad</a
 	    > m  <span class="keyword"
 	    >where</span
 	    ><ul class="subs"
 	    ><li
-	      ><A HREF="">(&gt;&gt;=)</a
+	      ><a href=""
+		>(&gt;&gt;=)</a
 		> ::  m a -&gt; (a -&gt; m b) -&gt; m b</li
 	      ><li
-	      ><A HREF="">(&gt;&gt;)</a
+	      ><a href=""
+		>(&gt;&gt;)</a
 		> ::  m a -&gt; m b -&gt; m b</li
 	      ><li
-	      ><A HREF="">return</a
+	      ><a href=""
+		>return</a
 		> ::  a -&gt; m a</li
 	      ><li
-	      ><A HREF="">fail</a
-		> ::  <A HREF="">String</a
+	      ><a href=""
+		>fail</a
+		> ::  <a href=""
+		>String</a
 		> -&gt; m a</li
 	      ></ul
 	    ></li
 	  ><li class="src short"
-	  ><A HREF="">runInteractiveProcess</a
-	    > :: <A HREF="">FilePath</a
-	    > -&gt; [<A HREF="">String</a
-	    >] -&gt; <A HREF="">Maybe</a
-	    > <A HREF="">FilePath</a
-	    > -&gt; <A HREF="">Maybe</a
-	    > [(<A HREF="">String</a
-	    >, <A HREF="">String</a
-	    >)] -&gt; <A HREF="">IO</a
-	    > (<A HREF="">Handle</a
-	    >, <A HREF="">Handle</a
-	    >, <A HREF="">Handle</a
-	    >, <A HREF="">ProcessHandle</a
+	  ><a href=""
+	    >runInteractiveProcess</a
+	    > :: <a href=""
+	    >FilePath</a
+	    > -&gt; [<a href=""
+	    >String</a
+	    >] -&gt; <a href=""
+	    >Maybe</a
+	    > <a href=""
+	    >FilePath</a
+	    > -&gt; <a href=""
+	    >Maybe</a
+	    > [(<a href=""
+	    >String</a
+	    >, <a href=""
+	    >String</a
+	    >)] -&gt; <a href=""
+	    >IO</a
+	    > (<a href=""
+	    >Handle</a
+	    >, <a href=""
+	    >Handle</a
+	    >, <a href=""
+	    >Handle</a
+	    >, <a href=""
+	    >ProcessHandle</a
 	    >)</li
 	  ></ul
 	></div
@@ -88,7 +118,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_CrossPackageDocs.html"
 	  ><div class="doc"
 	  ><p
 	    ><code
-	      ><A HREF="">map</a
+	      ><a href=""
+		>map</a
 		></code
 	      > <code
 	      >f xs</code
@@ -117,7 +148,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_CrossPackageDocs.html"
 	  ><div class="doc"
 	  ><p
 	    >The <code
-	      ><A HREF="">Monad</a
+	      ><a href=""
+		>Monad</a
 		></code
 	      > class defines the basic operations over a <em
 	      >monad</em
@@ -136,16 +168,19 @@ monadic expressions.
 </p
 	    ><p
 	    >Minimal complete definition: <code
-	      ><A HREF="">&gt;&gt;=</a
+	      ><a href=""
+		>&gt;&gt;=</a
 		></code
 	      > and <code
-	      ><A HREF="">return</a
+	      ><a href=""
+		>return</a
 		></code
 	      >.
 </p
 	    ><p
 	    >Instances of <code
-	      ><A HREF="">Monad</a
+	      ><a href=""
+		>Monad</a
 		></code
 	      > should satisfy the following laws:
 </p
@@ -156,10 +191,12 @@ monadic expressions.
 </pre
 	    ><p
 	    >Instances of both <code
-	      ><A HREF="">Monad</a
+	      ><a href=""
+		>Monad</a
 		></code
 	      > and <code
-	      ><A HREF="">Functor</a
+	      ><a href=""
+		>Functor</a
 		></code
 	      > should additionally satisfy the law:
 </p
@@ -168,14 +205,16 @@ monadic expressions.
 </pre
 	    ><p
 	    >The instances of <code
-	      ><A HREF="">Monad</a
+	      ><a href=""
+		>Monad</a
 		></code
 	      > for lists, <code
 	      >Data.Maybe.Maybe</code
 	      > and <code
 	      >System.IO.IO</code
 	      >
-defined in the <A HREF="">Prelude</a
+defined in the <a href=""
+	      >Prelude</a
 	      > satisfy these laws.
 </p
 	    ></div
@@ -215,7 +254,8 @@ defined in the <A HREF="">Prelude</a
 	    ><p class="src"
 	    ><a name="v:fail" class="def"
 	      >fail</a
-	      > ::  <A HREF="">String</a
+	      > ::  <a href=""
+	      >String</a
 	      > -&gt; m a</p
 	    ><div class="doc"
 	    ><p
@@ -234,45 +274,62 @@ defined in the <A HREF="">Prelude</a
 	    ><table
 	      ><tr
 		><td class="src"
-		  ><A HREF="">Monad</a
+		  ><a href=""
+		    >Monad</a
 		    > []</td
 		  ><td class="doc empty"
 		  >&nbsp;</td
 		  ></tr
 		><tr
 		><td class="src"
-		  ><A HREF="">Monad</a
-		    > <A HREF="">IO</a
+		  ><a href=""
+		    >Monad</a
+		    > <a href=""
+		    >IO</a
 		    ></td
 		  ><td class="doc empty"
 		  >&nbsp;</td
 		  ></tr
 		><tr
 		><td class="src"
-		  ><A HREF="">Monad</a
+		  ><a href=""
+		    >Monad</a
 		    > Q</td
 		  ><td class="doc empty"
 		  >&nbsp;</td
 		  ></tr
 		><tr
 		><td class="src"
-		  ><A HREF="">Monad</a
-		    > <A HREF="">Maybe</a
+		  ><a href=""
+		    >Monad</a
+		    > <a href=""
+		    >Maybe</a
 		    ></td
 		  ><td class="doc empty"
 		  >&nbsp;</td
 		  ></tr
 		><tr
 		><td class="src"
-		  ><A HREF="">Monad</a
+		  ><a href=""
+		    >Monad</a
+		    > PprM</td
+		  ><td class="doc empty"
+		  >&nbsp;</td
+		  ></tr
+		><tr
+		><td class="src"
+		  ><a href=""
+		    >Monad</a
 		    > ((-&gt;) r)</td
 		  ><td class="doc empty"
 		  >&nbsp;</td
 		  ></tr
 		><tr
 		><td class="src"
-		  ><A HREF="">Monad</a
-		    > (<A HREF="">Either</a
+		  ><a href=""
+		    >Monad</a
+		    > (<a href=""
+		    >Either</a
 		    > e)</td
 		  ><td class="doc empty"
 		  >&nbsp;</td
@@ -292,7 +349,8 @@ defined in the <A HREF="">Prelude</a
 	    ><table
 	    ><tr
 	      ><td class="src"
-		>:: <A HREF="">FilePath</a
+		>:: <a href=""
+		  >FilePath</a
 		  ></td
 		><td class="doc"
 		><p
@@ -302,7 +360,8 @@ defined in the <A HREF="">Prelude</a
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; [<A HREF="">String</a
+		>-&gt; [<a href=""
+		  >String</a
 		  >]</td
 		><td class="doc"
 		><p
@@ -312,8 +371,10 @@ defined in the <A HREF="">Prelude</a
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <A HREF="">Maybe</a
-		  > <A HREF="">FilePath</a
+		>-&gt; <a href=""
+		  >Maybe</a
+		  > <a href=""
+		  >FilePath</a
 		  ></td
 		><td class="doc"
 		><p
@@ -323,9 +384,12 @@ defined in the <A HREF="">Prelude</a
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <A HREF="">Maybe</a
-		  > [(<A HREF="">String</a
-		  >, <A HREF="">String</a
+		>-&gt; <a href=""
+		  >Maybe</a
+		  > [(<a href=""
+		  >String</a
+		  >, <a href=""
+		  >String</a
 		  >)]</td
 		><td class="doc"
 		><p
@@ -335,11 +399,16 @@ defined in the <A HREF="">Prelude</a
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <A HREF="">IO</a
-		  > (<A HREF="">Handle</a
-		  >, <A HREF="">Handle</a
-		  >, <A HREF="">Handle</a
-		  >, <A HREF="">ProcessHandle</a
+		>-&gt; <a href=""
+		  >IO</a
+		  > (<a href=""
+		  >Handle</a
+		  >, <a href=""
+		  >Handle</a
+		  >, <a href=""
+		  >Handle</a
+		  >, <a href=""
+		  >ProcessHandle</a
 		  >)</td
 		><td class="doc empty"
 		>&nbsp;</td
@@ -349,7 +418,8 @@ defined in the <A HREF="">Prelude</a
 	  ><div class="doc"
 	  ><p
 	    >Runs a raw command, and returns <code
-	      ><A HREF="">Handle</a
+	      ><a href=""
+		>Handle</a
 		></code
 	      >s that may be used to communicate
      with the process via its <code
@@ -369,11 +439,13 @@ defined in the <A HREF="">Prelude</a
 </pre
 	    ><p
 	    >The <code
-	      ><A HREF="">Handle</a
+	      ><a href=""
+		>Handle</a
 		></code
 	      >s are initially in binary mode; if you need them to be
     in text mode then use <code
-	      ><A HREF="">hSetBinaryMode</a
+	      ><a href=""
+		>hSetBinaryMode</a
 		></code
 	      >.
 </p
@@ -383,8 +455,9 @@ defined in the <A HREF="">Prelude</a
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/Examples.html.ref b/tests/html-tests/tests/Examples.html.ref
index 61fcff1c..834d870e 100644
--- a/tests/html-tests/tests/Examples.html.ref
+++ b/tests/html-tests/tests/Examples.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_Examples.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Examples.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>Examples</p
 	></div
       ><div id="synopsis"
@@ -36,9 +46,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_Examples.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><A HREF="">fib</a
-	    > :: <A HREF="">Integer</a
-	    > -&gt; <A HREF="">Integer</a
+	  ><a href=""
+	    >fib</a
+	    > :: <a href=""
+	    >Integer</a
+	    > -&gt; <a href=""
+	    >Integer</a
 	    ></li
 	  ></ul
 	></div
@@ -49,13 +62,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_Examples.html");};
 	><p class="src"
 	  ><a name="v:fib" class="def"
 	    >fib</a
-	    > :: <A HREF="">Integer</a
-	    > -&gt; <A HREF="">Integer</a
+	    > :: <a href=""
+	    >Integer</a
+	    > -&gt; <a href=""
+	    >Integer</a
 	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Fibonacci number of given <code
-	      ><A HREF="">Integer</a
+	      ><a href=""
+		>Integer</a
 		></code
 	      >.
 </p
@@ -154,8 +170,9 @@ bar
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/FunArgs.html.ref b/tests/html-tests/tests/FunArgs.html.ref
index e470d34c..1e689a18 100644
--- a/tests/html-tests/tests/FunArgs.html.ref
+++ b/tests/html-tests/tests/FunArgs.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>FunArgs</p
 	></div
       ><div id="interface"
@@ -47,14 +57,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 	      ><td class="src"
 		>:: <span class="keyword"
 		  >forall</span
-		  > a . <A HREF="">Ord</a
+		  > a . <a href=""
+		  >Ord</a
 		  > a</td
 		><td class="doc empty"
 		>&nbsp;</td
 		></tr
 	      ><tr
 	      ><td class="src"
-		>=&gt; <A HREF="">Int</a
+		>=&gt; <a href=""
+		  >Int</a
 		  ></td
 		><td class="doc"
 		><p
@@ -73,7 +85,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <A HREF="">Bool</a
+		>-&gt; <a href=""
+		  >Bool</a
 		  ></td
 		><td class="doc"
 		><p
@@ -92,7 +105,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <A HREF="">()</a
+		>-&gt; <a href=""
+		  >()</a
 		  ></td
 		><td class="doc"
 		><p
@@ -155,8 +169,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/GADTRecords.html.ref b/tests/html-tests/tests/GADTRecords.html.ref
index 9e453429..1cf3d663 100644
--- a/tests/html-tests/tests/GADTRecords.html.ref
+++ b/tests/html-tests/tests/GADTRecords.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>GADTRecords</p
 	></div
       ><div id="synopsis"
@@ -38,40 +48,56 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
 	><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    >  <A HREF="">H1</a
+	    >  <a href=""
+	    >H1</a
 	    > a b <span class="keyword"
 	    >where</span
 	    ><ul class="subs"
 	    ><li
-	      ><A HREF="">C1</a
-		> ::  <A HREF="">H1</a
+	      ><a href=""
+		>C1</a
+		> ::  <a href=""
+		>H1</a
 		> a b  </li
 	      ><li
-	      ><A HREF="">C2</a
-		> :: <A HREF="">Ord</a
-		> a =&gt; [a] -&gt; <A HREF="">H1</a
+	      ><a href=""
+		>C2</a
+		> :: <a href=""
+		>Ord</a
+		> a =&gt; [a] -&gt; <a href=""
+		>H1</a
 		> a a  </li
 	      ><li
-	      ><A HREF="">C3</a
+	      ><a href=""
+		>C3</a
 		> ::  { <ul class="subs"
 		><li
-		  ><A HREF="">field</a
-		    > :: <A HREF="">Int</a
+		  ><a href=""
+		    >field</a
+		    > :: <a href=""
+		    >Int</a
 		    ></li
 		  ></ul
-		> } -&gt; <A HREF="">H1</a
-		> <A HREF="">Int</a
-		> <A HREF="">Int</a
+		> } -&gt; <a href=""
+		>H1</a
+		> <a href=""
+		>Int</a
+		> <a href=""
+		>Int</a
 		></li
 	      ><li
-	      ><A HREF="">C4</a
+	      ><a href=""
+		>C4</a
 		> ::  { <ul class="subs"
 		><li
-		  ><A HREF="">field2</a
+		  ><a href=""
+		    >field2</a
 		    > :: a</li
 		  ></ul
-		> } -&gt; <A HREF="">H1</a
-		> <A HREF="">Int</a
+		> } -&gt; <a href=""
+		>H1</a
+		> <a href=""
+		>Int</a
 		> a</li
 	      ></ul
 	    ></li
@@ -102,7 +128,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
 	      ><td class="src"
 		><a name="v:C1" class="def"
 		  >C1</a
-		  > ::  <A HREF="">H1</a
+		  > ::  <a href=""
+		  >H1</a
 		  > a b</td
 		><td class="doc empty"
 		>&nbsp;</td
@@ -111,8 +138,10 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
 	      ><td class="src"
 		><a name="v:C2" class="def"
 		  >C2</a
-		  > :: <A HREF="">Ord</a
-		  > a =&gt; [a] -&gt; <A HREF="">H1</a
+		  > :: <a href=""
+		  >Ord</a
+		  > a =&gt; [a] -&gt; <a href=""
+		  >H1</a
 		  > a a</td
 		><td class="doc empty"
 		>&nbsp;</td
@@ -121,10 +150,14 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
 	      ><td class="src"
 		><a name="v:C3" class="def"
 		  >C3</a
-		  > ::  <A HREF="">Int</a
-		  > -&gt; <A HREF="">H1</a
-		  > <A HREF="">Int</a
-		  > <A HREF="">Int</a
+		  > ::  <a href=""
+		  >Int</a
+		  > -&gt; <a href=""
+		  >H1</a
+		  > <a href=""
+		  >Int</a
+		  > <a href=""
+		  >Int</a
 		  ></td
 		><td class="doc empty"
 		>&nbsp;</td
@@ -138,7 +171,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
 		    ><dt class="src"
 		      ><a name="v:field" class="def"
 			>field</a
-			> :: <A HREF="">Int</a
+			> :: <a href=""
+			>Int</a
 			></dt
 		      ><dd class="doc"
 		      ><p
@@ -155,8 +189,10 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
 	      ><td class="src"
 		><a name="v:C4" class="def"
 		  >C4</a
-		  > ::  a -&gt; <A HREF="">H1</a
-		  > <A HREF="">Int</a
+		  > ::  a -&gt; <a href=""
+		  >H1</a
+		  > <a href=""
+		  >Int</a
 		  > a</td
 		><td class="doc empty"
 		>&nbsp;</td
@@ -189,8 +225,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/Hash.html.ref b/tests/html-tests/tests/Hash.html.ref
index 6294949f..fc92461a 100644
--- a/tests/html-tests/tests/Hash.html.ref
+++ b/tests/html-tests/tests/Hash.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>Hash</p
 	></div
       ><div id="table-of-contents"
@@ -36,13 +46,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	>Contents</p
 	><ul
 	><li
-	  ><A HREF="">The <code
+	  ><a href=""
+	    >The <code
 	      >HashTable</code
 	      > type
 </a
 	    ><ul
 	    ><li
-	      ><A HREF="">Operations on <code
+	      ><a href=""
+		>Operations on <code
 		  >HashTable</code
 		  >s
 </a
@@ -50,7 +62,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	      ></ul
 	    ></li
 	  ><li
-	  ><A HREF="">The <code
+	  ><a href=""
+	    >The <code
 	      >Hash</code
 	      > class
 </a
@@ -74,39 +87,58 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    >  <A HREF="">HashTable</a
+	    >  <a href=""
+	    >HashTable</a
 	    > key val</li
 	  ><li class="src short"
-	  ><A HREF="">new</a
-	    > :: (<A HREF="">Eq</a
-	    > key, <A HREF="">Hash</a
-	    > key) =&gt; <A HREF="">Int</a
-	    > -&gt; <A HREF="">IO</a
-	    > (<A HREF="">HashTable</a
+	  ><a href=""
+	    >new</a
+	    > :: (<a href=""
+	    >Eq</a
+	    > key, <a href=""
+	    >Hash</a
+	    > key) =&gt; <a href=""
+	    >Int</a
+	    > -&gt; <a href=""
+	    >IO</a
+	    > (<a href=""
+	    >HashTable</a
 	    > key val)</li
 	  ><li class="src short"
-	  ><A HREF="">insert</a
-	    > :: (<A HREF="">Eq</a
-	    > key, <A HREF="">Hash</a
-	    > key) =&gt; key -&gt; val -&gt; <A HREF="">IO</a
-	    > <A HREF="">()</a
+	  ><a href=""
+	    >insert</a
+	    > :: (<a href=""
+	    >Eq</a
+	    > key, <a href=""
+	    >Hash</a
+	    > key) =&gt; key -&gt; val -&gt; <a href=""
+	    >IO</a
+	    > <a href=""
+	    >()</a
 	    ></li
 	  ><li class="src short"
-	  ><A HREF="">lookup</a
-	    > :: <A HREF="">Hash</a
-	    > key =&gt; key -&gt; <A HREF="">IO</a
-	    > (<A HREF="">Maybe</a
+	  ><a href=""
+	    >lookup</a
+	    > :: <a href=""
+	    >Hash</a
+	    > key =&gt; key -&gt; <a href=""
+	    >IO</a
+	    > (<a href=""
+	    >Maybe</a
 	    > val)</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >class</span
-	    >  <A HREF="">Hash</a
+	    >  <a href=""
+	    >Hash</a
 	    > a  <span class="keyword"
 	    >where</span
 	    ><ul class="subs"
 	    ><li
-	      ><A HREF="">hash</a
-		> :: a -&gt; <A HREF="">Int</a
+	      ><a href=""
+		>hash</a
+		> :: a -&gt; <a href=""
+		>Int</a
 		></li
 	      ></ul
 	    ></li
@@ -135,7 +167,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
  The type <code
 	      >key</code
 	      > should be an instance of <code
-	      ><A HREF="">Eq</a
+	      ><a href=""
+		>Eq</a
 		></code
 	      >.
 </p
@@ -150,11 +183,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	><p class="src"
 	  ><a name="v:new" class="def"
 	    >new</a
-	    > :: (<A HREF="">Eq</a
-	    > key, <A HREF="">Hash</a
-	    > key) =&gt; <A HREF="">Int</a
-	    > -&gt; <A HREF="">IO</a
-	    > (<A HREF="">HashTable</a
+	    > :: (<a href=""
+	    >Eq</a
+	    > key, <a href=""
+	    >Hash</a
+	    > key) =&gt; <a href=""
+	    >Int</a
+	    > -&gt; <a href=""
+	    >IO</a
+	    > (<a href=""
+	    >HashTable</a
 	    > key val)</p
 	  ><div class="doc"
 	  ><p
@@ -166,10 +204,14 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	><p class="src"
 	  ><a name="v:insert" class="def"
 	    >insert</a
-	    > :: (<A HREF="">Eq</a
-	    > key, <A HREF="">Hash</a
-	    > key) =&gt; key -&gt; val -&gt; <A HREF="">IO</a
-	    > <A HREF="">()</a
+	    > :: (<a href=""
+	    >Eq</a
+	    > key, <a href=""
+	    >Hash</a
+	    > key) =&gt; key -&gt; val -&gt; <a href=""
+	    >IO</a
+	    > <a href=""
+	    >()</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -181,20 +223,25 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	><p class="src"
 	  ><a name="v:lookup" class="def"
 	    >lookup</a
-	    > :: <A HREF="">Hash</a
-	    > key =&gt; key -&gt; <A HREF="">IO</a
-	    > (<A HREF="">Maybe</a
+	    > :: <a href=""
+	    >Hash</a
+	    > key =&gt; key -&gt; <a href=""
+	    >IO</a
+	    > (<a href=""
+	    >Maybe</a
 	    > val)</p
 	  ><div class="doc"
 	  ><p
 	    >Looks up a key in the hash table, returns <code
 	      ><code
-		><A HREF="">Just</a
+		><a href=""
+		  >Just</a
 		  ></code
 		> val</code
 	      > if the key
  was found, or <code
-	      ><A HREF="">Nothing</a
+	      ><a href=""
+		>Nothing</a
 		></code
 	      > otherwise.
 </p
@@ -225,14 +272,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	    ><p class="src"
 	    ><a name="v:hash" class="def"
 	      >hash</a
-	      > :: a -&gt; <A HREF="">Int</a
+	      > :: a -&gt; <a href=""
+	      >Int</a
 	      ></p
 	    ><div class="doc"
 	    ><p
 	      >hashes the value of type <code
 		>a</code
 		> into an <code
-		><A HREF="">Int</a
+		><a href=""
+		  >Int</a
 		  ></code
 		>
 </p
@@ -245,25 +294,32 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	    ><table
 	      ><tr
 		><td class="src"
-		  ><A HREF="">Hash</a
-		    > <A HREF="">Float</a
+		  ><a href=""
+		    >Hash</a
+		    > <a href=""
+		    >Float</a
 		    ></td
 		  ><td class="doc empty"
 		  >&nbsp;</td
 		  ></tr
 		><tr
 		><td class="src"
-		  ><A HREF="">Hash</a
-		    > <A HREF="">Int</a
+		  ><a href=""
+		    >Hash</a
+		    > <a href=""
+		    >Int</a
 		    ></td
 		  ><td class="doc empty"
 		  >&nbsp;</td
 		  ></tr
 		><tr
 		><td class="src"
-		  >(<A HREF="">Hash</a
-		    > a, <A HREF="">Hash</a
-		    > b) =&gt; <A HREF="">Hash</a
+		  >(<a href=""
+		    >Hash</a
+		    > a, <a href=""
+		    >Hash</a
+		    > b) =&gt; <a href=""
+		    >Hash</a
 		    > (a, b)</td
 		  ><td class="doc empty"
 		  >&nbsp;</td
@@ -276,8 +332,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/NamedDoc.html.ref b/tests/html-tests/tests/NamedDoc.html.ref
index 29be6dd7..90216736 100644
--- a/tests/html-tests/tests/NamedDoc.html.ref
+++ b/tests/html-tests/tests/NamedDoc.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_NamedDoc.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_NamedDoc.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>NamedDoc</p
 	></div
       ><div id="synopsis"
@@ -49,8 +59,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_NamedDoc.html");};
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/NoLayout.html.ref b/tests/html-tests/tests/NoLayout.html.ref
index 1684257c..9d34555e 100644
--- a/tests/html-tests/tests/NoLayout.html.ref
+++ b/tests/html-tests/tests/NoLayout.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_NoLayout.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_NoLayout.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>NoLayout</p
 	></div
       ><div id="synopsis"
@@ -36,8 +46,10 @@ window.onload = function () {pageLoad();setSynopsis("mini_NoLayout.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><A HREF="">g</a
-	    > :: <A HREF="">Int</a
+	  ><a href=""
+	    >g</a
+	    > :: <a href=""
+	    >Int</a
 	    ></li
 	  ></ul
 	></div
@@ -48,12 +60,14 @@ window.onload = function () {pageLoad();setSynopsis("mini_NoLayout.html");};
 	><p class="src"
 	  ><a name="v:g" class="def"
 	    >g</a
-	    > :: <A HREF="">Int</a
+	    > :: <a href=""
+	    >Int</a
 	    ></p
 	  ><div class="doc"
 	  ><p
 	    >the function <code
-	      ><A HREF="">g</a
+	      ><a href=""
+		>g</a
 		></code
 	      >
 </p
@@ -63,8 +77,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_NoLayout.html");};
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/NonGreedy.html.ref b/tests/html-tests/tests/NonGreedy.html.ref
index b22f4792..1f4efc8a 100644
--- a/tests/html-tests/tests/NonGreedy.html.ref
+++ b/tests/html-tests/tests/NonGreedy.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_NonGreedy.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_NonGreedy.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>NonGreedy</p
 	></div
       ><div id="synopsis"
@@ -36,7 +46,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_NonGreedy.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><A HREF="">f</a
+	  ><a href=""
+	    >f</a
 	    > ::  a</li
 	  ></ul
 	></div
@@ -50,8 +61,10 @@ window.onload = function () {pageLoad();setSynopsis("mini_NonGreedy.html");};
 	    > ::  a</p
 	  ><div class="doc"
 	  ><p
-	    ><A HREF="">url1</a
-	      > <A HREF="">url2</a
+	    ><a href=""
+	      >url1</a
+	      > <a href=""
+	      >url2</a
 	      >
 </p
 	    ></div
@@ -60,8 +73,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_NonGreedy.html");};
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/QuasiExpr.html.ref b/tests/html-tests/tests/QuasiExpr.html.ref
index 2972f4ef..cb8b7e78 100644
--- a/tests/html-tests/tests/QuasiExpr.html.ref
+++ b/tests/html-tests/tests/QuasiExpr.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>QuasiExpr</p
 	></div
       ><div id="interface"
@@ -49,7 +59,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 	      ><td class="src"
 		><a name="v:IntExpr" class="def"
 		  >IntExpr</a
-		  > <A HREF="">Integer</a
+		  > <a href=""
+		  >Integer</a
 		  ></td
 		><td class="doc empty"
 		>&nbsp;</td
@@ -58,7 +69,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 	      ><td class="src"
 		><a name="v:AntiIntExpr" class="def"
 		  >AntiIntExpr</a
-		  > <A HREF="">String</a
+		  > <a href=""
+		  >String</a
 		  ></td
 		><td class="doc empty"
 		>&nbsp;</td
@@ -67,9 +79,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 	      ><td class="src"
 		><a name="v:BinopExpr" class="def"
 		  >BinopExpr</a
-		  > <A HREF="">BinOp</a
-		  > <A HREF="">Expr</a
-		  > <A HREF="">Expr</a
+		  > <a href=""
+		  >BinOp</a
+		  > <a href=""
+		  >Expr</a
+		  > <a href=""
+		  >Expr</a
 		  ></td
 		><td class="doc empty"
 		>&nbsp;</td
@@ -78,7 +93,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 	      ><td class="src"
 		><a name="v:AntiExpr" class="def"
 		  >AntiExpr</a
-		  > <A HREF="">String</a
+		  > <a href=""
+		  >String</a
 		  ></td
 		><td class="doc empty"
 		>&nbsp;</td
@@ -92,8 +108,10 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 	    ><table
 	      ><tr
 		><td class="src"
-		  ><A HREF="">Show</a
-		    > <A HREF="">Expr</a
+		  ><a href=""
+		    >Show</a
+		    > <a href=""
+		    >Expr</a
 		    ></td
 		  ><td class="doc empty"
 		  >&nbsp;</td
@@ -154,8 +172,10 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 	    ><table
 	      ><tr
 		><td class="src"
-		  ><A HREF="">Show</a
-		    > <A HREF="">BinOp</a
+		  ><a href=""
+		    >Show</a
+		    > <a href=""
+		    >BinOp</a
 		    ></td
 		  ><td class="doc empty"
 		  >&nbsp;</td
@@ -168,23 +188,27 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 	><p class="src"
 	  ><a name="v:eval" class="def"
 	    >eval</a
-	    > :: <A HREF="">Expr</a
-	    > -&gt; <A HREF="">Integer</a
+	    > :: <a href=""
+	    >Expr</a
+	    > -&gt; <a href=""
+	    >Integer</a
 	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
 	  ><a name="v:parseExprExp" class="def"
 	    >parseExprExp</a
-	    > :: <A HREF="">String</a
+	    > :: <a href=""
+	    >String</a
 	    > -&gt; Q Exp</p
 	  ></div
 	></div
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/QuasiQuote.html.ref b/tests/html-tests/tests/QuasiQuote.html.ref
index 55090e27..8a4a0427 100644
--- a/tests/html-tests/tests/QuasiQuote.html.ref
+++ b/tests/html-tests/tests/QuasiQuote.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiQuote.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiQuote.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>QuasiQuote</p
 	></div
       ><div id="interface"
@@ -38,15 +48,17 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiQuote.html");};
 	><p class="src"
 	  ><a name="v:val" class="def"
 	    >val</a
-	    > :: <A HREF="">Integer</a
+	    > :: <a href=""
+	    >Integer</a
 	    ></p
 	  ></div
 	></div
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/TH.html.ref b/tests/html-tests/tests/TH.html.ref
index ac27f593..7d6cbbf2 100644
--- a/tests/html-tests/tests/TH.html.ref
+++ b/tests/html-tests/tests/TH.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_TH.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_TH.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>TH</p
 	></div
       ><div id="interface"
@@ -44,8 +54,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_TH.html");};
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/TH2.html.ref b/tests/html-tests/tests/TH2.html.ref
index 64e2d4dc..a1d30c02 100644
--- a/tests/html-tests/tests/TH2.html.ref
+++ b/tests/html-tests/tests/TH2.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_TH2.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_TH2.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>TH2</p
 	></div
       ><div id="interface"
@@ -36,8 +46,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_TH2.html");};
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/Test.html.ref b/tests/html-tests/tests/Test.html.ref
index 6a90504e..e46f96b5 100644
--- a/tests/html-tests/tests/Test.html.ref
+++ b/tests/html-tests/tests/Test.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -47,6 +49,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><td
 	    >libraries@haskell.org</td
 	    ></tr
+	  ><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
 	  ></table
 	><p class="caption"
 	>Test</p
@@ -56,53 +64,65 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	>Contents</p
 	><ul
 	><li
-	  ><A HREF="">Type declarations
+	  ><a href=""
+	    >Type declarations
 </a
 	    ><ul
 	    ><li
-	      ><A HREF="">Data types
+	      ><a href=""
+		>Data types
 </a
 		></li
 	      ><li
-	      ><A HREF="">Records
+	      ><a href=""
+		>Records
 </a
 		></li
 	      ></ul
 	    ></li
 	  ><li
-	  ><A HREF="">Class declarations
+	  ><a href=""
+	    >Class declarations
 </a
 	    ></li
 	  ><li
-	  ><A HREF="">Function types
+	  ><a href=""
+	    >Function types
 </a
 	    ></li
 	  ><li
-	  ><A HREF="">Auxiliary stuff
+	  ><a href=""
+	    >Auxiliary stuff
 </a
 	    ></li
 	  ><li
-	  ><A HREF="">A hidden module
+	  ><a href=""
+	    >A hidden module
 </a
 	    ></li
 	  ><li
-	  ><A HREF="">A visible module
+	  ><a href=""
+	    >A visible module
 </a
 	    ></li
 	  ><li
-	  ><A HREF="">Existential / Universal types
+	  ><a href=""
+	    >Existential / Universal types
 </a
 	    ></li
 	  ><li
-	  ><A HREF="">Type signatures with argument docs
+	  ><a href=""
+	    >Type signatures with argument docs
 </a
 	    ></li
 	  ><li
-	  ><A HREF="">A section
+	  ><a href=""
+	    >A section
 </a
 	    ><ul
 	    ><li
-	      ><A HREF="">A subsection 
+	      ><a href=""
+		>A subsection 
 </a
 		></li
 	      ></ul
@@ -116,16 +136,20 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p
 	  >This module illustrates &amp; tests most of the features of Haddock.
  Testing references from the description: <code
-	    ><A HREF="">T</a
+	    ><a href=""
+	      >T</a
 	      ></code
 	    >, <code
-	    ><A HREF="">f</a
+	    ><a href=""
+	      >f</a
 	      ></code
 	    >, <code
-	    ><A HREF="">g</a
+	    ><a href=""
+	      >g</a
 	      ></code
 	    >, <code
-	    ><A HREF="">visible</a
+	    ><a href=""
+	      >visible</a
 	      ></code
 	    >.
 </p
@@ -138,201 +162,270 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    >  <A HREF="">T</a
+	    >  <a href=""
+	    >T</a
 	    > a b<ul class="subs"
 	    ><li
-	      >= <A HREF="">A</a
-		> <A HREF="">Int</a
-		> (<A HREF="">Maybe</a
-		> <A HREF="">Float</a
+	      >= <a href=""
+		>A</a
+		> <a href=""
+		>Int</a
+		> (<a href=""
+		>Maybe</a
+		> <a href=""
+		>Float</a
 		>)  </li
 	      ><li
-	      >| <A HREF="">B</a
-		> (<A HREF="">T</a
-		> a b, <A HREF="">T</a
-		> <A HREF="">Int</a
-		> <A HREF="">Float</a
+	      >| <a href=""
+		>B</a
+		> (<a href=""
+		>T</a
+		> a b, <a href=""
+		>T</a
+		> <a href=""
+		>Int</a
+		> <a href=""
+		>Float</a
 		>)  </li
 	      ></ul
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    >  <A HREF="">T2</a
+	    >  <a href=""
+	    >T2</a
 	    > a b</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    >  <A HREF="">T3</a
+	    >  <a href=""
+	    >T3</a
 	    > a b<ul class="subs"
 	    ><li
-	      >= <A HREF="">A1</a
+	      >= <a href=""
+		>A1</a
 		> a  </li
 	      ><li
-	      >| <A HREF="">B1</a
+	      >| <a href=""
+		>B1</a
 		> b  </li
 	      ></ul
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    >  <A HREF="">T4</a
+	    >  <a href=""
+	    >T4</a
 	    > a b<ul class="subs"
 	    ><li
-	      >= <A HREF="">A2</a
+	      >= <a href=""
+		>A2</a
 		> a  </li
 	      ><li
-	      >| <A HREF="">B2</a
+	      >| <a href=""
+		>B2</a
 		> b  </li
 	      ></ul
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    >  <A HREF="">T5</a
+	    >  <a href=""
+	    >T5</a
 	    > a b<ul class="subs"
 	    ><li
-	      >= <A HREF="">A3</a
+	      >= <a href=""
+		>A3</a
 		> a  </li
 	      ><li
-	      >| <A HREF="">B3</a
+	      >| <a href=""
+		>B3</a
 		> b  </li
 	      ></ul
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    >  <A HREF="">T6</a
+	    >  <a href=""
+	    >T6</a
 	    > <ul class="subs"
 	    ><li
-	      >= <A HREF="">A4</a
+	      >= <a href=""
+		>A4</a
 		>  </li
 	      ><li
-	      >| <A HREF="">B4</a
+	      >| <a href=""
+		>B4</a
 		>  </li
 	      ><li
-	      >| <A HREF="">C4</a
+	      >| <a href=""
+		>C4</a
 		>  </li
 	      ></ul
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >newtype</span
-	    >  <A HREF="">N1</a
-	    > a = <A HREF="">N1</a
+	    >  <a href=""
+	    >N1</a
+	    > a = <a href=""
+	    >N1</a
 	    > a</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >newtype</span
-	    >  <A HREF="">N2</a
-	    > a b = <A HREF="">N2</a
+	    >  <a href=""
+	    >N2</a
+	    > a b = <a href=""
+	    >N2</a
 	    > {<ul class="subs"
 	    ><li
-	      ><A HREF="">n</a
+	      ><a href=""
+		>n</a
 		> :: a b</li
 	      ></ul
 	    >}</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >newtype</span
-	    >  <A HREF="">N3</a
-	    > a b = <A HREF="">N3</a
+	    >  <a href=""
+	    >N3</a
+	    > a b = <a href=""
+	    >N3</a
 	    > {<ul class="subs"
 	    ><li
-	      ><A HREF="">n3</a
+	      ><a href=""
+		>n3</a
 		> :: a b</li
 	      ></ul
 	    >}</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    >  <A HREF="">N4</a
+	    >  <a href=""
+	    >N4</a
 	    > a b</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >newtype</span
-	    >  <A HREF="">N5</a
-	    > a b = <A HREF="">N5</a
+	    >  <a href=""
+	    >N5</a
+	    > a b = <a href=""
+	    >N5</a
 	    > {<ul class="subs"
 	    ><li
-	      ><A HREF="">n5</a
+	      ><a href=""
+		>n5</a
 		> :: a b</li
 	      ></ul
 	    >}</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >newtype</span
-	    >  <A HREF="">N6</a
-	    > a b = <A HREF="">N6</a
+	    >  <a href=""
+	    >N6</a
+	    > a b = <a href=""
+	    >N6</a
 	    > {<ul class="subs"
 	    ><li
-	      ><A HREF="">n6</a
+	      ><a href=""
+		>n6</a
 		> :: a b</li
 	      ></ul
 	    >}</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >newtype</span
-	    >  <A HREF="">N7</a
-	    > a b = <A HREF="">N7</a
+	    >  <a href=""
+	    >N7</a
+	    > a b = <a href=""
+	    >N7</a
 	    > {<ul class="subs"
 	    ><li
-	      ><A HREF="">n7</a
+	      ><a href=""
+		>n7</a
 		> :: a b</li
 	      ></ul
 	    >}</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    >  <A HREF="">R</a
+	    >  <a href=""
+	    >R</a
 	    > <ul class="subs"
 	    ><li
-	      >= <A HREF="">C1</a
+	      >= <a href=""
+		>C1</a
 		> { <ul class="subs"
 		><li
-		  ><A HREF="">p</a
-		    > :: <A HREF="">Int</a
+		  ><a href=""
+		    >p</a
+		    > :: <a href=""
+		    >Int</a
 		    ></li
 		  ><li
-		  ><A HREF="">q</a
+		  ><a href=""
+		    >q</a
 		    > :: <span class="keyword"
 		    >forall</span
 		    > a.  a -&gt; a</li
 		  ><li
-		  ><A HREF="">r</a
-		    > :: <A HREF="">Int</a
+		  ><a href=""
+		    >r</a
+		    > :: <a href=""
+		    >Int</a
 		    ></li
 		  ><li
-		  ><A HREF="">s</a
-		    > :: <A HREF="">Int</a
+		  ><a href=""
+		    >s</a
+		    > :: <a href=""
+		    >Int</a
 		    ></li
 		  ></ul
 		> }</li
 	      ><li
-	      >| <A HREF="">C2</a
+	      >| <a href=""
+		>C2</a
 		> { <ul class="subs"
 		><li
-		  ><A HREF="">t</a
-		    > :: T1 -&gt; <A HREF="">T2</a
-		    > <A HREF="">Int</a
-		    > <A HREF="">Int</a
-		    > -&gt; <A HREF="">T3</a
-		    > <A HREF="">Bool</a
-		    > <A HREF="">Bool</a
-		    > -&gt; <A HREF="">T4</a
-		    > <A HREF="">Float</a
-		    > <A HREF="">Float</a
-		    > -&gt; <A HREF="">T5</a
-		    > <A HREF="">()</a
-		    > <A HREF="">()</a
+		  ><a href=""
+		    >t</a
+		    > :: T1 -&gt; <a href=""
+		    >T2</a
+		    > <a href=""
+		    >Int</a
+		    > <a href=""
+		    >Int</a
+		    > -&gt; <a href=""
+		    >T3</a
+		    > <a href=""
+		    >Bool</a
+		    > <a href=""
+		    >Bool</a
+		    > -&gt; <a href=""
+		    >T4</a
+		    > <a href=""
+		    >Float</a
+		    > <a href=""
+		    >Float</a
+		    > -&gt; <a href=""
+		    >T5</a
+		    > <a href=""
+		    >()</a
+		    > <a href=""
+		    >()</a
 		    ></li
 		  ><li
-		  ><A HREF="">u</a
-		    > :: <A HREF="">Int</a
+		  ><a href=""
+		    >u</a
+		    > :: <a href=""
+		    >Int</a
 		    ></li
 		  ><li
-		  ><A HREF="">v</a
-		    > :: <A HREF="">Int</a
+		  ><a href=""
+		    >v</a
+		    > :: <a href=""
+		    >Int</a
 		    ></li
 		  ></ul
 		> }</li
@@ -341,164 +434,236 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    >  <A HREF="">R1</a
-	    >  = <A HREF="">C3</a
+	    >  <a href=""
+	    >R1</a
+	    >  = <a href=""
+	    >C3</a
 	    > {<ul class="subs"
 	    ><li
-	      ><A HREF="">s1</a
-		> :: <A HREF="">Int</a
+	      ><a href=""
+		>s1</a
+		> :: <a href=""
+		>Int</a
 		></li
 	      ><li
-	      ><A HREF="">s2</a
-		> :: <A HREF="">Int</a
+	      ><a href=""
+		>s2</a
+		> :: <a href=""
+		>Int</a
 		></li
 	      ><li
-	      ><A HREF="">s3</a
-		> :: <A HREF="">Int</a
+	      ><a href=""
+		>s3</a
+		> :: <a href=""
+		>Int</a
 		></li
 	      ></ul
 	    >}</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >class</span
-	    > <A HREF="">D</a
-	    > a =&gt; <A HREF="">C</a
+	    > <a href=""
+	    >D</a
+	    > a =&gt; <a href=""
+	    >C</a
 	    > a  <span class="keyword"
 	    >where</span
 	    ><ul class="subs"
 	    ><li
-	      ><A HREF="">a</a
-		> :: <A HREF="">IO</a
+	      ><a href=""
+		>a</a
+		> :: <a href=""
+		>IO</a
 		> a</li
 	      ><li
-	      ><A HREF="">b</a
+	      ><a href=""
+		>b</a
 		> :: [a]</li
 	      ></ul
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >class</span
-	    >  <A HREF="">D</a
+	    >  <a href=""
+	    >D</a
 	    > a  <span class="keyword"
 	    >where</span
 	    ><ul class="subs"
 	    ><li
-	      ><A HREF="">d</a
-		> ::  <A HREF="">T</a
+	      ><a href=""
+		>d</a
+		> ::  <a href=""
+		>T</a
 		> a b</li
 	      ><li
-	      ><A HREF="">e</a
+	      ><a href=""
+		>e</a
 		> :: (a, a)</li
 	      ></ul
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >class</span
-	    >  <A HREF="">E</a
+	    >  <a href=""
+	    >E</a
 	    > a </li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >class</span
-	    >  <A HREF="">F</a
+	    >  <a href=""
+	    >F</a
 	    > a  <span class="keyword"
 	    >where</span
 	    ><ul class="subs"
 	    ><li
-	      ><A HREF="">ff</a
+	      ><a href=""
+		>ff</a
 		> :: a</li
 	      ></ul
 	    ></li
 	  ><li class="src short"
-	  ><A HREF="">f</a
-	    > :: <A HREF="">C</a
-	    > a =&gt; a -&gt; <A HREF="">Int</a
+	  ><a href=""
+	    >f</a
+	    > :: <a href=""
+	    >C</a
+	    > a =&gt; a -&gt; <a href=""
+	    >Int</a
 	    ></li
 	  ><li class="src short"
-	  ><A HREF="">g</a
-	    > :: <A HREF="">Int</a
-	    > -&gt; <A HREF="">IO</a
+	  ><a href=""
+	    >g</a
+	    > :: <a href=""
+	    >Int</a
+	    > -&gt; <a href=""
+	    >IO</a
 	    > CInt</li
 	  ><li class="src short"
-	  ><A HREF="">hidden</a
-	    > :: <A HREF="">Int</a
-	    > -&gt; <A HREF="">Int</a
+	  ><a href=""
+	    >hidden</a
+	    > :: <a href=""
+	    >Int</a
+	    > -&gt; <a href=""
+	    >Int</a
 	    ></li
 	  ><li class="src short"
-	  >module <A HREF="">Visible</a
+	  >module <a href=""
+	    >Visible</a
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    >  <A HREF="">Ex</a
+	    >  <a href=""
+	    >Ex</a
 	    > a<ul class="subs"
 	    ><li
 	      >= <span class="keyword"
 		>forall</span
-		> b . <A HREF="">C</a
-		> b =&gt; <A HREF="">Ex1</a
+		> b . <a href=""
+		>C</a
+		> b =&gt; <a href=""
+		>Ex1</a
 		> b  </li
 	      ><li
 	      >| <span class="keyword"
 		>forall</span
-		> b . <A HREF="">Ex2</a
+		> b . <a href=""
+		>Ex2</a
 		> b  </li
 	      ><li
 	      >| <span class="keyword"
 		>forall</span
-		> b . <A HREF="">C</a
-		> a =&gt; <A HREF="">Ex3</a
+		> b . <a href=""
+		>C</a
+		> a =&gt; <a href=""
+		>Ex3</a
 		> b  </li
 	      ><li
-	      >| <A HREF="">Ex4</a
+	      >| <a href=""
+		>Ex4</a
 		> (<span class="keyword"
 		>forall</span
 		> a.  a -&gt; a)  </li
 	      ></ul
 	    ></li
 	  ><li class="src short"
-	  ><A HREF="">k</a
-	    > :: <A HREF="">T</a
-	    > <A HREF="">()</a
-	    > <A HREF="">()</a
-	    > -&gt; <A HREF="">T2</a
-	    > <A HREF="">Int</a
-	    > <A HREF="">Int</a
-	    > -&gt; (<A HREF="">T3</a
-	    > <A HREF="">Bool</a
-	    > <A HREF="">Bool</a
-	    > -&gt; <A HREF="">T4</a
-	    > <A HREF="">Float</a
-	    > <A HREF="">Float</a
-	    >) -&gt; <A HREF="">T5</a
-	    > <A HREF="">()</a
-	    > <A HREF="">()</a
-	    > -&gt; <A HREF="">IO</a
-	    > <A HREF="">()</a
+	  ><a href=""
+	    >k</a
+	    > :: <a href=""
+	    >T</a
+	    > <a href=""
+	    >()</a
+	    > <a href=""
+	    >()</a
+	    > -&gt; <a href=""
+	    >T2</a
+	    > <a href=""
+	    >Int</a
+	    > <a href=""
+	    >Int</a
+	    > -&gt; (<a href=""
+	    >T3</a
+	    > <a href=""
+	    >Bool</a
+	    > <a href=""
+	    >Bool</a
+	    > -&gt; <a href=""
+	    >T4</a
+	    > <a href=""
+	    >Float</a
+	    > <a href=""
+	    >Float</a
+	    >) -&gt; <a href=""
+	    >T5</a
+	    > <a href=""
+	    >()</a
+	    > <a href=""
+	    >()</a
+	    > -&gt; <a href=""
+	    >IO</a
+	    > <a href=""
+	    >()</a
 	    ></li
 	  ><li class="src short"
-	  ><A HREF="">l</a
-	    > :: (<A HREF="">Int</a
-	    >, <A HREF="">Int</a
-	    >, <A HREF="">Float</a
-	    >) -&gt; <A HREF="">Int</a
+	  ><a href=""
+	    >l</a
+	    > :: (<a href=""
+	    >Int</a
+	    >, <a href=""
+	    >Int</a
+	    >, <a href=""
+	    >Float</a
+	    >) -&gt; <a href=""
+	    >Int</a
 	    ></li
 	  ><li class="src short"
-	  ><A HREF="">m</a
-	    > :: <A HREF="">R</a
-	    > -&gt; <A HREF="">N1</a
-	    > <A HREF="">()</a
-	    > -&gt; <A HREF="">IO</a
-	    > <A HREF="">Int</a
+	  ><a href=""
+	    >m</a
+	    > :: <a href=""
+	    >R</a
+	    > -&gt; <a href=""
+	    >N1</a
+	    > <a href=""
+	    >()</a
+	    > -&gt; <a href=""
+	    >IO</a
+	    > <a href=""
+	    >Int</a
 	    ></li
 	  ><li class="src short"
-	  ><A HREF="">o</a
-	    > :: <A HREF="">Float</a
-	    > -&gt; <A HREF="">IO</a
-	    > <A HREF="">Float</a
+	  ><a href=""
+	    >o</a
+	    > :: <a href=""
+	    >Float</a
+	    > -&gt; <a href=""
+	    >IO</a
+	    > <a href=""
+	    >Float</a
 	    ></li
 	  ><li class="src short"
-	  ><A HREF="">f'</a
-	    > :: <A HREF="">Int</a
+	  ><a href=""
+	    >f'</a
+	    > :: <a href=""
+	    >Int</a
 	    ></li
 	  ></ul
 	></div
@@ -532,14 +697,18 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	      ><td class="src"
 		><a name="v:A" class="def"
 		  >A</a
-		  > <A HREF="">Int</a
-		  > (<A HREF="">Maybe</a
-		  > <A HREF="">Float</a
+		  > <a href=""
+		  >Int</a
+		  > (<a href=""
+		  >Maybe</a
+		  > <a href=""
+		  >Float</a
 		  >)</td
 		><td class="doc"
 		><p
 		  >This comment describes the <code
-		    ><A HREF="">A</a
+		    ><a href=""
+		      >A</a
 		      ></code
 		    > constructor
 </p
@@ -549,15 +718,20 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	      ><td class="src"
 		><a name="v:B" class="def"
 		  >B</a
-		  > (<A HREF="">T</a
-		  > a b, <A HREF="">T</a
-		  > <A HREF="">Int</a
-		  > <A HREF="">Float</a
+		  > (<a href=""
+		  >T</a
+		  > a b, <a href=""
+		  >T</a
+		  > <a href=""
+		  >Int</a
+		  > <a href=""
+		  >Float</a
 		  >)</td
 		><td class="doc"
 		><p
 		  >This comment describes the <code
-		    ><A HREF="">B</a
+		    ><a href=""
+		      >B</a
 		      ></code
 		    > constructor
 </p
@@ -663,7 +837,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		><td class="doc"
 		><p
 		  >documents <code
-		    ><A HREF="">A3</a
+		    ><a href=""
+		      >A3</a
 		      ></code
 		    >
 </p
@@ -677,7 +852,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		><td class="doc"
 		><p
 		  >documents <code
-		    ><A HREF="">B3</a
+		    ><a href=""
+		      >B3</a
 		      ></code
 		    >
 </p
@@ -710,7 +886,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		><td class="doc"
 		><p
 		  >This is the doc for <code
-		    ><A HREF="">A4</a
+		    ><a href=""
+		      >A4</a
 		      ></code
 		    >
 </p
@@ -724,7 +901,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		><td class="doc"
 		><p
 		  >This is the doc for <code
-		    ><A HREF="">B4</a
+		    ><a href=""
+		      >B4</a
 		      ></code
 		    >
 </p
@@ -738,7 +916,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		><td class="doc"
 		><p
 		  >This is the doc for <code
-		    ><A HREF="">C4</a
+		    ><a href=""
+		      >C4</a
 		      ></code
 		    >
 </p
@@ -856,7 +1035,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		      ><dd class="doc"
 		      ><p
 			>this is the <code
-			  ><A HREF="">n3</a
+			  ><a href=""
+			    >n3</a
 			    ></code
 			  > field 
 </p
@@ -994,7 +1174,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		><td class="doc"
 		><p
 		  >The <code
-		    ><A HREF="">N7</a
+		    ><a href=""
+		      >N7</a
 		      ></code
 		    > constructor
 </p
@@ -1034,20 +1215,25 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	  ><div class="doc"
 	  ><p
 	    >This is the documentation for the <code
-	      ><A HREF="">R</a
+	      ><a href=""
+		>R</a
 		></code
 	      > record, which has four fields,
  <code
-	      ><A HREF="">p</a
+	      ><a href=""
+		>p</a
 		></code
 	      >, <code
-	      ><A HREF="">q</a
+	      ><a href=""
+		>q</a
 		></code
 	      >, <code
-	      ><A HREF="">r</a
+	      ><a href=""
+		>r</a
 		></code
 	      >, and <code
-	      ><A HREF="">s</a
+	      ><a href=""
+		>s</a
 		></code
 	      >.
 </p
@@ -1064,7 +1250,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		><td class="doc"
 		><p
 		  >This is the <code
-		    ><A HREF="">C1</a
+		    ><a href=""
+		      >C1</a
 		      ></code
 		    > record constructor, with the following fields:
 </p
@@ -1079,12 +1266,14 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><dt class="src"
 		      ><a name="v:p" class="def"
 			>p</a
-			> :: <A HREF="">Int</a
+			> :: <a href=""
+			>Int</a
 			></dt
 		      ><dd class="doc"
 		      ><p
 			>This comment applies to the <code
-			  ><A HREF="">p</a
+			  ><a href=""
+			    >p</a
 			    ></code
 			  > field
 </p
@@ -1098,7 +1287,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		      ><dd class="doc"
 		      ><p
 			>This comment applies to the <code
-			  ><A HREF="">q</a
+			  ><a href=""
+			    >q</a
 			    ></code
 			  > field
 </p
@@ -1106,15 +1296,18 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		      ><dt class="src"
 		      ><a name="v:r" class="def"
 			>r</a
-			> :: <A HREF="">Int</a
+			> :: <a href=""
+			>Int</a
 			></dt
 		      ><dd class="doc"
 		      ><p
 			>This comment applies to both <code
-			  ><A HREF="">r</a
+			  ><a href=""
+			    >r</a
 			    ></code
 			  > and <code
-			  ><A HREF="">s</a
+			  ><a href=""
+			    >s</a
 			    ></code
 			  >
 </p
@@ -1122,15 +1315,18 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		      ><dt class="src"
 		      ><a name="v:s" class="def"
 			>s</a
-			> :: <A HREF="">Int</a
+			> :: <a href=""
+			>Int</a
 			></dt
 		      ><dd class="doc"
 		      ><p
 			>This comment applies to both <code
-			  ><A HREF="">r</a
+			  ><a href=""
+			    >r</a
 			    ></code
 			  > and <code
-			  ><A HREF="">s</a
+			  ><a href=""
+			    >s</a
 			    ></code
 			  >
 </p
@@ -1149,7 +1345,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		><td class="doc"
 		><p
 		  >This is the <code
-		    ><A HREF="">C2</a
+		    ><a href=""
+		      >C2</a
 		      ></code
 		    > record constructor, also with some fields:
 </p
@@ -1164,32 +1361,46 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><dt class="src"
 		      ><a name="v:t" class="def"
 			>t</a
-			> :: T1 -&gt; <A HREF="">T2</a
-			> <A HREF="">Int</a
-			> <A HREF="">Int</a
-			> -&gt; <A HREF="">T3</a
-			> <A HREF="">Bool</a
-			> <A HREF="">Bool</a
-			> -&gt; <A HREF="">T4</a
-			> <A HREF="">Float</a
-			> <A HREF="">Float</a
-			> -&gt; <A HREF="">T5</a
-			> <A HREF="">()</a
-			> <A HREF="">()</a
+			> :: T1 -&gt; <a href=""
+			>T2</a
+			> <a href=""
+			>Int</a
+			> <a href=""
+			>Int</a
+			> -&gt; <a href=""
+			>T3</a
+			> <a href=""
+			>Bool</a
+			> <a href=""
+			>Bool</a
+			> -&gt; <a href=""
+			>T4</a
+			> <a href=""
+			>Float</a
+			> <a href=""
+			>Float</a
+			> -&gt; <a href=""
+			>T5</a
+			> <a href=""
+			>()</a
+			> <a href=""
+			>()</a
 			></dt
 		      ><dd class="doc empty"
 		      >&nbsp;</dd
 		      ><dt class="src"
 		      ><a name="v:u" class="def"
 			>u</a
-			> :: <A HREF="">Int</a
+			> :: <a href=""
+			>Int</a
 			></dt
 		      ><dd class="doc empty"
 		      >&nbsp;</dd
 		      ><dt class="src"
 		      ><a name="v:v" class="def"
 			>v</a
-			> :: <A HREF="">Int</a
+			> :: <a href=""
+			>Int</a
 			></dt
 		      ><dd class="doc empty"
 		      >&nbsp;</dd
@@ -1226,7 +1437,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		><td class="doc"
 		><p
 		  >This is the <code
-		    ><A HREF="">C3</a
+		    ><a href=""
+		      >C3</a
 		      ></code
 		    > record constructor
 </p
@@ -1241,12 +1453,14 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><dt class="src"
 		      ><a name="v:s1" class="def"
 			>s1</a
-			> :: <A HREF="">Int</a
+			> :: <a href=""
+			>Int</a
 			></dt
 		      ><dd class="doc"
 		      ><p
 			>The <code
-			  ><A HREF="">s1</a
+			  ><a href=""
+			    >s1</a
 			    ></code
 			  > record selector
 </p
@@ -1254,12 +1468,14 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		      ><dt class="src"
 		      ><a name="v:s2" class="def"
 			>s2</a
-			> :: <A HREF="">Int</a
+			> :: <a href=""
+			>Int</a
 			></dt
 		      ><dd class="doc"
 		      ><p
 			>The <code
-			  ><A HREF="">s2</a
+			  ><a href=""
+			    >s2</a
 			    ></code
 			  > record selector
 </p
@@ -1267,12 +1483,14 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		      ><dt class="src"
 		      ><a name="v:s3" class="def"
 			>s3</a
-			> :: <A HREF="">Int</a
+			> :: <a href=""
+			>Int</a
 			></dt
 		      ><dd class="doc"
 		      ><p
 			>The <code
-			  ><A HREF="">s3</a
+			  ><a href=""
+			    >s3</a
 			    ></code
 			  > record selector
 </p
@@ -1298,7 +1516,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <A HREF="">D</a
+	    > <a href=""
+	    >D</a
 	    > a =&gt; <a name="t:C" class="def"
 	    >C</a
 	    > a  <span class="keyword"
@@ -1309,7 +1528,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    >This comment applies to the <em
 	      >previous</em
 	      > declaration (the <code
-	      ><A HREF="">C</a
+	      ><a href=""
+		>C</a
 		></code
 	      > class)
 </p
@@ -1320,12 +1540,14 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><p class="src"
 	    ><a name="v:a" class="def"
 	      >a</a
-	      > :: <A HREF="">IO</a
+	      > :: <a href=""
+	      >IO</a
 	      > a</p
 	    ><div class="doc"
 	    ><p
 	      >this is a description of the <code
-		><A HREF="">a</a
+		><a href=""
+		  >a</a
 		  ></code
 		> method
 </p
@@ -1337,7 +1559,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><div class="doc"
 	    ><p
 	      >this is a description of the <code
-		><A HREF="">b</a
+		><a href=""
+		  >b</a
 		  ></code
 		> method
 </p
@@ -1364,7 +1587,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><p class="src"
 	    ><a name="v:d" class="def"
 	      >d</a
-	      > ::  <A HREF="">T</a
+	      > ::  <a href=""
+	      >T</a
 	      > a b</p
 	    ><p class="src"
 	    ><a name="v:e" class="def"
@@ -1378,16 +1602,20 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	      ><tr
 		><td class="src"
-		  ><A HREF="">D</a
-		    > <A HREF="">Float</a
+		  ><a href=""
+		    >D</a
+		    > <a href=""
+		    >Float</a
 		    ></td
 		  ><td class="doc empty"
 		  >&nbsp;</td
 		  ></tr
 		><tr
 		><td class="src"
-		  ><A HREF="">D</a
-		    > <A HREF="">Int</a
+		  ><a href=""
+		    >D</a
+		    > <a href=""
+		    >Int</a
 		    ></td
 		  ><td class="doc empty"
 		  >&nbsp;</td
@@ -1439,17 +1667,21 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><a name="v:f" class="def"
 	    >f</a
-	    > :: <A HREF="">C</a
-	    > a =&gt; a -&gt; <A HREF="">Int</a
+	    > :: <a href=""
+	    >C</a
+	    > a =&gt; a -&gt; <a href=""
+	    >Int</a
 	    ></p
 	  ><div class="doc"
 	  ><p
 	    >In a comment string we can refer to identifiers in scope with
 single quotes like this: <code
-	      ><A HREF="">T</a
+	      ><a href=""
+		>T</a
 		></code
 	      >, and we can refer to modules by
-using double quotes: <A HREF="">Foo</a
+using double quotes: <a href=""
+	      >Foo</a
 	      >.  We can add emphasis <em
 	      >like this</em
 	      >.
@@ -1485,7 +1717,8 @@ using double quotes: <A HREF="">Foo</a
 	    ><pre
 	    >
      This is a block of code, which can include other markup: <code
-	      ><A HREF="">R</a
+	      ><a href=""
+		>R</a
 		></code
 	      >
      formatting
@@ -1496,7 +1729,8 @@ using double quotes: <A HREF="">Foo</a
 	    > this is another block of code
 </pre
 	    ><p
-	    >We can also include URLs in documentation: <A HREF="">http://www.haskell.org/</a
+	    >We can also include URLs in documentation: <a href=""
+	      >http://www.haskell.org/</a
 	      >.
 </p
 	    ></div
@@ -1505,8 +1739,10 @@ using double quotes: <A HREF="">Foo</a
 	><p class="src"
 	  ><a name="v:g" class="def"
 	    >g</a
-	    > :: <A HREF="">Int</a
-	    > -&gt; <A HREF="">IO</a
+	    > :: <a href=""
+	    >Int</a
+	    > -&gt; <a href=""
+	    >IO</a
 	    > CInt</p
 	  ><div class="doc"
 	  ><p
@@ -1633,8 +1869,10 @@ test2
 	><p class="src"
 	  ><a name="v:hidden" class="def"
 	    >hidden</a
-	    > :: <A HREF="">Int</a
-	    > -&gt; <A HREF="">Int</a
+	    > :: <a href=""
+	    >Int</a
+	    > -&gt; <a href=""
+	    >Int</a
 	    ></p
 	  ></div
 	><h1 id="g:8"
@@ -1642,7 +1880,8 @@ test2
 </h1
 	><div class="top"
 	><p class="src"
-	  >module <A HREF="">Visible</a
+	  >module <a href=""
+	    >Visible</a
 	    ></p
 	  ></div
 	><div class="doc"
@@ -1673,7 +1912,8 @@ test2
 	      ><td class="src"
 		><span class="keyword"
 		  >forall</span
-		  > b . <A HREF="">C</a
+		  > b . <a href=""
+		  >C</a
 		  > b =&gt; <a name="v:Ex1" class="def"
 		  >Ex1</a
 		  > b</td
@@ -1694,7 +1934,8 @@ test2
 	      ><td class="src"
 		><span class="keyword"
 		  >forall</span
-		  > b . <A HREF="">C</a
+		  > b . <a href=""
+		  >C</a
 		  > a =&gt; <a name="v:Ex3" class="def"
 		  >Ex3</a
 		  > b</td
@@ -1728,14 +1969,18 @@ test2
 	    ><table
 	    ><tr
 	      ><td class="src"
-		>:: <A HREF="">T</a
-		  > <A HREF="">()</a
-		  > <A HREF="">()</a
+		>:: <a href=""
+		  >T</a
+		  > <a href=""
+		  >()</a
+		  > <a href=""
+		  >()</a
 		  ></td
 		><td class="doc"
 		><p
 		  >This argument has type <code
-		    ><A HREF="">T</a
+		    ><a href=""
+		      >T</a
 		      ></code
 		    >
 </p
@@ -1743,9 +1988,12 @@ test2
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <A HREF="">T2</a
-		  > <A HREF="">Int</a
-		  > <A HREF="">Int</a
+		>-&gt; <a href=""
+		  >T2</a
+		  > <a href=""
+		  >Int</a
+		  > <a href=""
+		  >Int</a
 		  ></td
 		><td class="doc"
 		><p
@@ -1755,12 +2003,18 @@ test2
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; (<A HREF="">T3</a
-		  > <A HREF="">Bool</a
-		  > <A HREF="">Bool</a
-		  > -&gt; <A HREF="">T4</a
-		  > <A HREF="">Float</a
-		  > <A HREF="">Float</a
+		>-&gt; (<a href=""
+		  >T3</a
+		  > <a href=""
+		  >Bool</a
+		  > <a href=""
+		  >Bool</a
+		  > -&gt; <a href=""
+		  >T4</a
+		  > <a href=""
+		  >Float</a
+		  > <a href=""
+		  >Float</a
 		  >)</td
 		><td class="doc"
 		><p
@@ -1772,9 +2026,12 @@ test2
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <A HREF="">T5</a
-		  > <A HREF="">()</a
-		  > <A HREF="">()</a
+		>-&gt; <a href=""
+		  >T5</a
+		  > <a href=""
+		  >()</a
+		  > <a href=""
+		  >()</a
 		  ></td
 		><td class="doc"
 		><p
@@ -1786,8 +2043,10 @@ test2
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <A HREF="">IO</a
-		  > <A HREF="">()</a
+		>-&gt; <a href=""
+		  >IO</a
+		  > <a href=""
+		  >()</a
 		  ></td
 		><td class="doc"
 		><p
@@ -1814,9 +2073,12 @@ test2
 	    ><table
 	    ><tr
 	      ><td class="src"
-		>:: (<A HREF="">Int</a
-		  >, <A HREF="">Int</a
-		  >, <A HREF="">Float</a
+		>:: (<a href=""
+		  >Int</a
+		  >, <a href=""
+		  >Int</a
+		  >, <a href=""
+		  >Float</a
 		  >)</td
 		><td class="doc"
 		><p
@@ -1826,12 +2088,14 @@ test2
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <A HREF="">Int</a
+		>-&gt; <a href=""
+		  >Int</a
 		  ></td
 		><td class="doc"
 		><p
 		  >returns an <code
-		    ><A HREF="">Int</a
+		    ><a href=""
+		      >Int</a
 		      ></code
 		    >
 </p
@@ -1851,15 +2115,18 @@ test2
 	    ><table
 	    ><tr
 	      ><td class="src"
-		>:: <A HREF="">R</a
+		>:: <a href=""
+		  >R</a
 		  ></td
 		><td class="doc empty"
 		>&nbsp;</td
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <A HREF="">N1</a
-		  > <A HREF="">()</a
+		>-&gt; <a href=""
+		  >N1</a
+		  > <a href=""
+		  >()</a
 		  ></td
 		><td class="doc"
 		><p
@@ -1869,8 +2136,10 @@ test2
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <A HREF="">IO</a
-		  > <A HREF="">Int</a
+		>-&gt; <a href=""
+		  >IO</a
+		  > <a href=""
+		  >Int</a
 		  ></td
 		><td class="doc"
 		><p
@@ -1897,7 +2166,8 @@ test2
 	    ><table
 	    ><tr
 	      ><td class="src"
-		>:: <A HREF="">Float</a
+		>:: <a href=""
+		  >Float</a
 		  ></td
 		><td class="doc"
 		><p
@@ -1907,8 +2177,10 @@ test2
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <A HREF="">IO</a
-		  > <A HREF="">Float</a
+		>-&gt; <a href=""
+		  >IO</a
+		  > <a href=""
+		  >Float</a
 		  ></td
 		><td class="doc"
 		><p
@@ -1944,12 +2216,14 @@ test2
 	><p class="src"
 	  ><a name="v:f-39-" class="def"
 	    >f'</a
-	    > :: <A HREF="">Int</a
+	    > :: <a href=""
+	    >Int</a
 	    ></p
 	  ><div class="doc"
 	  ><p
 	    >a function with a prime can be referred to as <code
-	      ><A HREF="">f'</a
+	      ><a href=""
+		>f'</a
 		></code
 	      > 
  but f' doesn't get link'd 'f\''
@@ -1960,8 +2234,9 @@ test2
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/Ticket112.html.ref b/tests/html-tests/tests/Ticket112.html.ref
index a58843e1..c716109b 100644
--- a/tests/html-tests/tests/Ticket112.html.ref
+++ b/tests/html-tests/tests/Ticket112.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket112.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket112.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>Ticket112</p
 	></div
       ><div id="synopsis"
@@ -36,7 +46,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket112.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><A HREF="">f</a
+	  ><a href=""
+	    >f</a
 	    > ::  a</li
 	  ></ul
 	></div
@@ -51,7 +62,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket112.html");};
 	  ><div class="doc"
 	  ><p
 	    >...given a raw <code
-	      ><A HREF="">Addr#</a
+	      ><a href=""
+		>Addr#</a
 		></code
 	      > to the string, and the length of the string.
 </p
@@ -61,8 +73,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket112.html");};
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/Ticket61.html.ref b/tests/html-tests/tests/Ticket61.html.ref
index fb435f97..00adf22f 100644
--- a/tests/html-tests/tests/Ticket61.html.ref
+++ b/tests/html-tests/tests/Ticket61.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket61.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket61.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>Ticket61</p
 	></div
       ><div id="interface"
@@ -61,8 +71,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket61.html");};
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/Ticket75.html.ref b/tests/html-tests/tests/Ticket75.html.ref
index ac89b65f..d98d648d 100644
--- a/tests/html-tests/tests/Ticket75.html.ref
+++ b/tests/html-tests/tests/Ticket75.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket75.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket75.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>Ticket75</p
 	></div
       ><div id="synopsis"
@@ -38,12 +48,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket75.html");};
 	><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    >  a <A HREF="">:-</a
-	    > b = <A HREF="">Q</a
+	    >  a <a href=""
+	    >:-</a
+	    > b = <a href=""
+	    >Q</a
 	    ></li
 	  ><li class="src short"
-	  ><A HREF="">f</a
-	    > :: <A HREF="">Int</a
+	  ><a href=""
+	    >f</a
+	    > :: <a href=""
+	    >Int</a
 	    ></li
 	  ></ul
 	></div
@@ -76,12 +90,14 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket75.html");};
 	><p class="src"
 	  ><a name="v:f" class="def"
 	    >f</a
-	    > :: <A HREF="">Int</a
+	    > :: <a href=""
+	    >Int</a
 	    ></p
 	  ><div class="doc"
 	  ><p
 	    >A reference to <code
-	      ><A HREF="">:-</a
+	      ><a href=""
+		>:-</a
 		></code
 	      >
 </p
@@ -91,8 +107,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket75.html");};
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/TypeFamilies.html.ref b/tests/html-tests/tests/TypeFamilies.html.ref
index d0212c78..19a32e9c 100644
--- a/tests/html-tests/tests/TypeFamilies.html.ref
+++ b/tests/html-tests/tests/TypeFamilies.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>TypeFamilies</p
 	></div
       ><div id="synopsis"
@@ -38,31 +48,38 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	><li class="src short"
 	  ><span class="keyword"
 	    >type family</span
-	    > <A HREF="">G</a
+	    > <a href=""
+	    >G</a
 	    > a :: *</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >class</span
-	    >  <A HREF="">A</a
+	    >  <a href=""
+	    >A</a
 	    > a  <span class="keyword"
 	    >where</span
 	    ><ul class="subs"
 	    ><li
 	      ><span class="keyword"
 		>data</span
-		> <A HREF="">B</a
+		> <a href=""
+		>B</a
 		> a :: * -&gt; *</li
 	      ><li
-	      ><A HREF="">f</a
-		> :: <A HREF="">B</a
-		> a <A HREF="">Int</a
+	      ><a href=""
+		>f</a
+		> :: <a href=""
+		>B</a
+		> a <a href=""
+		>Int</a
 		></li
 	      ></ul
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >type family</span
-	    > <A HREF="">F</a
+	    > <a href=""
+	    >F</a
 	    > a </li
 	  ></ul
 	></div
@@ -117,8 +134,10 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	    ><p class="src"
 	    ><a name="v:f" class="def"
 	      >f</a
-	      > :: <A HREF="">B</a
-	      > a <A HREF="">Int</a
+	      > :: <a href=""
+	      >B</a
+	      > a <a href=""
+	      >Int</a
 	      ></p
 	    ><div class="doc"
 	    ><p
@@ -133,8 +152,10 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	    ><table
 	      ><tr
 		><td class="src"
-		  ><A HREF="">A</a
-		    > <A HREF="">Int</a
+		  ><a href=""
+		    >A</a
+		    > <a href=""
+		    >Int</a
 		    ></td
 		  ><td class="doc empty"
 		  >&nbsp;</td
@@ -160,8 +181,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/TypeOperators.html.ref b/tests/html-tests/tests/TypeOperators.html.ref
index 731a581b..743a7b0f 100644
--- a/tests/html-tests/tests/TypeOperators.html.ref
+++ b/tests/html-tests/tests/TypeOperators.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>TypeOperators</p
 	></div
       ><div id="table-of-contents"
@@ -36,7 +46,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
 	>Contents</p
 	><ul
 	><li
-	  ><A HREF="">stuff
+	  ><a href=""
+	    >stuff
 </a
 	    ></li
 	  ></ul
@@ -48,41 +59,52 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
 	><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    >  a <A HREF="">:-:</a
+	    >  a <a href=""
+	    >:-:</a
 	    > b</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    >  (a <A HREF="">:+:</a
+	    >  (a <a href=""
+	    >:+:</a
 	    > b) c</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    >  <A HREF="">Op</a
+	    >  <a href=""
+	    >Op</a
 	    > a b</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >newtype</span
-	    >  <A HREF="">O</a
-	    > g f a = <A HREF="">O</a
+	    >  <a href=""
+	    >O</a
+	    > g f a = <a href=""
+	    >O</a
 	    > {<ul class="subs"
 	    ><li
-	      ><A HREF="">unO</a
+	      ><a href=""
+		>unO</a
 		> :: g (f a)</li
 	      ></ul
 	    >}</li
 	  ><li class="src short"
-	  ><A HREF="">biO</a
-	    > ::  (g `<A HREF="">O</a
+	  ><a href=""
+	    >biO</a
+	    > ::  (g `<a href=""
+	    >O</a
 	    >` f) a</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >newtype</span
-	    >  <A HREF="">Flip</a
-	    > (~&gt;) b a = <A HREF="">Flip</a
+	    >  <a href=""
+	    >Flip</a
+	    > (~&gt;) b a = <a href=""
+	    >Flip</a
 	    > {<ul class="subs"
 	    ><li
-	      ><A HREF="">unFlip</a
+	      ><a href=""
+		>unFlip</a
 		> :: a ~&gt; b</li
 	      ></ul
 	    >}</li
@@ -160,7 +182,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
 	><p class="src"
 	  ><a name="v:biO" class="def"
 	    >biO</a
-	    > ::  (g `<A HREF="">O</a
+	    > ::  (g `<a href=""
+	    >O</a
 	    >` f) a</p
 	  ></div
 	><div class="top"
@@ -207,8 +230,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
diff --git a/tests/html-tests/tests/Visible.html.ref b/tests/html-tests/tests/Visible.html.ref
index dd69b0d1..1e169e91 100644
--- a/tests/html-tests/tests/Visible.html.ref
+++ b/tests/html-tests/tests/Visible.html.ref
@@ -17,10 +17,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_Visible.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><A HREF="">Contents</a
+	><a href=""
+	  >Contents</a
 	  ></li
 	><li
-	><A HREF="">Index</a
+	><a href=""
+	  >Index</a
 	  ></li
 	></ul
       ><p class="caption" class="empty"
@@ -28,7 +30,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Visible.html");};
       ></div
     ><div id="content"
     ><div id="module-header"
-      ><p class="caption"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
 	>Visible</p
 	></div
       ><div id="interface"
@@ -38,16 +48,19 @@ window.onload = function () {pageLoad();setSynopsis("mini_Visible.html");};
 	><p class="src"
 	  ><a name="v:visible" class="def"
 	    >visible</a
-	    > :: <A HREF="">Int</a
-	    > -&gt; <A HREF="">Int</a
+	    > :: <a href=""
+	    >Int</a
+	    > -&gt; <a href=""
+	    >Int</a
 	    ></p
 	  ></div
 	></div
       ></div
     ><div id="footer"
     ><p
-      >Produced by <A HREF="">Haddock</a
-	> version 2.9.2</p
+      >Produced by <a href=""
+	>Haddock</a
+	> version 2.9.4</p
       ></div
     ></body
   ></html
-- 
cgit v1.2.3