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, 17 insertions, 0 deletions

diff --git a/utils/mkUserGuidePart/Options/Plugin.hs b/utils/mkUserGuidePart/Options/Plugin.hs
new file mode 100644
index 0000000000..1ae7d6e536
--- /dev/null
+++ b/utils/mkUserGuidePart/Options/Plugin.hs
@@ -0,0 +1,17 @@
+module Options.Plugin where
+
+import Types
+
+pluginOptions :: [Flag]
+pluginOptions =
+  [ flag { flagName = "-fplugin=⟨module⟩"
+         , flagDescription = "Load a plugin exported by a given module"
+         , flagType = DynamicFlag
+         }
+  , flag { flagName = "-fplugin-opt=⟨module:args⟩"
+         , flagDescription =
+           "Give arguments to a plugin module; module must be specified with "++
+           "``-fplugin``"
+         , flagType = DynamicFlag
+         }
+  ]