Update the haddock command help text

The haddock command now supports --haddock-options=

Distribution/Simple/Setup.hs

@@ -1008,9 +1008,7 @@ haddockCommand = makeCommand name shortDesc longDesc defaultHaddockFlags options
   where
     name       = "haddock"
     shortDesc  = "Generate Haddock HTML documentation."
-    longDesc   = Just $ \_ -> "Requires cpphs and haddock.\n"
-                           ++ "Extra options can be set at the "
-                           ++ "configure stage using --haddock-option(s)=\n"
+    longDesc   = Just $ \_ -> "Requires the program haddock, either version 0.x or 2.x.\n"
     options showOrParseArgs =
       [optionVerbosity haddockVerbosity (\v flags -> flags { haddockVerbosity = v })
       ,optionDistPref
@@ -1052,9 +1050,9 @@ haddockCommand = makeCommand name shortDesc longDesc defaultHaddockFlags options
          haddockHscolourCss (\v flags -> flags { haddockHscolourCss = v })
          (reqArgFlag "PATH")
       ]
-      ++ programConfigurationPaths   progConf showOrParseArgs
+      ++ programConfigurationPaths   progConf ParseArgs
              haddockProgramPaths (\v flags -> flags { haddockProgramPaths = v})
-      ++ programConfigurationOptions progConf showOrParseArgs
+      ++ programConfigurationOptions progConf ParseArgs
              haddockProgramArgs  (\v flags -> flags { haddockProgramArgs = v})
     progConf = addKnownProgram haddockProgram
                emptyProgramConfiguration