[commit: ghc] master: Mention "-XMonadFailDesugaring" in the docs (a41830f)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/a41830f2e82dd25a7bc9f1bc5e5b02cb0496c8f2/ghc

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

commit a41830f2e82dd25a7bc9f1bc5e5b02cb0496c8f2
Author: David Luposchainsky <dluposchainsky at gmail.com>
Date:   Wed Nov 18 23:12:47 2015 +0100

    Mention "-XMonadFailDesugaring" in the docs
    
    Reviewers: austin, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1496


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

a41830f2e82dd25a7bc9f1bc5e5b02cb0496c8f2
 compiler/main/DynFlags.hs         | 4 ++--
 docs/users_guide/glasgow_exts.rst | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 655998e..014a11e 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -504,7 +504,7 @@ data WarningFlag =
    | Opt_WarnContextQuantification
    | Opt_WarnWarningsDeprecations
    | Opt_WarnDeprecatedFlags
-   | Opt_WarnAMP
+   | Opt_WarnAMP -- Introduced in GHC 7.8, obsolete since 7.10
    | Opt_WarnMissingMonadFailInstance
    | Opt_WarnDodgyExports
    | Opt_WarnDodgyImports
@@ -2873,7 +2873,7 @@ fWarningFlags = [
   flagSpec "warn-alternative-layout-rule-transitional"
                                       Opt_WarnAlternativeLayoutRuleTransitional,
   flagSpec' "warn-amp"                        Opt_WarnAMP
-    (\_ -> deprecate "it has no effect, and will be removed in GHC 7.12"),
+    (\_ -> deprecate "it has no effect"),
   flagSpec' "warn-auto-orphans"               Opt_WarnAutoOrphans
     (\_ -> deprecate "it has no effect"),
   flagSpec "warn-deferred-type-errors"        Opt_WarnDeferredTypeErrors,
diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index 42f60bc..c88f7ba 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -1689,9 +1689,10 @@ New monadic failure desugaring mechanism
 .. index::
     single: -XMonadFailDesugaring option
 
-Switch desugaring of ``do``-blocks to use ``MonadFail.fail`` instead of
-``Monad.fail``. This will be the default behaviour in a future GHC release,
-under the MonadFail Proposal (MFP).
+The ``-XMonadFailDesugaring`` extension switches the desugaring of
+``do``-blocks to use ``MonadFail.fail`` instead of ``Monad.fail``. This will
+eventually be the default behaviour in a future GHC release, under the
+MonadFail Proposal (MFP).
 
 This extension is temporary, and will be deprecated in a future release. It is
 included so that library authors have a hard check for whether their code