X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=HACKING;h=2af4c13bd0acc4c9c18001164695d8636098b446;hp=74aa74288df8b0545c84222a2f0eb7b238166ea2;hb=b0ca990457eaf7991e72b13d0040d937b5759b36;hpb=b4d59b7caa9dd5816dcdd07a1be94ebd3e6b06d5

diff --git a/HACKING b/HACKING
index 74aa742..2af4c13 100644
--- a/HACKING
+++ b/HACKING
@@ -22,12 +22,20 @@ The GHC Developer's Wiki
 
      http://hackage.haskell.org/trac/ghc/wiki/Building/Hacking 
    
-     This section on the wiki will get you up & running with a 
+     This section on the wiki will get you up and running with a
      serviceable build tree in no time:
   
      This is part of the "Building GHC" section of the wiki, which
      has more detailed information on GHC's build system should you
      need it.
+
+
+  Coding conventions
+
+     http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions
+
+     This wiki page explains the ground rules for code that is intended
+     to go into the mainline compiler source.
   
   
   The GHC Commentary
@@ -41,7 +49,7 @@ Mailing lists
 -------------
 
    Ask on glasgow-haskell-users@haskell.org if you have difficulties.
-   If you're working with the current CVS sources of GHC, then
+   If you're working with the current darcs sources of GHC, then
    cvs-ghc@haskell.org might be a more appropriate (developers hang
    out here).  See http://www.haskell.org/mailman/listinfo for
    subscription.