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

diff --git a/docs/users_guide/debugging.xml b/docs/users_guide/debugging.xml
index b84134a..9c48f7d 100644 (file)
--- a/docs/users_guide/debugging.xml
+++ b/docs/users_guide/debugging.xml
@@ -24,8 +24,9 @@
         a short form…).  You can get all of these at once
         (<emphasis>lots</emphasis> of output) by using
         <option>-v5</option>, or most of them with
-        <option>-v4</option>.  Some of the most useful ones
-        are:</para>
+        <option>-v4</option>.  You can prevent them from clogging up
+        your standard output by passing <option>-ddump-to-file</option>.
+        Some of the most useful ones are:</para>
 
          <variablelist>
            <varlistentry>

diff --git a/docs/users_guide/flags.xml b/docs/users_guide/flags.xml
index 4a502b4..71790b0 100644 (file)
--- a/docs/users_guide/flags.xml
+++ b/docs/users_guide/flags.xml
@@ -2233,6 +2233,12 @@ phase <replaceable>n</replaceable></entry>
              <entry>-</entry>
            </row>
            <row>
+             <entry><option>-ddump-to-file</option></entry>
+             <entry>Dump to files instead of stdout</entry>
+             <entry>dynamic</entry>
+             <entry>-</entry>
+           </row>
+           <row>
              <entry><option>-ddump-asm</option></entry>
              <entry>Dump assembly</entry>
              <entry>dynamic</entry>