X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=docs%2Fusers_guide%2Fflags.xml;h=f96edbfada2fff3c399d6219ed52c3660d829d46;hb=cc8e41a3c5e05a1076254ab39a56074e70f9e863;hp=540230d9a934aad7021e8c491de9ca1312aebf92;hpb=ead1eed0b8ba1a7818ddc36f07e57b794e91483d;p=ghc-hetmet.git

diff --git a/docs/users_guide/flags.xml b/docs/users_guide/flags.xml
index 540230d..f96edbf 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">
@@ -787,7 +789,7 @@
 	    </row>
 	    <row>
 	      <entry><option>-XUnicodeSyntax</option></entry>
-	      <entry>Enable unicode syntax.</entry>
+	      <entry>Enable <link linkend="unicode-syntax">unicode syntax</link>.</entry>
 	      <entry>dynamic</entry>
 	      <entry><option>-XNoUnicodeSyntax</option></entry>
 	    </row>
@@ -854,7 +856,7 @@
 	    </row>
 	    <row>
 	      <entry><option>-XTransformListComp</option></entry>
-	      <entry>Enable <link linkend="generalised-list-comprehensions">transform list comprehensions</link>.</entry>
+	      <entry>Enable <link linkend="generalised-list-comprehensions">generalised list comprehensions</link>.</entry>
 	      <entry>dynamic</entry>
 	      <entry><option>-XNoTransformListComp</option></entry>
 	    </row>
@@ -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>
@@ -1166,6 +1175,20 @@
 	    <entry><option>-fno-warn-unused-matches</option></entry>
 	  </row>
 
+	  <row>
+	    <entry><option>-fwarn-unused-do-bind</option></entry>
+	    <entry>warn about do bindings that appear to throw away values of types other than <literal>()</literal></entry>
+	    <entry>dynamic</entry>
+	    <entry><option>-fno-warn-unused-do-bind</option></entry>
+	  </row>
+
+	  <row>
+	    <entry><option>-fwarn-wrong-do-bind</option></entry>
+	    <entry>warn about do bindings that appear to throw away monadic values that you should have bound instead</entry>
+	    <entry>dynamic</entry>
+	    <entry><option>-fno-warn-wrong-do-bind</option></entry>
+	  </row>
+
 	  </tbody>
 	</tgroup>
       </informaltable>
@@ -1429,6 +1452,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 +1484,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 +1984,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>