aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--haddock-api/src/Haddock.hs2
-rw-r--r--html-test/ref/SpuriousSuperclassConstraints.html4
-rw-r--r--html-test/src/SpuriousSuperclassConstraints.hs2
3 files changed, 4 insertions, 4 deletions
diff --git a/haddock-api/src/Haddock.hs b/haddock-api/src/Haddock.hs
index dec85b79..3971a5b7 100644
--- a/haddock-api/src/Haddock.hs
+++ b/haddock-api/src/Haddock.hs
@@ -489,7 +489,7 @@ shortcutFlags flags = do
when ((Flag_GenIndex `elem` flags || Flag_GenContents `elem` flags)
&& Flag_Html `elem` flags) $
- throwE "-h cannot be used with --gen-index or --gen-contents"
+ throwE "-h/--html cannot be used with --gen-index or --gen-contents"
when ((Flag_GenIndex `elem` flags || Flag_GenContents `elem` flags)
&& Flag_Hoogle `elem` flags) $
diff --git a/html-test/ref/SpuriousSuperclassConstraints.html b/html-test/ref/SpuriousSuperclassConstraints.html
index b7c707c5..0f38d15c 100644
--- a/html-test/ref/SpuriousSuperclassConstraints.html
+++ b/html-test/ref/SpuriousSuperclassConstraints.html
@@ -56,7 +56,7 @@ window.onload = function () {pageLoad();};
>http://www.haskell.org/pipermail/haskell-cafe/2012-September/103600.html</a
></p
><p
- >And here is the corresponding theard on glasgow-haskell-users:</p
+ >And here is the corresponding thread on glasgow-haskell-users:</p
><p
><a href="#"
>http://www.haskell.org/pipermail/glasgow-haskell-users/2012-September/022914.html</a
@@ -229,4 +229,4 @@ Fix spurious superclass constraints bug.</pre
></div
></body
></html
-> \ No newline at end of file
+>
diff --git a/html-test/src/SpuriousSuperclassConstraints.hs b/html-test/src/SpuriousSuperclassConstraints.hs
index d9e43e1c..3e230945 100644
--- a/html-test/src/SpuriousSuperclassConstraints.hs
+++ b/html-test/src/SpuriousSuperclassConstraints.hs
@@ -7,7 +7,7 @@
--
-- <http://www.haskell.org/pipermail/haskell-cafe/2012-September/103600.html>
--
--- And here is the corresponding theard on glasgow-haskell-users:
+-- And here is the corresponding thread on glasgow-haskell-users:
--
-- <http://www.haskell.org/pipermail/glasgow-haskell-users/2012-September/022914.html>
--