168 files changed, 5 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index ba90347e..3d242029 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 /dist/
-/tests/html-tests/output/
+/html-test/output/
 
 /doc/haddock
 /doc/autom4te.cache/
diff --git a/haddock.cabal b/haddock.cabal
index 846d7c6a..36c016e9 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -31,7 +31,7 @@ extra-source-files:
   src/haddock.sh
 -- The test files shouldn't have to go here, but the source files for
 -- the test-suite stanzas don't get picked up by `cabal sdist`.
-  tests/html-tests/runtests.hs
+  tests/html-test/runtests.hs
 
 data-dir:   resources
 data-files: html/frames.html
@@ -169,11 +169,11 @@ library
   if flag(in-ghc-tree)
     buildable: False
 
-test-suite html-tests
+test-suite html-test
   type:             exitcode-stdio-1.0
   default-language: Haskell2010
   main-is:          runtests.hs
-  hs-source-dirs:   tests/html-tests
+  hs-source-dirs:   html-test
   build-depends:    base, directory, process, filepath, Cabal
 
 test-suite spec
diff --git a/tests/html-tests/README b/html-test/README
index 9afb10e7..9afb10e7 100644
--- a/tests/html-tests/README
+++ b/html-test/README
diff --git a/tests/html-tests/accept.hs b/html-test/accept.hs
index 45b32078..45b32078 100644
--- a/tests/html-tests/accept.hs
+++ b/html-test/accept.hs
diff --git a/tests/html-tests/runtests.hs b/html-test/runtests.hs
index 759f7495..292deb8b 100644
--- a/tests/html-tests/runtests.hs
+++ b/html-test/runtests.hs
@@ -24,7 +24,7 @@ packageRoot, dataDir, haddockPath, testSuiteRoot, testDir, outDir :: FilePath
 packageRoot   = "."
 dataDir       = packageRoot </> "resources"
 haddockPath   = packageRoot </> "dist" </> "build" </> "haddock" </> "haddock"
-testSuiteRoot = packageRoot </> "tests" </> "html-tests"
+testSuiteRoot = packageRoot </> "html-test"
 testDir       = testSuiteRoot </> "tests"
 outDir        = testSuiteRoot </> "output"
 
diff --git a/tests/html-tests/tests/A.hs b/html-test/tests/A.hs
index 606b0865..606b0865 100644
--- a/tests/html-tests/tests/A.hs
+++ b/html-test/tests/A.hs
diff --git a/tests/html-tests/tests/A.html.ref b/html-test/tests/A.html.ref
index 328fec02..328fec02 100644
--- a/tests/html-tests/tests/A.html.ref
+++ b/html-test/tests/A.html.ref
diff --git a/tests/html-tests/tests/AdvanceTypes.hs b/html-test/tests/AdvanceTypes.hs
index 939fdf07..939fdf07 100644
--- a/tests/html-tests/tests/AdvanceTypes.hs
+++ b/html-test/tests/AdvanceTypes.hs
diff --git a/tests/html-tests/tests/AdvanceTypes.html.ref b/html-test/tests/AdvanceTypes.html.ref
index bac545be..bac545be 100644
--- a/tests/html-tests/tests/AdvanceTypes.html.ref
+++ b/html-test/tests/AdvanceTypes.html.ref
diff --git a/tests/html-tests/tests/B.hs b/html-test/tests/B.hs
index 5fd69acd..5fd69acd 100644
--- a/tests/html-tests/tests/B.hs
+++ b/html-test/tests/B.hs
diff --git a/tests/html-tests/tests/B.html.ref b/html-test/tests/B.html.ref
index 410bc75b..410bc75b 100644
--- a/tests/html-tests/tests/B.html.ref
+++ b/html-test/tests/B.html.ref
diff --git a/tests/html-tests/tests/Bug1.hs b/html-test/tests/Bug1.hs
index af1ed4d3..af1ed4d3 100644
--- a/tests/html-tests/tests/Bug1.hs
+++ b/html-test/tests/Bug1.hs
diff --git a/tests/html-tests/tests/Bug1.html.ref b/html-test/tests/Bug1.html.ref
index f8a86948..f8a86948 100644
--- a/tests/html-tests/tests/Bug1.html.ref
+++ b/html-test/tests/Bug1.html.ref
diff --git a/tests/html-tests/tests/Bug2.hs b/html-test/tests/Bug2.hs
index 9121922e..9121922e 100644
--- a/tests/html-tests/tests/Bug2.hs
+++ b/html-test/tests/Bug2.hs
diff --git a/tests/html-tests/tests/Bug2.html.ref b/html-test/tests/Bug2.html.ref
index 813035a6..813035a6 100644
--- a/tests/html-tests/tests/Bug2.html.ref
+++ b/html-test/tests/Bug2.html.ref
diff --git a/tests/html-tests/tests/Bug3.hs b/html-test/tests/Bug3.hs
index 67e57892..67e57892 100644
--- a/tests/html-tests/tests/Bug3.hs
+++ b/html-test/tests/Bug3.hs
diff --git a/tests/html-tests/tests/Bug3.html.ref b/html-test/tests/Bug3.html.ref
index 76d4e730..76d4e730 100644
--- a/tests/html-tests/tests/Bug3.html.ref
+++ b/html-test/tests/Bug3.html.ref
diff --git a/tests/html-tests/tests/Bug4.hs b/html-test/tests/Bug4.hs
index 425a77aa..425a77aa 100644
--- a/tests/html-tests/tests/Bug4.hs
+++ b/html-test/tests/Bug4.hs
diff --git a/tests/html-tests/tests/Bug4.html.ref b/html-test/tests/Bug4.html.ref
index 9e852978..9e852978 100644
--- a/tests/html-tests/tests/Bug4.html.ref
+++ b/html-test/tests/Bug4.html.ref
diff --git a/tests/html-tests/tests/Bug6.hs b/html-test/tests/Bug6.hs
index 17411f31..17411f31 100644
--- a/tests/html-tests/tests/Bug6.hs
+++ b/html-test/tests/Bug6.hs
diff --git a/tests/html-tests/tests/Bug6.html.ref b/html-test/tests/Bug6.html.ref
index 606e45e3..606e45e3 100644
--- a/tests/html-tests/tests/Bug6.html.ref
+++ b/html-test/tests/Bug6.html.ref
diff --git a/tests/html-tests/tests/Bug7.hs b/html-test/tests/Bug7.hs
index 8cf57914..8cf57914 100644
--- a/tests/html-tests/tests/Bug7.hs
+++ b/html-test/tests/Bug7.hs
diff --git a/tests/html-tests/tests/Bug7.html.ref b/html-test/tests/Bug7.html.ref
index 8ac72b16..8ac72b16 100644
--- a/tests/html-tests/tests/Bug7.html.ref
+++ b/html-test/tests/Bug7.html.ref
diff --git a/tests/html-tests/tests/Bug8.hs b/html-test/tests/Bug8.hs
index 18df63c8..18df63c8 100644
--- a/tests/html-tests/tests/Bug8.hs
+++ b/html-test/tests/Bug8.hs
diff --git a/tests/html-tests/tests/Bug8.html.ref b/html-test/tests/Bug8.html.ref
index 469151f1..469151f1 100644
--- a/tests/html-tests/tests/Bug8.html.ref
+++ b/html-test/tests/Bug8.html.ref
diff --git a/tests/html-tests/tests/BugDeprecated.hs b/html-test/tests/BugDeprecated.hs
index 0f7ac2eb..0f7ac2eb 100644
--- a/tests/html-tests/tests/BugDeprecated.hs
+++ b/html-test/tests/BugDeprecated.hs
diff --git a/tests/html-tests/tests/BugDeprecated.html.ref b/html-test/tests/BugDeprecated.html.ref
index 913b189d..913b189d 100644
--- a/tests/html-tests/tests/BugDeprecated.html.ref
+++ b/html-test/tests/BugDeprecated.html.ref
diff --git a/tests/html-tests/tests/BugExportHeadings.hs b/html-test/tests/BugExportHeadings.hs
index a5493a08..a5493a08 100644
--- a/tests/html-tests/tests/BugExportHeadings.hs
+++ b/html-test/tests/BugExportHeadings.hs
diff --git a/tests/html-tests/tests/BugExportHeadings.html.ref b/html-test/tests/BugExportHeadings.html.ref
index 457e2c50..457e2c50 100644
--- a/tests/html-tests/tests/BugExportHeadings.html.ref
+++ b/html-test/tests/BugExportHeadings.html.ref
diff --git a/tests/html-tests/tests/Bugs.hs b/html-test/tests/Bugs.hs
index 8e1f0079..8e1f0079 100644
--- a/tests/html-tests/tests/Bugs.hs
+++ b/html-test/tests/Bugs.hs
diff --git a/tests/html-tests/tests/Bugs.html.ref b/html-test/tests/Bugs.html.ref
index c5a4ca9d..c5a4ca9d 100644
--- a/tests/html-tests/tests/Bugs.html.ref
+++ b/html-test/tests/Bugs.html.ref
diff --git a/tests/html-tests/tests/CrossPackageDocs.hs b/html-test/tests/CrossPackageDocs.hs
index 4d529f79..4d529f79 100644
--- a/tests/html-tests/tests/CrossPackageDocs.hs
+++ b/html-test/tests/CrossPackageDocs.hs
diff --git a/tests/html-tests/tests/CrossPackageDocs.html.ref b/html-test/tests/CrossPackageDocs.html.ref
index fea3d0cc..fea3d0cc 100644
--- a/tests/html-tests/tests/CrossPackageDocs.html.ref
+++ b/html-test/tests/CrossPackageDocs.html.ref
diff --git a/tests/html-tests/tests/DeprecatedClass.hs b/html-test/tests/DeprecatedClass.hs
index 018904ab..018904ab 100644
--- a/tests/html-tests/tests/DeprecatedClass.hs
+++ b/html-test/tests/DeprecatedClass.hs
diff --git a/tests/html-tests/tests/DeprecatedClass.html.ref b/html-test/tests/DeprecatedClass.html.ref
index d716c1d8..d716c1d8 100644
--- a/tests/html-tests/tests/DeprecatedClass.html.ref
+++ b/html-test/tests/DeprecatedClass.html.ref
diff --git a/tests/html-tests/tests/DeprecatedData.hs b/html-test/tests/DeprecatedData.hs
index c40ba122..c40ba122 100644
--- a/tests/html-tests/tests/DeprecatedData.hs
+++ b/html-test/tests/DeprecatedData.hs
diff --git a/tests/html-tests/tests/DeprecatedData.html.ref b/html-test/tests/DeprecatedData.html.ref
index 24758345..24758345 100644
--- a/tests/html-tests/tests/DeprecatedData.html.ref
+++ b/html-test/tests/DeprecatedData.html.ref
diff --git a/tests/html-tests/tests/DeprecatedFunction.hs b/html-test/tests/DeprecatedFunction.hs
index 8d626435..8d626435 100644
--- a/tests/html-tests/tests/DeprecatedFunction.hs
+++ b/html-test/tests/DeprecatedFunction.hs
diff --git a/tests/html-tests/tests/DeprecatedFunction.html.ref b/html-test/tests/DeprecatedFunction.html.ref
index 1fc678bb..1fc678bb 100644
--- a/tests/html-tests/tests/DeprecatedFunction.html.ref
+++ b/html-test/tests/DeprecatedFunction.html.ref
diff --git a/tests/html-tests/tests/DeprecatedFunction2.hs b/html-test/tests/DeprecatedFunction2.hs
index bdbbf95c..bdbbf95c 100644
--- a/tests/html-tests/tests/DeprecatedFunction2.hs
+++ b/html-test/tests/DeprecatedFunction2.hs
diff --git a/tests/html-tests/tests/DeprecatedFunction2.html.ref b/html-test/tests/DeprecatedFunction2.html.ref
index b5068c8e..b5068c8e 100644
--- a/tests/html-tests/tests/DeprecatedFunction2.html.ref
+++ b/html-test/tests/DeprecatedFunction2.html.ref
diff --git a/tests/html-tests/tests/DeprecatedFunction3.hs b/html-test/tests/DeprecatedFunction3.hs
index ca719bda..ca719bda 100644
--- a/tests/html-tests/tests/DeprecatedFunction3.hs
+++ b/html-test/tests/DeprecatedFunction3.hs
diff --git a/tests/html-tests/tests/DeprecatedFunction3.html.ref b/html-test/tests/DeprecatedFunction3.html.ref
index f24eb666..f24eb666 100644
--- a/tests/html-tests/tests/DeprecatedFunction3.html.ref
+++ b/html-test/tests/DeprecatedFunction3.html.ref
diff --git a/tests/html-tests/tests/DeprecatedModule.hs b/html-test/tests/DeprecatedModule.hs
index 369dba4f..369dba4f 100644
--- a/tests/html-tests/tests/DeprecatedModule.hs
+++ b/html-test/tests/DeprecatedModule.hs
diff --git a/tests/html-tests/tests/DeprecatedModule.html.ref b/html-test/tests/DeprecatedModule.html.ref
index 0ca4fafe..0ca4fafe 100644
--- a/tests/html-tests/tests/DeprecatedModule.html.ref
+++ b/html-test/tests/DeprecatedModule.html.ref
diff --git a/tests/html-tests/tests/DeprecatedModule2.hs b/html-test/tests/DeprecatedModule2.hs
index 94185297..94185297 100644
--- a/tests/html-tests/tests/DeprecatedModule2.hs
+++ b/html-test/tests/DeprecatedModule2.hs
diff --git a/tests/html-tests/tests/DeprecatedModule2.html.ref b/html-test/tests/DeprecatedModule2.html.ref
index 0a313ae9..0a313ae9 100644
--- a/tests/html-tests/tests/DeprecatedModule2.html.ref
+++ b/html-test/tests/DeprecatedModule2.html.ref
diff --git a/tests/html-tests/tests/DeprecatedNewtype.hs b/html-test/tests/DeprecatedNewtype.hs
index 254f1f55..254f1f55 100644
--- a/tests/html-tests/tests/DeprecatedNewtype.hs
+++ b/html-test/tests/DeprecatedNewtype.hs
diff --git a/tests/html-tests/tests/DeprecatedNewtype.html.ref b/html-test/tests/DeprecatedNewtype.html.ref
index 521ffb92..521ffb92 100644
--- a/tests/html-tests/tests/DeprecatedNewtype.html.ref
+++ b/html-test/tests/DeprecatedNewtype.html.ref
diff --git a/tests/html-tests/tests/DeprecatedReExport.hs b/html-test/tests/DeprecatedReExport.hs
index f851e2ff..f851e2ff 100644
--- a/tests/html-tests/tests/DeprecatedReExport.hs
+++ b/html-test/tests/DeprecatedReExport.hs
diff --git a/tests/html-tests/tests/DeprecatedReExport.html.ref b/html-test/tests/DeprecatedReExport.html.ref
index 611c181d..611c181d 100644
--- a/tests/html-tests/tests/DeprecatedReExport.html.ref
+++ b/html-test/tests/DeprecatedReExport.html.ref
diff --git a/tests/html-tests/tests/DeprecatedRecord.hs b/html-test/tests/DeprecatedRecord.hs
index d44499e7..d44499e7 100644
--- a/tests/html-tests/tests/DeprecatedRecord.hs
+++ b/html-test/tests/DeprecatedRecord.hs
diff --git a/tests/html-tests/tests/DeprecatedRecord.html.ref b/html-test/tests/DeprecatedRecord.html.ref
index 9ade8377..9ade8377 100644
--- a/tests/html-tests/tests/DeprecatedRecord.html.ref
+++ b/html-test/tests/DeprecatedRecord.html.ref
diff --git a/tests/html-tests/tests/DeprecatedTypeFamily.hs b/html-test/tests/DeprecatedTypeFamily.hs
index 70473bb8..70473bb8 100644
--- a/tests/html-tests/tests/DeprecatedTypeFamily.hs
+++ b/html-test/tests/DeprecatedTypeFamily.hs
diff --git a/tests/html-tests/tests/DeprecatedTypeFamily.html.ref b/html-test/tests/DeprecatedTypeFamily.html.ref
index ffc069a6..ffc069a6 100644
--- a/tests/html-tests/tests/DeprecatedTypeFamily.html.ref
+++ b/html-test/tests/DeprecatedTypeFamily.html.ref
diff --git a/tests/html-tests/tests/DeprecatedTypeSynonym.hs b/html-test/tests/DeprecatedTypeSynonym.hs
index 34df47da..34df47da 100644
--- a/tests/html-tests/tests/DeprecatedTypeSynonym.hs
+++ b/html-test/tests/DeprecatedTypeSynonym.hs
diff --git a/tests/html-tests/tests/DeprecatedTypeSynonym.html.ref b/html-test/tests/DeprecatedTypeSynonym.html.ref
index 665dcf5d..665dcf5d 100644
--- a/tests/html-tests/tests/DeprecatedTypeSynonym.html.ref
+++ b/html-test/tests/DeprecatedTypeSynonym.html.ref
diff --git a/tests/html-tests/tests/DeprecationMessageParseError.hs b/html-test/tests/DeprecationMessageParseError.hs
index 2f8fb492..2f8fb492 100644
--- a/tests/html-tests/tests/DeprecationMessageParseError.hs
+++ b/html-test/tests/DeprecationMessageParseError.hs
diff --git a/tests/html-tests/tests/DeprecationMessageParseError.html.ref b/html-test/tests/DeprecationMessageParseError.html.ref
index 75f9bf54..75f9bf54 100644
--- a/tests/html-tests/tests/DeprecationMessageParseError.html.ref
+++ b/html-test/tests/DeprecationMessageParseError.html.ref
diff --git a/tests/html-tests/tests/Examples.hs b/html-test/tests/Examples.hs
index c8c450f1..c8c450f1 100644
--- a/tests/html-tests/tests/Examples.hs
+++ b/html-test/tests/Examples.hs
diff --git a/tests/html-tests/tests/Examples.html.ref b/html-test/tests/Examples.html.ref
index 7ebe7770..7ebe7770 100644
--- a/tests/html-tests/tests/Examples.html.ref
+++ b/html-test/tests/Examples.html.ref
diff --git a/tests/html-tests/tests/FunArgs.hs b/html-test/tests/FunArgs.hs
index b34d84b7..b34d84b7 100644
--- a/tests/html-tests/tests/FunArgs.hs
+++ b/html-test/tests/FunArgs.hs
diff --git a/tests/html-tests/tests/FunArgs.html.ref b/html-test/tests/FunArgs.html.ref
index 6c87d1e6..6c87d1e6 100644
--- a/tests/html-tests/tests/FunArgs.html.ref
+++ b/html-test/tests/FunArgs.html.ref
diff --git a/tests/html-tests/tests/GADTRecords.hs b/html-test/tests/GADTRecords.hs
index c77810ad..c77810ad 100644
--- a/tests/html-tests/tests/GADTRecords.hs
+++ b/html-test/tests/GADTRecords.hs
diff --git a/tests/html-tests/tests/GADTRecords.html.ref b/html-test/tests/GADTRecords.html.ref
index e3fcd2fe..e3fcd2fe 100644
--- a/tests/html-tests/tests/GADTRecords.html.ref
+++ b/html-test/tests/GADTRecords.html.ref
diff --git a/tests/html-tests/tests/Hash.hs b/html-test/tests/Hash.hs
index 343b69e9..343b69e9 100644
--- a/tests/html-tests/tests/Hash.hs
+++ b/html-test/tests/Hash.hs
diff --git a/tests/html-tests/tests/Hash.html.ref b/html-test/tests/Hash.html.ref
index b0cd183c..b0cd183c 100644
--- a/tests/html-tests/tests/Hash.html.ref
+++ b/html-test/tests/Hash.html.ref
diff --git a/tests/html-tests/tests/Hidden.hs b/html-test/tests/Hidden.hs
index 896da648..896da648 100644
--- a/tests/html-tests/tests/Hidden.hs
+++ b/html-test/tests/Hidden.hs
diff --git a/tests/html-tests/tests/HiddenInstances.hs b/html-test/tests/HiddenInstances.hs
index 99a6c2fd..99a6c2fd 100644
--- a/tests/html-tests/tests/HiddenInstances.hs
+++ b/html-test/tests/HiddenInstances.hs
diff --git a/tests/html-tests/tests/HiddenInstances.html.ref b/html-test/tests/HiddenInstances.html.ref
index 999c114d..999c114d 100644
--- a/tests/html-tests/tests/HiddenInstances.html.ref
+++ b/html-test/tests/HiddenInstances.html.ref
diff --git a/tests/html-tests/tests/HiddenInstancesA.hs b/html-test/tests/HiddenInstancesA.hs
index f1775208..f1775208 100644
--- a/tests/html-tests/tests/HiddenInstancesA.hs
+++ b/html-test/tests/HiddenInstancesA.hs
diff --git a/tests/html-tests/tests/HiddenInstancesB.hs b/html-test/tests/HiddenInstancesB.hs
index eabf0637..eabf0637 100644
--- a/tests/html-tests/tests/HiddenInstancesB.hs
+++ b/html-test/tests/HiddenInstancesB.hs
diff --git a/tests/html-tests/tests/HiddenInstancesB.html.ref b/html-test/tests/HiddenInstancesB.html.ref
index 207a5146..207a5146 100644
--- a/tests/html-tests/tests/HiddenInstancesB.html.ref
+++ b/html-test/tests/HiddenInstancesB.html.ref
diff --git a/tests/html-tests/tests/Hyperlinks.hs b/html-test/tests/Hyperlinks.hs
index 34e64448..34e64448 100644
--- a/tests/html-tests/tests/Hyperlinks.hs
+++ b/html-test/tests/Hyperlinks.hs
diff --git a/tests/html-tests/tests/Hyperlinks.html.ref b/html-test/tests/Hyperlinks.html.ref
index e7351a63..e7351a63 100644
--- a/tests/html-tests/tests/Hyperlinks.html.ref
+++ b/html-test/tests/Hyperlinks.html.ref
diff --git a/tests/html-tests/tests/IgnoreExports.hs b/html-test/tests/IgnoreExports.hs
index 0321ad02..0321ad02 100644
--- a/tests/html-tests/tests/IgnoreExports.hs
+++ b/html-test/tests/IgnoreExports.hs
diff --git a/tests/html-tests/tests/IgnoreExports.html.ref b/html-test/tests/IgnoreExports.html.ref
index c661b48c..c661b48c 100644
--- a/tests/html-tests/tests/IgnoreExports.html.ref
+++ b/html-test/tests/IgnoreExports.html.ref
diff --git a/tests/html-tests/tests/ModuleWithWarning.hs b/html-test/tests/ModuleWithWarning.hs
index e64d9d7e..e64d9d7e 100644
--- a/tests/html-tests/tests/ModuleWithWarning.hs
+++ b/html-test/tests/ModuleWithWarning.hs
diff --git a/tests/html-tests/tests/ModuleWithWarning.html.ref b/html-test/tests/ModuleWithWarning.html.ref
index 348f0822..348f0822 100644
--- a/tests/html-tests/tests/ModuleWithWarning.html.ref
+++ b/html-test/tests/ModuleWithWarning.html.ref
diff --git a/tests/html-tests/tests/NamedDoc.hs b/html-test/tests/NamedDoc.hs
index 7c04ba72..7c04ba72 100644
--- a/tests/html-tests/tests/NamedDoc.hs
+++ b/html-test/tests/NamedDoc.hs
diff --git a/tests/html-tests/tests/NamedDoc.html.ref b/html-test/tests/NamedDoc.html.ref
index d2b8ede1..d2b8ede1 100644
--- a/tests/html-tests/tests/NamedDoc.html.ref
+++ b/html-test/tests/NamedDoc.html.ref
diff --git a/tests/html-tests/tests/NoLayout.hs b/html-test/tests/NoLayout.hs
index 19b38b1d..19b38b1d 100644
--- a/tests/html-tests/tests/NoLayout.hs
+++ b/html-test/tests/NoLayout.hs
diff --git a/tests/html-tests/tests/NoLayout.html.ref b/html-test/tests/NoLayout.html.ref
index 871add05..871add05 100644
--- a/tests/html-tests/tests/NoLayout.html.ref
+++ b/html-test/tests/NoLayout.html.ref
diff --git a/tests/html-tests/tests/NonGreedy.hs b/html-test/tests/NonGreedy.hs
index f51b55f5..f51b55f5 100644
--- a/tests/html-tests/tests/NonGreedy.hs
+++ b/html-test/tests/NonGreedy.hs
diff --git a/tests/html-tests/tests/NonGreedy.html.ref b/html-test/tests/NonGreedy.html.ref
index 23d3f695..23d3f695 100644
--- a/tests/html-tests/tests/NonGreedy.html.ref
+++ b/html-test/tests/NonGreedy.html.ref
diff --git a/tests/html-tests/tests/Properties.hs b/html-test/tests/Properties.hs
index 05930ece..05930ece 100644
--- a/tests/html-tests/tests/Properties.hs
+++ b/html-test/tests/Properties.hs
diff --git a/tests/html-tests/tests/Properties.html.ref b/html-test/tests/Properties.html.ref
index 1c4ce893..1c4ce893 100644
--- a/tests/html-tests/tests/Properties.html.ref
+++ b/html-test/tests/Properties.html.ref
diff --git a/tests/html-tests/tests/PruneWithWarning.hs b/html-test/tests/PruneWithWarning.hs
index bfa55ea2..bfa55ea2 100644
--- a/tests/html-tests/tests/PruneWithWarning.hs
+++ b/html-test/tests/PruneWithWarning.hs
diff --git a/tests/html-tests/tests/PruneWithWarning.html.ref b/html-test/tests/PruneWithWarning.html.ref
index 3c31fbdf..3c31fbdf 100644
--- a/tests/html-tests/tests/PruneWithWarning.html.ref
+++ b/html-test/tests/PruneWithWarning.html.ref
diff --git a/tests/html-tests/tests/QuasiExpr.hs b/html-test/tests/QuasiExpr.hs
index 970759ba..970759ba 100644
--- a/tests/html-tests/tests/QuasiExpr.hs
+++ b/html-test/tests/QuasiExpr.hs
diff --git a/tests/html-tests/tests/QuasiExpr.html.ref b/html-test/tests/QuasiExpr.html.ref
index 0a699f35..0a699f35 100644
--- a/tests/html-tests/tests/QuasiExpr.html.ref
+++ b/html-test/tests/QuasiExpr.html.ref
diff --git a/tests/html-tests/tests/QuasiQuote.hs b/html-test/tests/QuasiQuote.hs
index 06762cf9..06762cf9 100644
--- a/tests/html-tests/tests/QuasiQuote.hs
+++ b/html-test/tests/QuasiQuote.hs
diff --git a/tests/html-tests/tests/QuasiQuote.html.ref b/html-test/tests/QuasiQuote.html.ref
index f61f2b84..f61f2b84 100644
--- a/tests/html-tests/tests/QuasiQuote.html.ref
+++ b/html-test/tests/QuasiQuote.html.ref
diff --git a/tests/html-tests/tests/TH.hs b/html-test/tests/TH.hs
index f8178bcb..f8178bcb 100644
--- a/tests/html-tests/tests/TH.hs
+++ b/html-test/tests/TH.hs
diff --git a/tests/html-tests/tests/TH.html.ref b/html-test/tests/TH.html.ref
index 086d6a4a..086d6a4a 100644
--- a/tests/html-tests/tests/TH.html.ref
+++ b/html-test/tests/TH.html.ref
diff --git a/tests/html-tests/tests/TH2.hs b/html-test/tests/TH2.hs
index ea85e547..ea85e547 100644
--- a/tests/html-tests/tests/TH2.hs
+++ b/html-test/tests/TH2.hs
diff --git a/tests/html-tests/tests/TH2.html.ref b/html-test/tests/TH2.html.ref
index 4d4a8914..4d4a8914 100644
--- a/tests/html-tests/tests/TH2.html.ref
+++ b/html-test/tests/TH2.html.ref
diff --git a/tests/html-tests/tests/Test.hs b/html-test/tests/Test.hs
index d352f029..d352f029 100644
--- a/tests/html-tests/tests/Test.hs
+++ b/html-test/tests/Test.hs
diff --git a/tests/html-tests/tests/Test.html.ref b/html-test/tests/Test.html.ref
index f2ef2b28..f2ef2b28 100644
--- a/tests/html-tests/tests/Test.html.ref
+++ b/html-test/tests/Test.html.ref
diff --git a/tests/html-tests/tests/Ticket112.hs b/html-test/tests/Ticket112.hs
index c9cd5117..c9cd5117 100644
--- a/tests/html-tests/tests/Ticket112.hs
+++ b/html-test/tests/Ticket112.hs
diff --git a/tests/html-tests/tests/Ticket112.html.ref b/html-test/tests/Ticket112.html.ref
index c5c61703..c5c61703 100644
--- a/tests/html-tests/tests/Ticket112.html.ref
+++ b/html-test/tests/Ticket112.html.ref
diff --git a/tests/html-tests/tests/Ticket61.hs b/html-test/tests/Ticket61.hs
index 26ca287f..26ca287f 100644
--- a/tests/html-tests/tests/Ticket61.hs
+++ b/html-test/tests/Ticket61.hs
diff --git a/tests/html-tests/tests/Ticket61.html.ref b/html-test/tests/Ticket61.html.ref
index 8c22488b..8c22488b 100644
--- a/tests/html-tests/tests/Ticket61.html.ref
+++ b/html-test/tests/Ticket61.html.ref
diff --git a/tests/html-tests/tests/Ticket61_Hidden.hs b/html-test/tests/Ticket61_Hidden.hs
index 583c10cd..583c10cd 100644
--- a/tests/html-tests/tests/Ticket61_Hidden.hs
+++ b/html-test/tests/Ticket61_Hidden.hs
diff --git a/tests/html-tests/tests/Ticket75.hs b/html-test/tests/Ticket75.hs
index 94a2f115..94a2f115 100644
--- a/tests/html-tests/tests/Ticket75.hs
+++ b/html-test/tests/Ticket75.hs
diff --git a/tests/html-tests/tests/Ticket75.html.ref b/html-test/tests/Ticket75.html.ref
index cd510ea5..cd510ea5 100644
--- a/tests/html-tests/tests/Ticket75.html.ref
+++ b/html-test/tests/Ticket75.html.ref
diff --git a/tests/html-tests/tests/TypeFamilies.hs b/html-test/tests/TypeFamilies.hs
index 561f95fd..561f95fd 100644
--- a/tests/html-tests/tests/TypeFamilies.hs
+++ b/html-test/tests/TypeFamilies.hs
diff --git a/tests/html-tests/tests/TypeFamilies.html.ref b/html-test/tests/TypeFamilies.html.ref
index 196d60ec..196d60ec 100644
--- a/tests/html-tests/tests/TypeFamilies.html.ref
+++ b/html-test/tests/TypeFamilies.html.ref
diff --git a/tests/html-tests/tests/TypeOperators.hs b/html-test/tests/TypeOperators.hs
index edbb9344..edbb9344 100644
--- a/tests/html-tests/tests/TypeOperators.hs
+++ b/html-test/tests/TypeOperators.hs
diff --git a/tests/html-tests/tests/TypeOperators.html.ref b/html-test/tests/TypeOperators.html.ref
index 2b18727f..2b18727f 100644
--- a/tests/html-tests/tests/TypeOperators.html.ref
+++ b/html-test/tests/TypeOperators.html.ref
diff --git a/tests/html-tests/tests/Unicode.hs.disabled b/html-test/tests/Unicode.hs.disabled
index d5bbf445..d5bbf445 100644
--- a/tests/html-tests/tests/Unicode.hs.disabled
+++ b/html-test/tests/Unicode.hs.disabled
diff --git a/tests/html-tests/tests/Unicode.html.ref b/html-test/tests/Unicode.html.ref
index 13ef6c1e..13ef6c1e 100644
--- a/tests/html-tests/tests/Unicode.html.ref
+++ b/html-test/tests/Unicode.html.ref
diff --git a/tests/html-tests/tests/Visible.hs b/html-test/tests/Visible.hs
index cad71931..cad71931 100644
--- a/tests/html-tests/tests/Visible.hs
+++ b/html-test/tests/Visible.hs
diff --git a/tests/html-tests/tests/Visible.html.ref b/html-test/tests/Visible.html.ref
index de8b8d80..de8b8d80 100644
--- a/tests/html-tests/tests/Visible.html.ref
+++ b/html-test/tests/Visible.html.ref
diff --git a/tests/html-tests/tests/frames.html.ref b/html-test/tests/frames.html.ref
index 1b4e38d4..1b4e38d4 100644
--- a/tests/html-tests/tests/frames.html.ref
+++ b/html-test/tests/frames.html.ref
diff --git a/tests/html-tests/tests/mini_A.html.ref b/html-test/tests/mini_A.html.ref
index cbe50e41..cbe50e41 100644
--- a/tests/html-tests/tests/mini_A.html.ref
+++ b/html-test/tests/mini_A.html.ref
diff --git a/tests/html-tests/tests/mini_AdvanceTypes.html.ref b/html-test/tests/mini_AdvanceTypes.html.ref
index 59d8dcb1..59d8dcb1 100644
--- a/tests/html-tests/tests/mini_AdvanceTypes.html.ref
+++ b/html-test/tests/mini_AdvanceTypes.html.ref
diff --git a/tests/html-tests/tests/mini_B.html.ref b/html-test/tests/mini_B.html.ref
index 211a7deb..211a7deb 100644
--- a/tests/html-tests/tests/mini_B.html.ref
+++ b/html-test/tests/mini_B.html.ref
diff --git a/tests/html-tests/tests/mini_Bug1.html.ref b/html-test/tests/mini_Bug1.html.ref
index adf81c73..adf81c73 100644
--- a/tests/html-tests/tests/mini_Bug1.html.ref
+++ b/html-test/tests/mini_Bug1.html.ref
diff --git a/tests/html-tests/tests/mini_Bug2.html.ref b/html-test/tests/mini_Bug2.html.ref
index b673e459..b673e459 100644
--- a/tests/html-tests/tests/mini_Bug2.html.ref
+++ b/html-test/tests/mini_Bug2.html.ref
diff --git a/tests/html-tests/tests/mini_Bug3.html.ref b/html-test/tests/mini_Bug3.html.ref
index af4cc445..af4cc445 100644
--- a/tests/html-tests/tests/mini_Bug3.html.ref
+++ b/html-test/tests/mini_Bug3.html.ref
diff --git a/tests/html-tests/tests/mini_Bug4.html.ref b/html-test/tests/mini_Bug4.html.ref
index b403e94a..b403e94a 100644
--- a/tests/html-tests/tests/mini_Bug4.html.ref
+++ b/html-test/tests/mini_Bug4.html.ref
diff --git a/tests/html-tests/tests/mini_Bug6.html.ref b/html-test/tests/mini_Bug6.html.ref
index 5c5c1119..5c5c1119 100644
--- a/tests/html-tests/tests/mini_Bug6.html.ref
+++ b/html-test/tests/mini_Bug6.html.ref
diff --git a/tests/html-tests/tests/mini_Bug7.html.ref b/html-test/tests/mini_Bug7.html.ref
index 1bec82ee..1bec82ee 100644
--- a/tests/html-tests/tests/mini_Bug7.html.ref
+++ b/html-test/tests/mini_Bug7.html.ref
diff --git a/tests/html-tests/tests/mini_Bug8.html.ref b/html-test/tests/mini_Bug8.html.ref
index 070dbcf8..070dbcf8 100644
--- a/tests/html-tests/tests/mini_Bug8.html.ref
+++ b/html-test/tests/mini_Bug8.html.ref
diff --git a/tests/html-tests/tests/mini_BugDeprecated.html.ref b/html-test/tests/mini_BugDeprecated.html.ref
index f0410137..f0410137 100644
--- a/tests/html-tests/tests/mini_BugDeprecated.html.ref
+++ b/html-test/tests/mini_BugDeprecated.html.ref
diff --git a/tests/html-tests/tests/mini_BugExportHeadings.html.ref b/html-test/tests/mini_BugExportHeadings.html.ref
index b481720d..b481720d 100644
--- a/tests/html-tests/tests/mini_BugExportHeadings.html.ref
+++ b/html-test/tests/mini_BugExportHeadings.html.ref
diff --git a/tests/html-tests/tests/mini_Bugs.html.ref b/html-test/tests/mini_Bugs.html.ref
index 3c758375..3c758375 100644
--- a/tests/html-tests/tests/mini_Bugs.html.ref
+++ b/html-test/tests/mini_Bugs.html.ref
diff --git a/tests/html-tests/tests/mini_CrossPackageDocs.html.ref b/html-test/tests/mini_CrossPackageDocs.html.ref
index 4c0588ba..4c0588ba 100644
--- a/tests/html-tests/tests/mini_CrossPackageDocs.html.ref
+++ b/html-test/tests/mini_CrossPackageDocs.html.ref
diff --git a/tests/html-tests/tests/mini_DeprecatedClass.html.ref b/html-test/tests/mini_DeprecatedClass.html.ref
index 3923c1ff..3923c1ff 100644
--- a/tests/html-tests/tests/mini_DeprecatedClass.html.ref
+++ b/html-test/tests/mini_DeprecatedClass.html.ref
diff --git a/tests/html-tests/tests/mini_DeprecatedData.html.ref b/html-test/tests/mini_DeprecatedData.html.ref
index 8ef20113..8ef20113 100644
--- a/tests/html-tests/tests/mini_DeprecatedData.html.ref
+++ b/html-test/tests/mini_DeprecatedData.html.ref
diff --git a/tests/html-tests/tests/mini_DeprecatedFunction.html.ref b/html-test/tests/mini_DeprecatedFunction.html.ref
index 9bb90dac..9bb90dac 100644
--- a/tests/html-tests/tests/mini_DeprecatedFunction.html.ref
+++ b/html-test/tests/mini_DeprecatedFunction.html.ref
diff --git a/tests/html-tests/tests/mini_DeprecatedFunction2.html.ref b/html-test/tests/mini_DeprecatedFunction2.html.ref
index a03991a9..a03991a9 100644
--- a/tests/html-tests/tests/mini_DeprecatedFunction2.html.ref
+++ b/html-test/tests/mini_DeprecatedFunction2.html.ref
diff --git a/tests/html-tests/tests/mini_DeprecatedFunction3.html.ref b/html-test/tests/mini_DeprecatedFunction3.html.ref
index 4ea60339..4ea60339 100644
--- a/tests/html-tests/tests/mini_DeprecatedFunction3.html.ref
+++ b/html-test/tests/mini_DeprecatedFunction3.html.ref
diff --git a/tests/html-tests/tests/mini_DeprecatedModule.html.ref b/html-test/tests/mini_DeprecatedModule.html.ref
index bfdef611..bfdef611 100644
--- a/tests/html-tests/tests/mini_DeprecatedModule.html.ref
+++ b/html-test/tests/mini_DeprecatedModule.html.ref
diff --git a/tests/html-tests/tests/mini_DeprecatedModule2.html.ref b/html-test/tests/mini_DeprecatedModule2.html.ref
index dbcc43b9..dbcc43b9 100644
--- a/tests/html-tests/tests/mini_DeprecatedModule2.html.ref
+++ b/html-test/tests/mini_DeprecatedModule2.html.ref
diff --git a/tests/html-tests/tests/mini_DeprecatedNewtype.html.ref b/html-test/tests/mini_DeprecatedNewtype.html.ref
index a913525f..a913525f 100644
--- a/tests/html-tests/tests/mini_DeprecatedNewtype.html.ref
+++ b/html-test/tests/mini_DeprecatedNewtype.html.ref
diff --git a/tests/html-tests/tests/mini_DeprecatedReExport.html.ref b/html-test/tests/mini_DeprecatedReExport.html.ref
index 8316dda5..8316dda5 100644
--- a/tests/html-tests/tests/mini_DeprecatedReExport.html.ref
+++ b/html-test/tests/mini_DeprecatedReExport.html.ref
diff --git a/tests/html-tests/tests/mini_DeprecatedRecord.html.ref b/html-test/tests/mini_DeprecatedRecord.html.ref
index 3d949d2d..3d949d2d 100644
--- a/tests/html-tests/tests/mini_DeprecatedRecord.html.ref
+++ b/html-test/tests/mini_DeprecatedRecord.html.ref
diff --git a/tests/html-tests/tests/mini_DeprecatedTypeFamily.html.ref b/html-test/tests/mini_DeprecatedTypeFamily.html.ref
index c87d9637..c87d9637 100644
--- a/tests/html-tests/tests/mini_DeprecatedTypeFamily.html.ref
+++ b/html-test/tests/mini_DeprecatedTypeFamily.html.ref
diff --git a/tests/html-tests/tests/mini_DeprecatedTypeSynonym.html.ref b/html-test/tests/mini_DeprecatedTypeSynonym.html.ref
index 5ade100d..5ade100d 100644
--- a/tests/html-tests/tests/mini_DeprecatedTypeSynonym.html.ref
+++ b/html-test/tests/mini_DeprecatedTypeSynonym.html.ref
diff --git a/tests/html-tests/tests/mini_DeprecationMessageParseError.html.ref b/html-test/tests/mini_DeprecationMessageParseError.html.ref
index e52f487f..e52f487f 100644
--- a/tests/html-tests/tests/mini_DeprecationMessageParseError.html.ref
+++ b/html-test/tests/mini_DeprecationMessageParseError.html.ref
diff --git a/tests/html-tests/tests/mini_Examples.html.ref b/html-test/tests/mini_Examples.html.ref
index c99c2c48..c99c2c48 100644
--- a/tests/html-tests/tests/mini_Examples.html.ref
+++ b/html-test/tests/mini_Examples.html.ref
diff --git a/tests/html-tests/tests/mini_FunArgs.html.ref b/html-test/tests/mini_FunArgs.html.ref
index 89729720..89729720 100644
--- a/tests/html-tests/tests/mini_FunArgs.html.ref
+++ b/html-test/tests/mini_FunArgs.html.ref
diff --git a/tests/html-tests/tests/mini_GADTRecords.html.ref b/html-test/tests/mini_GADTRecords.html.ref
index a8b838f0..a8b838f0 100644
--- a/tests/html-tests/tests/mini_GADTRecords.html.ref
+++ b/html-test/tests/mini_GADTRecords.html.ref
diff --git a/tests/html-tests/tests/mini_Hash.html.ref b/html-test/tests/mini_Hash.html.ref
index 1e6ad1a9..1e6ad1a9 100644
--- a/tests/html-tests/tests/mini_Hash.html.ref
+++ b/html-test/tests/mini_Hash.html.ref
diff --git a/tests/html-tests/tests/mini_HiddenInstances.html.ref b/html-test/tests/mini_HiddenInstances.html.ref
index 0f1a2e04..0f1a2e04 100644
--- a/tests/html-tests/tests/mini_HiddenInstances.html.ref
+++ b/html-test/tests/mini_HiddenInstances.html.ref
diff --git a/tests/html-tests/tests/mini_HiddenInstancesB.html.ref b/html-test/tests/mini_HiddenInstancesB.html.ref
index 3ce4f6a9..3ce4f6a9 100644
--- a/tests/html-tests/tests/mini_HiddenInstancesB.html.ref
+++ b/html-test/tests/mini_HiddenInstancesB.html.ref
diff --git a/tests/html-tests/tests/mini_Hyperlinks.html.ref b/html-test/tests/mini_Hyperlinks.html.ref
index f0c7d65a..f0c7d65a 100644
--- a/tests/html-tests/tests/mini_Hyperlinks.html.ref
+++ b/html-test/tests/mini_Hyperlinks.html.ref
diff --git a/tests/html-tests/tests/mini_IgnoreExports.html.ref b/html-test/tests/mini_IgnoreExports.html.ref
index a420e65a..a420e65a 100644
--- a/tests/html-tests/tests/mini_IgnoreExports.html.ref
+++ b/html-test/tests/mini_IgnoreExports.html.ref
diff --git a/tests/html-tests/tests/mini_ModuleWithWarning.html.ref b/html-test/tests/mini_ModuleWithWarning.html.ref
index 19315a14..19315a14 100644
--- a/tests/html-tests/tests/mini_ModuleWithWarning.html.ref
+++ b/html-test/tests/mini_ModuleWithWarning.html.ref
diff --git a/tests/html-tests/tests/mini_NamedDoc.html.ref b/html-test/tests/mini_NamedDoc.html.ref
index 066bbc61..066bbc61 100644
--- a/tests/html-tests/tests/mini_NamedDoc.html.ref
+++ b/html-test/tests/mini_NamedDoc.html.ref
diff --git a/tests/html-tests/tests/mini_NoLayout.html.ref b/html-test/tests/mini_NoLayout.html.ref
index 19562d70..19562d70 100644
--- a/tests/html-tests/tests/mini_NoLayout.html.ref
+++ b/html-test/tests/mini_NoLayout.html.ref
diff --git a/tests/html-tests/tests/mini_NonGreedy.html.ref b/html-test/tests/mini_NonGreedy.html.ref
index 698c368e..698c368e 100644
--- a/tests/html-tests/tests/mini_NonGreedy.html.ref
+++ b/html-test/tests/mini_NonGreedy.html.ref
diff --git a/tests/html-tests/tests/mini_Properties.html.ref b/html-test/tests/mini_Properties.html.ref
index 5f538dfd..5f538dfd 100644
--- a/tests/html-tests/tests/mini_Properties.html.ref
+++ b/html-test/tests/mini_Properties.html.ref
diff --git a/tests/html-tests/tests/mini_PruneWithWarning.html.ref b/html-test/tests/mini_PruneWithWarning.html.ref
index 9eb3aa00..9eb3aa00 100644
--- a/tests/html-tests/tests/mini_PruneWithWarning.html.ref
+++ b/html-test/tests/mini_PruneWithWarning.html.ref
diff --git a/tests/html-tests/tests/mini_QuasiExpr.html.ref b/html-test/tests/mini_QuasiExpr.html.ref
index 7dd9b829..7dd9b829 100644
--- a/tests/html-tests/tests/mini_QuasiExpr.html.ref
+++ b/html-test/tests/mini_QuasiExpr.html.ref
diff --git a/tests/html-tests/tests/mini_QuasiQuote.html.ref b/html-test/tests/mini_QuasiQuote.html.ref
index 5dac6acc..5dac6acc 100644
--- a/tests/html-tests/tests/mini_QuasiQuote.html.ref
+++ b/html-test/tests/mini_QuasiQuote.html.ref
diff --git a/tests/html-tests/tests/mini_TH.html.ref b/html-test/tests/mini_TH.html.ref
index d2ddbabc..d2ddbabc 100644
--- a/tests/html-tests/tests/mini_TH.html.ref
+++ b/html-test/tests/mini_TH.html.ref
diff --git a/tests/html-tests/tests/mini_TH2.html.ref b/html-test/tests/mini_TH2.html.ref
index 2c9f1340..2c9f1340 100644
--- a/tests/html-tests/tests/mini_TH2.html.ref
+++ b/html-test/tests/mini_TH2.html.ref
diff --git a/tests/html-tests/tests/mini_Test.html.ref b/html-test/tests/mini_Test.html.ref
index 26db2c0f..26db2c0f 100644
--- a/tests/html-tests/tests/mini_Test.html.ref
+++ b/html-test/tests/mini_Test.html.ref
diff --git a/tests/html-tests/tests/mini_Ticket112.html.ref b/html-test/tests/mini_Ticket112.html.ref
index 68a0a5e5..68a0a5e5 100644
--- a/tests/html-tests/tests/mini_Ticket112.html.ref
+++ b/html-test/tests/mini_Ticket112.html.ref
diff --git a/tests/html-tests/tests/mini_Ticket61.html.ref b/html-test/tests/mini_Ticket61.html.ref
index a73fefca..a73fefca 100644
--- a/tests/html-tests/tests/mini_Ticket61.html.ref
+++ b/html-test/tests/mini_Ticket61.html.ref
diff --git a/tests/html-tests/tests/mini_Ticket75.html.ref b/html-test/tests/mini_Ticket75.html.ref
index 75ce882c..75ce882c 100644
--- a/tests/html-tests/tests/mini_Ticket75.html.ref
+++ b/html-test/tests/mini_Ticket75.html.ref
diff --git a/tests/html-tests/tests/mini_TypeFamilies.html.ref b/html-test/tests/mini_TypeFamilies.html.ref
index 0cf39c88..0cf39c88 100644
--- a/tests/html-tests/tests/mini_TypeFamilies.html.ref
+++ b/html-test/tests/mini_TypeFamilies.html.ref
diff --git a/tests/html-tests/tests/mini_TypeOperators.html.ref b/html-test/tests/mini_TypeOperators.html.ref
index 86b6beec..86b6beec 100644
--- a/tests/html-tests/tests/mini_TypeOperators.html.ref
+++ b/html-test/tests/mini_TypeOperators.html.ref
diff --git a/tests/html-tests/tests/mini_Unicode.html.ref b/html-test/tests/mini_Unicode.html.ref
index 55336980..55336980 100644
--- a/tests/html-tests/tests/mini_Unicode.html.ref
+++ b/html-test/tests/mini_Unicode.html.ref
diff --git a/tests/html-tests/tests/mini_Visible.html.ref b/html-test/tests/mini_Visible.html.ref
index 976a30c5..976a30c5 100644
--- a/tests/html-tests/tests/mini_Visible.html.ref
+++ b/html-test/tests/mini_Visible.html.ref