[project @ 2001-05-22 14:10:25 by rrt]

Merge from 4.08 branch.

diff --git a/docs/building/building.sgml b/docs/building/building.sgml
index cf116dc..3c71aa5 100644 (file)
--- a/docs/building/building.sgml
+++ b/docs/building/building.sgml
@@ -449,16 +449,14 @@ script will tell you if you are missing something.
 <IndexTerm><Primary>Perl, pre-supposed</Primary></IndexTerm>
 <ListItem>
 <para>
-<Emphasis>You have to have Perl to proceed!</Emphasis> Perl is a
-language quite good for doing shell-scripty tasks that involve lots of
-text processing.  It is pretty easy to install.
+<Emphasis>You have to have Perl to proceed!</Emphasis>
+It is pretty easy to install.
 </para>
 
 <para>
 Perl&nbsp;5 is required.  For Win32 platforms, you should use the binary
-supplied in the InstallShield (copy it to <filename>cygwin/bin</filename>).
-The Cygwin-supplied Perl seems not to work (it has problems with line
-endings).
+supplied in the InstallShield (copy it to <filename>/bin</filename>).
+The Cygwin-supplied Perl seems not to work.
 </para>
 
 <para>
@@ -2653,14 +2651,10 @@ guide) before continuing to read these notes.
 <para>
 Because of various hard-wired infelicities, you need to copy
 <Filename>bash.exe</Filename> (from GHC's <Filename>extra-bin</Filename>
-directory) and <Filename>perl.exe</Filename> (from GHC's
-<Filename>bin</Filename> directory) to <Filename>/bin</Filename> (discover
-where your Cygwin root directory is by typign <Command>mount</Command>). If
-you want to use bash as the shell in Emacs, you need to set the
-<Constant>SHELL</Constant> environment variable to point to
-<Filename>bash.exe</Filename>; similarly, if you want to use CVS, then
-<Constant>CVS_RSH</Constant> must point to <Filename>ssh.exe</Filename>,
-which is also in GHC's <Filename>extra-bin</Filename> directory.
+directory), and <Filename>perl.exe</Filename> and
+<Filename>cat.exe</Filename> (from GHC's <Filename>bin</Filename> directory)
+to <Filename>/bin</Filename> (discover where your Cygwin root directory is
+by typign <Command>mount</Command>).
 </para>
 
 <para>
@@ -2751,7 +2745,7 @@ will look for its <filename>.cvsrc</filename> file.
 
 <ListItem>
 <para>
-<Constant>CVS_RSH</Constant>: <filename>c:/path_to_Cygwin/bin/ssh</filename>
+<Constant>CVS_RSH</Constant>: <filename>c:/path_to_ghc/extra-bin/ssh</filename>
 </para>
 </ListItem>
 
@@ -2767,6 +2761,14 @@ where <Literal>username</Literal> is your userid
 <Constant>CVSEDITOR</Constant>: <filename>bin/gnuclient.exe</filename> if you want to use an Emacs buffer for typing in those long commit messages.
 </para>
 </ListItem>
+
+<ListItem>
+<para>
+<Constant>SHELL</Constant>: To use bash as the shell in Emacs, you need to
+set this to point to <Filename>bash.exe</Filename>.
+</para>
+</ListItem>
+
 </ItemizedList>
 </ListItem>