Merge remote-tracking branch 'origin/master' into wip/orf-rebootwip/orf-reboot

Conflicts:
	compiler/rename/RnNames.hs
	compiler/typecheck/TcRnMonad.hs
	utils/haddock

1 files changed, 63 insertions, 0 deletions

diff --git a/utils/mkUserGuidePart/Options/Modes.hs b/utils/mkUserGuidePart/Options/Modes.hs
new file mode 100644
index 0000000000..57aaef26f2
--- /dev/null
+++ b/utils/mkUserGuidePart/Options/Modes.hs
@@ -0,0 +1,63 @@
+module Options.Modes where
+
+import Types
+
+modeOptions :: [Flag]
+modeOptions =
+  [ flag { flagName = "--help,-?"
+         , flagDescription = "Display help"
+         , flagType = ModeFlag
+         }
+  , flag { flagName = "--interactive"
+         , flagDescription =
+           "Interactive mode - normally used by just running ``ghci``; "++
+           "see :ref:`ghci` for details."
+         , flagType = ModeFlag
+         }
+  , flag { flagName = "--make"
+         , flagDescription =
+           "Build a multi-module Haskell program, automatically figuring out "++
+           "dependencies. Likely to be much easier, and faster, than using "++
+           "``make``; see :ref:`make-mode` for details."
+         , flagType = ModeFlag
+         }
+  , flag { flagName = "-e expr"
+         , flagDescription =
+           "Evaluate ``expr``; see :ref:`eval-mode` for details."
+         , flagType = ModeFlag
+         }
+  , flag { flagName = "--show-iface"
+         , flagDescription = "display the contents of an interface file."
+         , flagType = ModeFlag
+         }
+  , flag { flagName = "-M"
+         , flagDescription =
+           "denerate dependency information suitable for use in a "++
+           "``Makefile``; see :ref:`makefile-dependencies` for details."
+         , flagType = ModeFlag
+         }
+  , flag { flagName = "--supported-extensions, --supported-languages"
+         , flagDescription = "display the supported language extensions"
+         , flagType = ModeFlag
+         }
+  , flag { flagName = "--show-options"
+         , flagDescription = "display the supported command line options"
+         , flagType = ModeFlag
+         }
+  , flag { flagName = "--info"
+         , flagDescription = "display information about the compiler"
+         , flagType = ModeFlag
+         }
+  , flag { flagName = "--version, -V"
+         , flagDescription = "display GHC version"
+         , flagType = ModeFlag
+         }
+  , flag { flagName = "--numeric-version"
+         , flagDescription = "display GHC version (numeric only)"
+         , flagType = ModeFlag
+         }
+  , flag { flagName = "--print-libdir"
+         , flagDescription = "display GHC library directory"
+         , flagType = ModeFlag
+         }
+  ]