X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=docs%2Fusers_guide%2Fghci.xml;h=80205954e5ecf0b2e9ee299eda9fa679478073e8;hb=4d8c7c976104d2e39a1183967ec0f254a0fc0a47;hp=edad7fd9c2e4728806442e0d3246aa182871713f;hpb=9de55417c7e397c7293df4bd6c2f60307acb3611;p=ghc-hetmet.git

diff --git a/docs/users_guide/ghci.xml b/docs/users_guide/ghci.xml
index edad7fd..8020595 100644
--- a/docs/users_guide/ghci.xml
+++ b/docs/users_guide/ghci.xml
@@ -28,8 +28,11 @@
 
 <screen>
 $ ghci
-GHCi, version 6.8.1: http://www.haskell.org/ghc/  :? for help
+GHCi, version 6.12.1: http://www.haskell.org/ghc/  :? for help
+Loading package ghc-prim ... linking ... done.
+Loading package integer-gmp ... linking ... done.
 Loading package base ... linking ... done.
+Loading package ffi-1.0 ... linking ... done.
 Prelude> 
 </screen>
 
@@ -586,10 +589,12 @@ hello
 Prelude IO>
 </screen>
 
-      <para>(Note: you can use <literal>import M</literal> as an
-      alternative to <literal>:module +M</literal>, and
+      <para>(Note: you can use conventional
+      haskell <literal>import</literal> syntax as
+      well, but this does not support
+      <literal>*</literal> forms).
       <literal>:module</literal> can also be shortened to 
-      <literal>:m</literal>). The full syntax of the
+      <literal>:m</literal>. The full syntax of the
       <literal>:module</literal> command is:</para>
 
 <screen>
@@ -823,7 +828,7 @@ it &lt;- <replaceable>e</replaceable>
   []
 </programlisting>
     However, it is tiresome for the user to have to specify the type, so GHCi extends Haskell's type-defaulting
-    rules (Section 4.3.4 of the Haskell 98 Report (Revised)) as follows.  The
+    rules (Section 4.3.4 of the Haskell 2010 Report) as follows.  The
     standard rules take each group of constraints <literal>(C1 a, C2 a, ..., Cn
     a)</literal> for each type variable <literal>a</literal>, and defaults the
     type variable if 
@@ -1938,8 +1943,7 @@ maybe :: b -> (a -> b) -> Maybe a -> b
 	    used, respectively.  Tags for all the functions, constructors and
 	    types in the currently loaded modules are created.  All modules must
 	    be interpreted for these commands to work.</para>
-          <para>See also <xref linkend="hasktags" />.</para>
-	</listitem>
+        </listitem>
       </varlistentry>
 
       <varlistentry>
@@ -2934,7 +2938,6 @@ Prelude> :set -fno-glasgow-exts
 
 <!-- Emacs stuff:
      ;;; Local Variables: ***
-     ;;; mode: xml ***
      ;;; sgml-parent-document: ("users_guide.xml" "book" "chapter") ***
      ;;; End: ***
  -->