X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=docs%2Fusers_guide%2Fusing.xml;h=2fe5959b594998abddee6758b0732e976912dbe6;hb=0f8ecdcd05627848c9eaea6c9d5e88e10e7ec78d;hp=7a1391ce855100bce4dff46a0af450c1b10177aa;hpb=d4050431de1adddedb240e497f77f89301f77070;p=ghc-hetmet.git

diff --git a/docs/users_guide/using.xml b/docs/users_guide/using.xml
index 7a1391c..2fe5959 100644
--- a/docs/users_guide/using.xml
+++ b/docs/users_guide/using.xml
@@ -73,10 +73,9 @@ module X where
       maintains internally, so you'll be desperately disappointed if
       you try to glob etc. inside <literal>OPTIONS_GHC</literal>.</para>
 
-      <para>NOTE: the contents of OPTIONS_GHC are prepended to the
-      command-line options, so you <emphasis>do</emphasis> have the
-      ability to override OPTIONS_GHC settings via the command
-      line.</para>
+      <para>NOTE: the contents of OPTIONS_GHC are appended to the
+      command-line options, so options given in the source file
+      override those given on the command-line.</para>
 
       <para>It is not recommended to move all the contents of your
       Makefiles into your source files, but in some circumstances, the
@@ -355,6 +354,18 @@ module X where
       <varlistentry>
 	<term>
           <cmdsynopsis>
+            <command>ghc --info</command>
+          </cmdsynopsis>
+          <indexterm><primary><option>&ndash;&ndash;info</option></primary></indexterm>
+        </term>
+	<listitem>
+	  <para>Print information about the compiler.</para>
+	</listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>
+          <cmdsynopsis>
             <command>ghc --version</command>
             <command>ghc -V</command>
           </cmdsynopsis>
@@ -397,6 +408,20 @@ module X where
 	</listitem>
       </varlistentry>
 
+      <varlistentry>
+	<term>
+	  <cmdsynopsis>
+            <command>ghc --print-docdir</command>
+          </cmdsynopsis>
+          <indexterm><primary><option>&ndash;&ndash;print-docdir</option></primary></indexterm>
+        </term>
+	<listitem>
+	  <para>Print the path to GHC's documentation directory. Note that
+      some distributions do no include the documentation, in which case
+      this directory may be empty or may not exist.</para>
+	</listitem>
+      </varlistentry>
+
     </variablelist>
 
     <sect2 id="make-mode">
@@ -872,6 +897,16 @@ ghc -c Foo.hs</screen>
 	</listitem>
       </varlistentry>
 
+      <varlistentry>
+	<term><option>-Wwarn</option>:</term>
+	<listitem>
+	  <indexterm><primary><option>-Wwarn</option></primary></indexterm>
+	  <para>Warnings are treated only as warnings, not as errors. This is
+	    the default, but can be useful to negate a
+        <option>-Werror</option> flag.</para>
+	</listitem>
+      </varlistentry>
+
     </variablelist>
 
     <para>The full set of warning options is described below.  To turn