X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fdocs%2Fusers_guide%2Fghci.sgml;h=4e8693d949ca2046d3f22e01e46372f0672b04e8;hb=38edeed4f74cc7e9487f1911058f359812b34dd8;hp=23c4e701ee0996bf62b33632aa39402ea57abbd5;hpb=fa92604ad897cfd18cfea8be1b0b58334adb1e4f;p=ghc-hetmet.git

diff --git a/ghc/docs/users_guide/ghci.sgml b/ghc/docs/users_guide/ghci.sgml
index 23c4e70..4e8693d 100644
--- a/ghc/docs/users_guide/ghci.sgml
+++ b/ghc/docs/users_guide/ghci.sgml
@@ -947,7 +947,7 @@ Prelude> :set -fno-glasgow-exts
     </sect2>
   </sect1>
 
-  <sect1>
+  <sect1 id="ghci-dot-files">
     <title>The <filename>.ghci</filename> file</title>
     <indexterm><primary><filename>.ghci</filename></primary><secondary>file</secondary>
     </indexterm>
@@ -977,6 +977,34 @@ Prelude> :set -fno-glasgow-exts
     a static one, but in fact it works to set it using
     <literal>:set</literal> like this.  The changes won't take effect
     until the next <literal>:load</literal>, though.)</para>
+
+    <para>Two command-line options control whether the
+    <filename>.ghci</filename> files are read:</para>
+
+    <variablelist>
+      <varlistentry>
+	<term><option>-ignore-dot-ghci</option></term>
+	<indexterm><primary><option>-ignore-dot-ghci</option></primary>
+	</indexterm>
+	<listitem>
+	  <para>Don't read either <filename>./.ghci</filename> or
+	  <filename>$HOME/.ghci</filename> when starting up.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
+	<term><option>-read-dot-ghci</option></term>
+	<indexterm><primary><option>-read-dot-ghci</option></primary>
+	</indexterm>
+	<listitem>
+	  <para>Read <filename>.ghci</filename> and
+	  <filename>$HOME/.ghci</filename>.  This is normally the
+	  default, but the <option>-read-dot-ghci</option> option may
+	  be used to override a previous
+	  <option>-ignore-dot-ghci</option> option.</para>
+	</listitem>
+      </varlistentry>
+    </variablelist>
+
   </sect1>
 
   <sect1>