X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=docs%2Fusers_guide%2Fintro.xml;h=dce6ec4626ca0c5fb351ccccbb674e3d9b525401;hb=aedb94f5f220b5e442b23ecc445fd38c8d9b6ba0;hp=fdd3271753d00288653fc7913f3f93ecc9333141;hpb=9815cf7659c4d2a6445a58c2f57409dad65b46f3;p=ghc-hetmet.git

diff --git a/docs/users_guide/intro.xml b/docs/users_guide/intro.xml
index fdd3271..dce6ec4 100644
--- a/docs/users_guide/intro.xml
+++ b/docs/users_guide/intro.xml
@@ -41,8 +41,7 @@
   call-graph like structure.  See <xref linkend="profiling"/> for more
   details.</para>
 
-  <para>GHC comes with a large collection of libraries, with
-  everything from parser combinators to networking.  The libraries are
+  <para>GHC comes with a number of libraries. These are
   described in separate documentation.</para>
 
   <sect1 id="mailing-lists-GHC">
@@ -83,7 +82,7 @@
 	  <para>This list is for GHC users to chat among themselves.
 	  If you have a specific question about GHC, please check the
 	  <ulink
-	  url="http://hackage.haskell.org/trac/ghc/wiki/FAQ">FAQ</ulink>
+	  url="http://www.haskell.org/haskellwiki/GHC/FAQ">FAQ</ulink>
 	  first.</para>
 
 	  <variablelist>
@@ -121,55 +120,13 @@
       </varlistentry>
 
       <varlistentry>
-	<term>glasgow-haskell-bugs:</term>
-	<listitem>
-	  <para>Send bug reports for GHC to this address!  The sad and
-          lonely people who subscribe to this list will muse upon
-          what's wrong and what you might do about it.</para>
-
-	  <variablelist>
-	    <varlistentry>
-	      <term>list email address:</term>
-	      <listitem>
-		<para><email>glasgow-haskell-bugs@haskell.org</email></para>
-	      </listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term>subscribe at:</term> 
-	      <listitem>
-		<para><ulink
-	      url="http://www.haskell.org/mailman/listinfo/glasgow-haskell-bugs"><literal>http://www.haskell.org/mailman/listinfo/glasgow-haskell-bugs</literal></ulink>.</para>
-	      </listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term>admin email address:</term>
-	      <listitem>
-		<para><email>glasgow-haskell-bugs-admin@haskell.org</email></para>
-	      </listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term>list archives:</term>
-	      <listitem>
-		<para><ulink
-          url="http://www.haskell.org/pipermail/glasgow-haskell-bugs/"><literal>http://www.haskell.org/pipermail/glasgow-haskell-bugs/</literal></ulink></para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
 	<term>cvs-ghc:</term>
 	<listitem>
 	  <para>The hardcore GHC developers hang out here.  This list
-	  also gets commit message from the CVS repository.  There are
-	  several other similar lists for other parts of the CVS
-	  repository (eg. <literal>cvs-hslibs</literal>,
-	  <literal>cvs-happy</literal>, <literal>cvs-hdirect</literal>
-	  etc.)</para>
+	  also gets commit message from the GHC darcs repository.  There are
+	  other lists for other darcs
+	  repositories (most notably <literal>cvs-libraries</literal>).
+	  </para>
 	  
 	  <variablelist>
 	    <varlistentry>
@@ -338,7 +295,7 @@
   </sect1>
 
 
-&relnotes;
+&relnotes1;
 
 </chapter>