X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=docs%2Fusers_guide%2Fintro.xml;h=c9ff433c77a90f790c116a2fbc4510f729d6e407;hb=58521c72cec262496dabf5fffb057d25ab17a0f7;hp=ba668ea4c961f957c72e79b1dca706fd198dd690;hpb=58774f38547ad0090531757d245c916d29cbae0d;p=ghc-hetmet.git

diff --git a/docs/users_guide/intro.xml b/docs/users_guide/intro.xml
index ba668ea..c9ff433 100644
--- a/docs/users_guide/intro.xml
+++ b/docs/users_guide/intro.xml
@@ -44,6 +44,22 @@
   <para>GHC comes with a number of libraries. These are
   described in separate documentation.</para>
 
+  <sect1 id="getting">
+    <title>Obtaining GHC</title>
+
+    <para>Go to the <ulink url="http://www.haskell.org/ghc/">GHC home
+	page</ulink> and follow the "download" link to download GHC
+	for your platform.</para>
+
+    <para>Alternatively, if you want to build GHC yourself, head on
+      over to the
+      <ulink url="http://hackage.haskell.org/trac/ghc/wiki/Building">GHC
+        Building Guide</ulink> to find out how to get the sources, and
+        build it on your system.  Note that GHC itself is written in
+        Haskell, so you will still need to install GHC in order to
+        build it.</para>
+  </sect1>
+
   <sect1 id="mailing-lists-GHC">
     <title>Meta-information: Web sites, mailing lists, etc.</title>
 
@@ -55,24 +71,18 @@
 
     <itemizedlist>
       <listitem>
-	<para><ulink url="http://www.haskell.org/" >Haskell home
-	page</ulink></para>
-      </listitem>
-
-      <listitem>
 	<para><ulink url="http://www.haskell.org/ghc/">GHC home
 	page</ulink></para>
       </listitem>
 
       <listitem>
-	<para><ulink
-	url="http://www.cs.nott.ac.uk/~gmh/faq.html">comp.lang.functional
-	FAQ</ulink></para>
+	<para><ulink url="http://hackage.haskell.org/trac/ghc/">GHC
+	Developers Home</ulink> (developer documentation, wiki, and
+	bug tracker)</para>
       </listitem>
-
     </itemizedlist>
 
-    <para>We run the following mailing lists about Glasgow Haskell.
+    <para>We run the following mailing lists about GHC.
     We encourage you to join, as you feel is appropriate.</para>
 
     <variablelist>
@@ -82,7 +92,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>
@@ -122,9 +132,9 @@
       <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>
+	  <para>This list is for reporting and discussing GHC bugs.
+	    However, please see <xref linkend="bug-reporting" /> before
+	    posting here.</para>
 
 	  <variablelist>
 	    <varlistentry>
@@ -153,22 +163,21 @@
 	      <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>
+                         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>
@@ -337,7 +346,7 @@
   </sect1>
 
 
-&relnotes;
+&relnotes1;
 
 </chapter>