X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=docs%2Fusers_guide%2Fflags.xml;h=171eaba5184ae71df45a4d36253762cf22d9b13b;hb=43e0bca04009902c16f8f764dcb9a78c8da277c9;hp=c8eedd2eb0954efe72179bf856d6f0e740ee4b87;hpb=177b31ca6ebe01f8011926e30c4ac7ee32791753;p=ghc-hetmet.git

diff --git a/docs/users_guide/flags.xml b/docs/users_guide/flags.xml
index c8eedd2..171eaba 100644
--- a/docs/users_guide/flags.xml
+++ b/docs/users_guide/flags.xml
@@ -607,7 +607,9 @@
     <sect2>
       <title>Language options</title>
 
-      <para><xref linkend="options-language"/></para>
+      <para>Language options can be enabled either by a command-line option 
+      <option>-Xblah</option>, or by a <literal>{-# LANGUAGE blah #-}</literal>
+      pragma in the file itself.  See <xref linkend="options-language"/></para>
 
       <informaltable>
 	<tgroup cols="4" align="left" colsep="1" rowsep="1">
@@ -659,11 +661,11 @@
 	      <entry><option>-XNoArrows</option></entry>
 	    </row>
 	    <row>
-	      <entry><option>-fdisambiguate-record-fields</option></entry>
+	      <entry><option>-XDisambiguateRecordFields</option></entry>
 	      <entry>Enable <link linkend="disambiguate-fields">record 
 	      field disambiguation</link></entry>
 	      <entry>dynamic</entry>
-	      <entry><option>-fno-disambiguate-record-fields</option></entry>
+	      <entry><option>-XNoDisambiguateRecordFields</option></entry>
 	    </row>
 	    <row>
 	      <entry><option>-XForeignFunctionInterface</option></entry>
@@ -932,7 +934,7 @@
 	    </row>
 	    <row>
 	      <entry><option>-XTypeSynonymInstances</option></entry>
-	      <entry>Enable <link linkend="type-synonym-instances">type synonyms</link>.</entry>
+	      <entry>Enable <link linkend="flexible-instance-head">type synonyms in instance heads</link>.</entry>
 	      <entry>dynamic</entry>
 	      <entry><option>-XNoTypeSynonymInstances</option></entry>
 	    </row>
@@ -1025,6 +1027,13 @@
 	  </row>
 
 	  <row>
+	    <entry><option>-fwarn-unrecognised-pragmas</option></entry>
+	    <entry>warn about uses of pragmas that GHC doesn't recognise</entry>
+	    <entry>dynamic</entry>
+	    <entry><option>-fno-warn-unrecognised-pragmas</option></entry>
+	  </row>
+
+	  <row>
 	    <entry><option>-fwarn-warnings-deprecations</option></entry>
 	    <entry>warn about uses of functions &amp; types that have warnings or deprecated pragmas</entry>
 	    <entry>dynamic</entry>
@@ -1429,6 +1438,13 @@
 	      <entry>static</entry>
 	      <entry>-</entry>
 	    </row>
+
+	    <row>
+	      <entry><option>-feager-blackholing</option></entry>
+	      <entry>Turn on <link linkend="parallel-compile-options">eager blackholing</link></entry>
+	      <entry>dynamic</entry>
+	      <entry>-</entry>
+	    </row>
 	  </tbody>
 	</tgroup>
       </informaltable>
@@ -1454,20 +1470,20 @@
 	      <entry><option>-auto</option></entry>
 	      <entry>Auto-add <literal>_scc_</literal>s to all
 	      exported functions</entry>
-	      <entry>static</entry>
+	      <entry>dynamic</entry>
 	      <entry><option>-no-auto</option></entry>
 	    </row>
 	    <row>
 	      <entry><option>-auto-all</option></entry>
 	      <entry>Auto-add <literal>_scc_</literal>s to all
 	      top-level functions</entry>
-	      <entry>static</entry>
+	      <entry>dynamic</entry>
 	      <entry><option>-no-auto-all</option></entry>
 	    </row>
 	    <row>
 	      <entry><option>-caf-all</option></entry>
 	      <entry>Auto-add <literal>_scc_</literal>s to all CAFs</entry>
-	      <entry>static</entry>
+	      <entry>dynamic</entry>
 	      <entry><option>-no-caf-all</option></entry>
 	    </row>
 	    <row>
@@ -1954,12 +1970,6 @@
 	      <entry>-</entry>
 	    </row>
 	    <row>
-	      <entry><option>-optdep</option> <replaceable>option</replaceable></entry>
-	      <entry>pass <replaceable>option</replaceable> to the dependency generator</entry>
-	      <entry>dynamic</entry>
-	      <entry>-</entry>
-	    </row>
-	    <row>
 	      <entry><option>-optwindres</option> <replaceable>option</replaceable></entry>
 	      <entry>pass <replaceable>option</replaceable> to <literal>windres</literal>.</entry>
 	      <entry>dynamic</entry>