Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics

[ghc-hetmet.git] / docs / users_guide / flags.xml

diff --git a/docs/users_guide/flags.xml b/docs/users_guide/flags.xml
index 71790b0..0faefbb 100644 (file)
--- a/docs/users_guide/flags.xml
+++ b/docs/users_guide/flags.xml
@@ -682,7 +682,9 @@
            </row>
            <row>
              <entry><option>-XGenerics</option></entry>
-             <entry>Enable <link linkend="generic-classes">generic classes</link></entry>
+             <entry>Deprecated, does nothing. No longer enables <link linkend="generic-classes">generic classes</link>.
+               See also GHC's support for
+               <link linkend="generic-programming">generic programming</link>.</entry>
              <entry>dynamic</entry>
              <entry><option>-XNoGenerics</option></entry>
            </row>
@@ -977,6 +979,12 @@
              <entry><option>-XNoDeriveDataTypeable</option></entry>
            </row>
            <row>
+             <entry><option>-XDeriveGeneric</option></entry>
+             <entry>Enable <link linkend="deriving-typeable">deriving for the Generic class</link>.</entry>
+             <entry>dynamic</entry>
+             <entry><option>-XNoDeriveGeneric</option></entry>
+           </row>
+           <row>
              <entry><option>-XGeneralizedNewtypeDeriving</option></entry>
              <entry>Enable <link linkend="newtype-deriving">newtype deriving</link>.</entry>
              <entry>dynamic</entry>
@@ -1008,6 +1016,12 @@
              <entry><option>-XNoConstrainedClassMethods</option></entry>
            </row>
            <row>
+             <entry><option>-XDefaultSignatures</option></entry>
+             <entry>Enable <link linkend="class-default-signatures">default signatures</link>.</entry>
+             <entry>dynamic</entry>
+             <entry><option>-XNoDefaultSignatures</option></entry>
+           </row>
+           <row>
              <entry><option>-XMultiParamTypeClasses</option></entry>
              <entry>Enable <link linkend="multi-param-type-classes">multi parameter type classes</link>.</entry>
              <entry>dynamic</entry>