X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=docs%2Fusers_guide%2Finstalling.xml;h=36213ad0890fce5483a55ca494c4020a75648ac5;hb=aedb94f5f220b5e442b23ecc445fd38c8d9b6ba0;hp=4f3a1c2a86f7d42d9e8061d52b776b2769d321fe;hpb=b4d1234d58af102db3a064802f3fa7ca3242b8ce;p=ghc-hetmet.git

diff --git a/docs/users_guide/installing.xml b/docs/users_guide/installing.xml
index 4f3a1c2..36213ad 100644
--- a/docs/users_guide/installing.xml
+++ b/docs/users_guide/installing.xml
@@ -63,7 +63,7 @@ Binary distributions come in “bundles,” called
 <para>
 <screen>
 % cd /your/scratch/space
-% bunnzip2 &#60; ghc-<replaceable>version</replaceable>-<replaceable>platform</replaceable>.tar.bz2 | tar xvf -</screen>
+% bunzip2 &#60; ghc-<replaceable>version</replaceable>-<replaceable>platform</replaceable>.tar.bz2 | tar xvf -</screen>
 </para>
 
 <para>
@@ -225,7 +225,7 @@ url="http://www.haskell.org/ghc/download.html">GHC download page</ulink>.
 <listitem><para>Run the installer.
 On Windows, all of GHC's files are installed in a single directory.
 You can override it, but by default this directory is
-<filename>c:/ghc/<replaceable>ghc-version</replaceable></filename>.
+<filename>c:/ghc/ghc-<replaceable>version</replaceable></filename>.
 The executable binary for GHC will be installed in the
 <filename>bin/</filename> sub-directory of the installation directory.
 If you want to invoke GHC from a command line, add this
@@ -234,7 +234,7 @@ to your <literal>$PATH</literal> environment variable.
 <para>
 When installation is complete, you should find GHCi and the GHC
 documentation are available in your Start menu under
-"Start/All Programs/GHC/<replaceable>ghc-version</replaceable>".
+"Start/All Programs/GHC/ghc-<replaceable>version</replaceable>".
 </para>
 </listitem>
 
@@ -243,17 +243,17 @@ GHC needs a directory in which to create, and later delete, temporary files.
 It uses the standard Windows procedure <literal>GetTempPath()</literal> to
 find a suitable directory.  This procedure returns:
 <itemizedlist>
-<listitem><para>The path in environment variable TMP, 
+<listitem><para>The path in the environment variable TMP, 
 if TMP is set.</para></listitem>
-<listitem><para>Otherwise, the path in environment variable TEMP, 
+<listitem><para>Otherwise, the path in the environment variable TEMP, 
 if TEMP is set.</para></listitem>
 <listitem><para>Otherwise, there is a per-user default which varies
 between versions of Windows. On NT and XP-ish versions, it might 
 be:
-<filename>c:\Documents and Settings\&lt;username&gt;\Local Settings\Temp</filename>
+<filename>c:\Documents and Settings\&lt;username&gt;\Local Settings\Temp</filename>.
 </para></listitem>
 </itemizedlist>
-The main point is that if you don't do anything GHC will work fine;
+The main point is that if you don't do anything GHC will work fine,
 but if you want to control where the directory is, you can do so by
 setting TMP or TEMP.
 </para></listitem>
@@ -282,7 +282,7 @@ You do <emphasis>not</emphasis> need the Cygwin toolchain, or anything
 else, to install and run GHC.
 </para>
 <para>
-An installation of GHC requires about 340M of disk space.
+An installation of GHC requires about 365M of disk space.
 To run GHC comfortably, your machine should have at least
 64M of memory.
 </para>
@@ -291,16 +291,16 @@ To run GHC comfortably, your machine should have at least
 <sect2><title>Moving GHC around</title>
 <para>
 Once GHC is installed, you can freely move the entire GHC tree just by copying
-the <filename>c:/ghc/<replaceable>ghc-version</replaceable></filename>
+the <filename>c:/ghc/ghc-<replaceable>version</replaceable></filename>
 directory. (You will need to fix up 
-the links in "Start/All Programs/GHC/<replaceable>ghc-version</replaceable>"
+the links in "Start/All Programs/GHC/ghc-<replaceable>version</replaceable>"
 if you do this.)
 </para>
 <para>
 It is OK to put GHC tree in a directory whose path involves spaces.  However,
 don't do this if you use want to use GHC with the Cygwin tools, 
 because Cygwin can get confused when this happens.
-We havn't quite got to the bottom of this, but so far as we know it's not 
+We haven't quite got to the bottom of this, but so far as we know it's not
 a problem with GHC itself.  Nevertheless, just to keep life simple we usually
 put GHC in a place with a space-free path.
 </para>
@@ -484,7 +484,7 @@ are annotated <literal>[Win32 only]</literal> and are commented below.</para>
 	<listitem>
 	  <para><filename>$(libdir)</filename> also contains support
           binaries.  These are <emphasis>not</emphasis> expected to be
-          on the user's <filename>PATH</filename>, but and are invoked
+          on the user's <filename>PATH</filename>, but are invoked
           directly by GHC.  In the Makefile system, this directory is
           also called <filename>$(libexecdir)</filename>, but
           <emphasis>you are not free to change it</emphasis>.  It must
@@ -507,11 +507,11 @@ with the Win32 distribution of GHC. </para>
 	<listitem>
 	  <para>The support programs <filename>ghc-split</filename>
           and <filename>ghc-asm</filename> are Perl scripts.  The
-          first line says <literal>#!/bin/perl</literal>; on Unix, the
+          first line says <literal>#!/usr/bin/perl</literal>; on Unix, the
           script is indeed invoked as a shell script, which invokes
           Perl; on Windows, GHC invokes
           <filename>$(libdir)/perl.exe</filename> directly, which
-          treats the <literal>#!/bin/perl</literal> as a comment.
+          treats the <literal>#!/usr/bin/perl</literal> as a comment.
           Reason: on Windows we want to invoke the Perl distributed
           with GHC, rather than assume some installed one.  </para>
 	</listitem>