Be compatible with GHC 6.8.3

    
The cabal file is converted to use the "new" syntax with explicit Library
and Executable sections.

We define the __GHC_PATCHLEVEL__ symbol using a conditinal cpp-options field
in the cabal file. (Ideally, Cabal would define the symbol for us, like it does
for __GLASGOW_HASKELL__).

We use these symbols to #ifdef around a small difference between 6.8.2 and 6.8.3.
    
Previously, we only supported GHC 6.8.2 officially but the dependencies field
said "ghc <= 6.9". This was just for convenience when testing against the (then 
compatible) HEAD version of GHC, and was left in the release by mistake.
  
Now, we support both GHC 6.8.2 and 6.8.3 and the dependencies field
correctly reflects this.

47 files changed, 158 insertions, 139 deletions

diff --git a/haddock.cabal b/haddock.cabal
index 83d0d63b..4f25ae61 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -1,8 +1,8 @@
-cabal-version:        >= 1.2
-build-type:           Simple
 name:                 haddock
 version:              2.2.0
+cabal-version:        >= 1.2
 license:              BSD3
+build-type:           Simple
 license-file:         LICENSE
 copyright:            (c) Simon Marlow, David Waern
 author:               Simon Marlow, David Waern
@@ -13,95 +13,110 @@ synopsis:             A documentation-generation tool for Haskell libraries
 description:          Haddock is a documentation-generation tool for Haskell
                       libraries
 category:             Development
-build-depends:
-  base,
-  haskell98,
-  ghc >= 6.8.2 && < 6.9,
-  ghc-paths,
-  filepath,
-  directory,
-  pretty,
-  containers,
-  array
-extensions:           CPP, PatternGuards, DeriveDataTypeable,
-                      PatternSignatures, MagicHash
-hs-source-dirs:       src
-exposed-modules:      Distribution.Haddock
-other-modules:
-  Haddock.Types
-  Haddock.InterfaceFile
-  Haddock.Exception
-data-files:
-  html/haddock-DEBUG.css
-  html/haddock.css
-  html/haddock-util.js
-  html/haskell_icon.gif
-  html/minus.gif
-  html/plus.gif
+
 extra-source-files:
-	CHANGES
-	README
-	TODO
-	doc/Makefile
-	doc/README
-	doc/aclocal.m4
-	doc/config.mk.in
-	doc/configure.ac
-	doc/docbook-xml.mk
-	doc/fptools.css
-	doc/haddock.xml
-	examples/A.hs
-	examples/B.hs
-	examples/Bug1.hs
-	examples/Bug2.hs
-	examples/Bug3.hs
-	examples/Bug4.hs
-	examples/Bug6.hs
-	examples/Bug7.hs
-	examples/Bug8.hs
-	examples/Bug9.hs
-	examples/Hash.hs
-	examples/Hidden.hs
-	examples/Makefile
-	examples/NoLayout.hs
-	examples/Test.hs
-	examples/Visible.hs
-	examples/hide-bug/A.hs
-	examples/hide-bug/B.hs
-	examples/hide-bug/C.hs
-	examples/hide-bug/D.hs
-	haddock.spec
-	haskell.vim
-	src/haddock.sh
+  CHANGES
+  README
+  TODO
+  doc/Makefile
+  doc/README
+  doc/aclocal.m4
+  doc/config.mk.in
+  doc/configure.ac
+  doc/docbook-xml.mk
+  doc/fptools.css
+  doc/haddock.xml
+  examples/A.hs
+  examples/B.hs
+  examples/Bug1.hs
+  examples/Bug2.hs
+  examples/Bug3.hs
+  examples/Bug4.hs
+  examples/Bug6.hs
+  examples/Bug7.hs
+  examples/Bug8.hs
+  examples/Bug9.hs
+  examples/Hash.hs
+  examples/Hidden.hs
+  examples/Makefile
+  examples/NoLayout.hs
+  examples/Test.hs
+  examples/Visible.hs
+  examples/hide-bug/A.hs
+  examples/hide-bug/B.hs
+  examples/hide-bug/C.hs
+  examples/hide-bug/D.hs
+  haddock.spec
+  haskell.vim
+  src/haddock.sh
+
+data-files:
+	html/haddock-DEBUG.css
+	html/haddock.css
+	html/haddock-util.js
+	html/haskell_icon.gif
+	html/minus.gif
+	html/plus.gif
+
+
+
+executable haddock
+  build-depends:
+    base,
+    haskell98,
+    ghc == 6.8.2 || == 6.8.3,
+    ghc-paths,
+    filepath,
+    directory,
+    pretty,
+    containers,
+    array
+  main-is:              Main.hs
+  hs-source-dirs:       src
+  extensions:           CPP, PatternGuards, DeriveDataTypeable,
+                        PatternSignatures, MagicHash
+  ghc-options:          -funbox-strict-fields -O2
+
+  other-modules:
+    Haddock.Interface
+    Haddock.Interface.Rename
+    Haddock.Interface.Create
+    Haddock.Interface.AttachInstances
+    Haddock.Utils.FastMutInt2
+    Haddock.Utils.BlockTable
+    Haddock.Utils.Html
+    Haddock.Utils
+    Haddock.Backends.Html
+    Haddock.Backends.HaddockDB
+    Haddock.Backends.DevHelp
+    Haddock.Backends.HH
+    Haddock.Backends.HH2
+    Haddock.Backends.Hoogle
+    Haddock.ModuleTree
+    Haddock.Types
+    Haddock.DocName
+    Haddock.Version
+    Haddock.InterfaceFile        
+    Haddock.Exception
+    Haddock.Options
+    Haddock.GHC.Typecheck
+    Haddock.GHC.Utils
+    Haddock.GHC
+   
+  -- Cabal doesn't define __GHC_PATCHLEVEL__
+  if impl(ghc == 6.8.3)
+    cpp-options: -D__GHC_PATCHLEVEL__=3
+  if impl(ghc == 6.8.2)
+    cpp-options: -D__GHC_PATCHLEVEL__=2
+
+
 
-executable:           haddock
-hs-source-dirs:       src
-main-is:              Main.hs
-extensions:           CPP, PatternGuards, DeriveDataTypeable,
-                      PatternSignatures, MagicHash
-ghc-options:          -funbox-strict-fields -O2
-other-modules:
-  Haddock.Interface
-  Haddock.Interface.Rename
-  Haddock.Interface.Create
-  Haddock.Interface.AttachInstances
-  Haddock.Utils.FastMutInt2
-  Haddock.Utils.BlockTable
-  Haddock.Utils.Html
-  Haddock.Utils
-  Haddock.Backends.Html
-  Haddock.Backends.HaddockDB
-  Haddock.Backends.DevHelp
-  Haddock.Backends.HH
-  Haddock.Backends.HH2
-  Haddock.Backends.Hoogle
-  Haddock.ModuleTree
-  Haddock.Types
-  Haddock.DocName
-  Haddock.Version
-  Haddock.InterfaceFile        
-  Haddock.Exception
-  Haddock.Options
-  Haddock.GHC.Typecheck
-  Haddock.GHC.Utils
-  Haddock.GHC
+library
+  hs-source-dirs:       src
+  extensions:           CPP, PatternGuards, DeriveDataTypeable,
+                        PatternSignatures, MagicHash
+  exposed-modules:      Distribution.Haddock
+  other-modules:
+    Haddock.Types
+    Haddock.InterfaceFile
+    Haddock.Exception
diff --git a/src/Haddock/GHC/Typecheck.hs b/src/Haddock/GHC/Typecheck.hs
index f0626231..0df6fc29 100644
--- a/src/Haddock/GHC/Typecheck.hs
+++ b/src/Haddock/GHC/Typecheck.hs
@@ -80,6 +80,10 @@ mkGhcModule (mod, file, checkedMod) dynflags = GhcModule {
   ghcInstances      = modInfoInstances modInfo
 }
   where
-    HsModule _ _ _ _ _ mbOpts _ _      = unLoc parsed
+#if __GLASGOW_HASKELL__ == 608 && __GHC_PATCHLEVEL__ == 2
+    HsModule _ _ _ _ _ mbOpts _ _ = unLoc parsed
+#else
+    mbOpts = haddockOptions dynflags
+#endif
     (group, _, mbExports, mbDoc, info) = renamed
-    (parsed, renamed, _, modInfo)      = checkedMod
+    (parsed, renamed, _, modInfo) = checkedMod
diff --git a/tests/output/A.html b/tests/output/A.html
index 3a3c137b..90d910a8 100644
--- a/tests/output/A.html
+++ b/tests/output/A.html
@@ -108,7 +108,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/A.html.ref b/tests/output/A.html.ref
index 3a3c137b..90d910a8 100644
--- a/tests/output/A.html.ref
+++ b/tests/output/A.html.ref
@@ -108,7 +108,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/B.html b/tests/output/B.html
index a69e45ad..ca9ebca9 100644
--- a/tests/output/B.html
+++ b/tests/output/B.html
@@ -78,7 +78,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/B.html.ref b/tests/output/B.html.ref
index a69e45ad..ca9ebca9 100644
--- a/tests/output/B.html.ref
+++ b/tests/output/B.html.ref
@@ -78,7 +78,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/Bug1.html b/tests/output/Bug1.html
index 462f088b..f7c755e7 100644
--- a/tests/output/Bug1.html
+++ b/tests/output/Bug1.html
@@ -142,7 +142,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/Bug1.html.ref b/tests/output/Bug1.html.ref
index 462f088b..f7c755e7 100644
--- a/tests/output/Bug1.html.ref
+++ b/tests/output/Bug1.html.ref
@@ -142,7 +142,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/Bug2.html b/tests/output/Bug2.html
index aa9d6647..f13fa695 100644
--- a/tests/output/Bug2.html
+++ b/tests/output/Bug2.html
@@ -82,7 +82,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/Bug2.html.ref b/tests/output/Bug2.html.ref
index aa9d6647..f13fa695 100644
--- a/tests/output/Bug2.html.ref
+++ b/tests/output/Bug2.html.ref
@@ -82,7 +82,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/Bug3.html b/tests/output/Bug3.html
index 60f4b890..97efcec8 100644
--- a/tests/output/Bug3.html
+++ b/tests/output/Bug3.html
@@ -106,7 +106,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/Bug3.html.ref b/tests/output/Bug3.html.ref
index 60f4b890..97efcec8 100644
--- a/tests/output/Bug3.html.ref
+++ b/tests/output/Bug3.html.ref
@@ -106,7 +106,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/Bug4.html b/tests/output/Bug4.html
index c2921742..823a0bee 100644
--- a/tests/output/Bug4.html
+++ b/tests/output/Bug4.html
@@ -105,7 +105,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/Bug4.html.ref b/tests/output/Bug4.html.ref
index c2921742..823a0bee 100644
--- a/tests/output/Bug4.html.ref
+++ b/tests/output/Bug4.html.ref
@@ -105,7 +105,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/Bug6.html b/tests/output/Bug6.html
index 806f5470..e4fec886 100644
--- a/tests/output/Bug6.html
+++ b/tests/output/Bug6.html
@@ -474,7 +474,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/Bug6.html.ref b/tests/output/Bug6.html.ref
index 806f5470..e4fec886 100644
--- a/tests/output/Bug6.html.ref
+++ b/tests/output/Bug6.html.ref
@@ -474,7 +474,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/Bug7.html b/tests/output/Bug7.html
index 788ae3a9..16ec0630 100644
--- a/tests/output/Bug7.html
+++ b/tests/output/Bug7.html
@@ -234,7 +234,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/Bug7.html.ref b/tests/output/Bug7.html.ref
index 788ae3a9..16ec0630 100644
--- a/tests/output/Bug7.html.ref
+++ b/tests/output/Bug7.html.ref
@@ -234,7 +234,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/Bug8.html b/tests/output/Bug8.html
index d6be9969..1a38e82c 100644
--- a/tests/output/Bug8.html
+++ b/tests/output/Bug8.html
@@ -120,7 +120,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/Bug8.html.ref b/tests/output/Bug8.html.ref
index d6be9969..1a38e82c 100644
--- a/tests/output/Bug8.html.ref
+++ b/tests/output/Bug8.html.ref
@@ -120,7 +120,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/Bugs.html b/tests/output/Bugs.html
index f9a3522b..8457f2a4 100644
--- a/tests/output/Bugs.html
+++ b/tests/output/Bugs.html
@@ -108,7 +108,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/Hash.html b/tests/output/Hash.html
index 36fcf7f0..cc862019 100644
--- a/tests/output/Hash.html
+++ b/tests/output/Hash.html
@@ -443,7 +443,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/Hash.html.ref b/tests/output/Hash.html.ref
index 36fcf7f0..cc862019 100644
--- a/tests/output/Hash.html.ref
+++ b/tests/output/Hash.html.ref
@@ -443,7 +443,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/Hidden.html.ref b/tests/output/Hidden.html.ref
index 2e4acc71..0cc13fbd 100644
--- a/tests/output/Hidden.html.ref
+++ b/tests/output/Hidden.html.ref
@@ -80,7 +80,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.0.0.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/NoLayout.html b/tests/output/NoLayout.html
index 4709e907..fd7d6e34 100644
--- a/tests/output/NoLayout.html
+++ b/tests/output/NoLayout.html
@@ -105,7 +105,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/NoLayout.html.ref b/tests/output/NoLayout.html.ref
index 4709e907..fd7d6e34 100644
--- a/tests/output/NoLayout.html.ref
+++ b/tests/output/NoLayout.html.ref
@@ -105,7 +105,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/Test.html b/tests/output/Test.html
index a556c9da..a587a574 100644
--- a/tests/output/Test.html
+++ b/tests/output/Test.html
@@ -3126,7 +3126,7 @@ test2
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/Test.html.ref b/tests/output/Test.html.ref
index a556c9da..a587a574 100644
--- a/tests/output/Test.html.ref
+++ b/tests/output/Test.html.ref
@@ -3126,7 +3126,7 @@ test2
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/TypeOperators.html b/tests/output/TypeOperators.html
index 9c0149dd..35cc3e2d 100644
--- a/tests/output/TypeOperators.html
+++ b/tests/output/TypeOperators.html
@@ -372,7 +372,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/TypeOperators.html.ref b/tests/output/TypeOperators.html.ref
index 9c0149dd..35cc3e2d 100644
--- a/tests/output/TypeOperators.html.ref
+++ b/tests/output/TypeOperators.html.ref
@@ -372,7 +372,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/Visible.html b/tests/output/Visible.html
index 9ed7f264..03591983 100644
--- a/tests/output/Visible.html
+++ b/tests/output/Visible.html
@@ -80,7 +80,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/output/Visible.html.ref b/tests/output/Visible.html.ref
index 9ed7f264..03591983 100644
--- a/tests/output/Visible.html.ref
+++ b/tests/output/Visible.html.ref
@@ -80,7 +80,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/tests/A.html.ref b/tests/tests/A.html.ref
index 3a3c137b..90d910a8 100644
--- a/tests/tests/A.html.ref
+++ b/tests/tests/A.html.ref
@@ -108,7 +108,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/tests/B.html.ref b/tests/tests/B.html.ref
index a69e45ad..ca9ebca9 100644
--- a/tests/tests/B.html.ref
+++ b/tests/tests/B.html.ref
@@ -78,7 +78,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/tests/Bug1.html.ref b/tests/tests/Bug1.html.ref
index 462f088b..f7c755e7 100644
--- a/tests/tests/Bug1.html.ref
+++ b/tests/tests/Bug1.html.ref
@@ -142,7 +142,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/tests/Bug2.html.ref b/tests/tests/Bug2.html.ref
index aa9d6647..f13fa695 100644
--- a/tests/tests/Bug2.html.ref
+++ b/tests/tests/Bug2.html.ref
@@ -82,7 +82,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/tests/Bug3.html.ref b/tests/tests/Bug3.html.ref
index 60f4b890..97efcec8 100644
--- a/tests/tests/Bug3.html.ref
+++ b/tests/tests/Bug3.html.ref
@@ -106,7 +106,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/tests/Bug4.html.ref b/tests/tests/Bug4.html.ref
index c2921742..823a0bee 100644
--- a/tests/tests/Bug4.html.ref
+++ b/tests/tests/Bug4.html.ref
@@ -105,7 +105,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/tests/Bug6.html.ref b/tests/tests/Bug6.html.ref
index 806f5470..e4fec886 100644
--- a/tests/tests/Bug6.html.ref
+++ b/tests/tests/Bug6.html.ref
@@ -474,7 +474,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/tests/Bug7.html.ref b/tests/tests/Bug7.html.ref
index 788ae3a9..16ec0630 100644
--- a/tests/tests/Bug7.html.ref
+++ b/tests/tests/Bug7.html.ref
@@ -234,7 +234,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/tests/Bug8.html.ref b/tests/tests/Bug8.html.ref
index d6be9969..1a38e82c 100644
--- a/tests/tests/Bug8.html.ref
+++ b/tests/tests/Bug8.html.ref
@@ -120,7 +120,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/tests/Bugs.html.ref b/tests/tests/Bugs.html.ref
index f9a3522b..8457f2a4 100644
--- a/tests/tests/Bugs.html.ref
+++ b/tests/tests/Bugs.html.ref
@@ -108,7 +108,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/tests/Hash.html.ref b/tests/tests/Hash.html.ref
index 36fcf7f0..cc862019 100644
--- a/tests/tests/Hash.html.ref
+++ b/tests/tests/Hash.html.ref
@@ -443,7 +443,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/tests/NoLayout.html.ref b/tests/tests/NoLayout.html.ref
index 4709e907..fd7d6e34 100644
--- a/tests/tests/NoLayout.html.ref
+++ b/tests/tests/NoLayout.html.ref
@@ -105,7 +105,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/tests/Test.html.ref b/tests/tests/Test.html.ref
index a556c9da..a587a574 100644
--- a/tests/tests/Test.html.ref
+++ b/tests/tests/Test.html.ref
@@ -3126,7 +3126,7 @@ test2
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/tests/TypeOperators.html.ref b/tests/tests/TypeOperators.html.ref
index 9c0149dd..35cc3e2d 100644
--- a/tests/tests/TypeOperators.html.ref
+++ b/tests/tests/TypeOperators.html.ref
@@ -372,7 +372,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY
diff --git a/tests/tests/Visible.html.ref b/tests/tests/Visible.html.ref
index 9ed7f264..03591983 100644
--- a/tests/tests/Visible.html.ref
+++ b/tests/tests/Visible.html.ref
@@ -80,7 +80,7 @@
 ><TD CLASS="botbar"
 >Produced by <A HREF="http://www.haskell.org/haddock/"
 >Haddock</A
-> version 2.1.0</TD
+> version 2.2.0</TD
 ></TR
 ></TABLE
 ></BODY