From b4d1234d58af102db3a064802f3fa7ca3242b8ce Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Fri, 13 Jul 2007 21:40:04 +0000
Subject: [PATCH] Update the contents of the library directy in the user guide

---
 docs/users_guide/installing.xml |   36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/users_guide/installing.xml b/docs/users_guide/installing.xml
index fba07e3..4f3a1c2 100644
--- a/docs/users_guide/installing.xml
+++ b/docs/users_guide/installing.xml
@@ -420,16 +420,17 @@ truncates them.  Similarly <filename>ghci</filename> is a C wrapper program that
 <para>The layout of the library directory, <filename>$(libdir)</filename>,
 is almost identical on
 Windows and Unix, as follows.  Differences between Windows and Unix
-are annoted <literal>[Win32 only]</literal> and are commented below.</para>
+are annotated <literal>[Win32 only]</literal> and are commented below.</para>
 
 <programlisting>
   $(libdir)/
     package.conf           GHC package configuration
     ghc-usage.txt          Message displayed by ghc &ndash;&ndash;help
+    ghci-usage.txt         Message displayed by ghci &ndash;&ndash;help
     
     bin/                   [Win32 only]  User-visible binaries
-         ghc.exe
-         ghci.exe
+        ghc.exe
+        ghci.exe
 
     unlit                  Remove literate markup
     
@@ -440,7 +441,7 @@ are annoted <literal>[Win32 only]</literal> and are commented below.</para>
     ghc-x.xx               GHC executable [Unix only]
    
     ghc-split              Asm code splitter
-    ghc-asm	           Asm code mangler
+    ghc-asm                Asm code mangler
 
     gcc-lib/               [Win32 only] Support files for gcc
         specs              gcc configuration
@@ -450,32 +451,31 @@ are annoted <literal>[Win32 only]</literal> and are commented below.</para>
         ld.exe
 
         crt0.o              Standard
-	   ..etc..	    binaries
+           ..etc..          binaries
         
         libmingw32.a        Standard
-	   ..etc..	    libraries
+           ..etc..          libraries
 
         *.h                 Include files
 
-    imports/                GHC interface files
-        std/*.hi              'std' library
-	lang/*.hi             'lang' library
-        ..etc..
+    hslibs-imports/         GHC interface files for the...
+        ghc/*.hi            ...'ghc' library
 
     include/                 C header files
         StgMacros.h           GHC-specific
-        ..etc...              header files
+        ..etc..               header files
 
         mingw/*.h            [Win32 only] Mingwin header files
 
-    libHSrts.a              GHC library archives
-    libHSstd.a
-    libHSlang.a
-      ..etc..
+    lib/                    GHC's library
+        base-2.1
+        ..etc..
+
+    libHSrts*.a             GHC RTS archive
+    libHSghc.a              GHC package archive
 
-    HSstd1.o                GHC library linkables
-    HSstd2.o                  (used by ghci, which does
-    HSlang.o                  not grok .a files yet)
+    HSrts.o                 GHC RTS linkable, used by ghci
+    HSghc.o                 GHC package linkable, used by ghci
 </programlisting>
 
 <para>Note that:
-- 
1.7.10.4