[commit: haddock] alexbiehl-patch-1, ghc-head, ghc-head1, headdock-library-1.4.5, ie_avails, master, pr-filter-maps, pr/cabal-desc, v2.18, wip/T14529, wip/revert-ttg-2017-11-20, wip/ttg-2017-10-13, wip/ttg-2017-10-31, wip/ttg-2017-11-06, wip/ttg2-2017-11-10, wip/ttg3-2017-11-12, wip/ttg4-constraints-2017-11-13, wip/ttg6-unrevert-2017-11-22: Improve error message (393920f)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/haddock

On branches: alexbiehl-patch-1,ghc-head,ghc-head1,headdock-library-1.4.5,ie_avails,master,pr-filter-maps,pr/cabal-desc,v2.18,wip/T14529,wip/revert-ttg-2017-11-20,wip/ttg-2017-10-13,wip/ttg-2017-10-31,wip/ttg-2017-11-06,wip/ttg2-2017-11-10,wip/ttg3-2017-11-12,wip/ttg4-constraints-2017-11-13,wip/ttg6-unrevert-2017-11-22
Link       : http://git.haskell.org/haddock.git/commitdiff/393920f125d1870c4fec5a09a5ac2dddc8da746b

>---------------------------------------------------------------

commit 393920f125d1870c4fec5a09a5ac2dddc8da746b
Author: Sergey Vinokurov <serg.foo at gmail.com>
Date:   Sun Oct 30 17:39:50 2016 +0200

    Improve error message


>---------------------------------------------------------------

393920f125d1870c4fec5a09a5ac2dddc8da746b
 haddock-api/src/Haddock.hs                       | 2 +-
 html-test/ref/SpuriousSuperclassConstraints.html | 2 +-
 html-test/src/SpuriousSuperclassConstraints.hs   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/haddock-api/src/Haddock.hs b/haddock-api/src/Haddock.hs
index dec85b7..3971a5b 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 b7c707c..0f38d15 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
diff --git a/html-test/src/SpuriousSuperclassConstraints.hs b/html-test/src/SpuriousSuperclassConstraints.hs
index d9e43e1..3e23094 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>
 --