"setup.exe" -> "Cygwin Setup" throughout. Other minor changes throughout.

1 files changed, 55 insertions, 52 deletions

diff --git a/winsup/doc/install.texinfo b/winsup/doc/install.texinfo
index 11ab8c9a8..4447dac77 100644
--- a/winsup/doc/install.texinfo
+++ b/winsup/doc/install.texinfo
@@ -10,9 +10,8 @@ see @file{http://cygwin.com/packages/}.
 
 Full source code is available for all packages and tools.
 
-There is one recommended way to install Cygwin, which is to use the GUI
-installer @samp{setup.exe}.  There are some variations on how you go
-about that.
+There is only one recommended way to install Cygwin, which is to use the GUI
+installer ``Cygwin Setup''.  It is flexible and easy to use.
 
 Do it any other way, and you're on your own!  That said, keep in mind
 that the GUI installer is a "work in progress", so there might be a few
@@ -21,18 +20,18 @@ specific requirements.  If something doesn't work right for you, and
 it's not covered here or elsewhere, then by all means report it to the
 mailing list.
 
-@section Installation using the @samp{setup.exe} program
+@section Installation using ``Cygwin Setup''
 
-The @samp{setup.exe} program is the recommended way to install Cygwin,
+The Cygwin Setup program is the only recommended way to install Cygwin,
 but it is still a work in progress.  Expect features and functionality
 to change.  For this reason, it is a good idea to note the version and
-build time reported by @code{setup.exe} when you run it.  This will help
+build time reported by Cygwin Setup when you run it.  This will help
 diagnose problems, should you have any.  Check the cygwin mailing list
-for the latest news about @code{setup.exe}.
+for the latest news about Cygwin Setup.
 
 @subsection Why not install in C:\?
 
-The @code{setup.exe} program will prompt you for a "root" directory.
+The Cygwin Setup program will prompt you for a "root" directory.
 The default is @samp{C:\cygwin}, but you can change it.  You are urged not to
 choose something like 'C:\' (the root directory on the system drive) for
 your Cygwin root.  If you do, then critical Cygwin system directories
@@ -40,24 +39,27 @@ like 'etc', 'lib' and 'bin' could easily be corrupted by other (non-Cygwin)
 applications or packages that use \etc, \lib or \bin.  Perhaps there is
 no conflict now, but who knows what you might install in the future?
 It's also just good common sense to segregate your Cygwin "filesystems"
-from the rest of your Windows system disk.  (In the past, there had been
-genuine bugs that would cause problems for people who installed in C:\,
-but we believe those are gone now.)
+from the rest of your Windows system disk.
 
-@subsection Can I use the new setup to update a B18, B19, B20, B20.1 or CD-ROM (1.0) installation of Cygwin?
+(In the past, there had been genuine bugs that would cause problems
+for people who installed in C:\, but we believe those are gone now.)
 
-No, you must start from scratch with the new setup.  The overall
-structure has changed so much that it would be silly to try to
-accomodate old installations of Cygwin.  You'll probably be much better
-off with a whole new installation anyway.  You may backup or rename your
-old installation first, or just install the new one somewhere else.  Be
-sure to make note of your current mount table, because this will be
-overwritten during the new setup.
+@subsection Can I use Cygwin Setup to update a B18, B19, B20, B20.1 or CD-ROM (1.0) installation of Cygwin?
 
-Once you've installed the latest net release, the new setup will update
+No, you must start from scratch with the new Cygwin Setup.  The
+overall structure has changed so much that it would be pointless to
+try to accomodate old installations of Cygwin.  You will probably be
+much better off with a whole new installation anyway.  You may backup
+or rename your old installation first, or just install the new one
+somewhere else.  Be sure to make note of your current mount table,
+because this will be overwritten during the new setup.  Make sure you
+don't end up with two different versions of @samp{cygwin1.dll} in your
+path.
+
+Once you've installed the latest net release, Cygwin Setup will update
 just the individual packages that need it.
 
-@subsection Is @code{setup.exe}, or one of the packages, infected with a virus?
+@subsection Is Cygwin Setup, or one of the packages, infected with a virus?
 
 Unlikely.  Unless you can confirm it, please don't report it to the
 mailing list.  Anti-virus products have been known to detect false
@@ -66,12 +68,13 @@ problems for you, consider disabling your anti-virus software when
 running @code{setup}.  Read the next entry for a fairly safe way to do
 this.
 
-@subsection My computer hangs when I try to run @code{setup.exe}!
+@subsection My computer hangs when I run Cygwin Setup!
 
-Network Associates (formerly McAfee) products have been reported to
-"hang" when extracting Cygwin tar archives.  Consider disabling your
-anti-virus software when running @code{setup}.  The following
-procedure should be a fairly safe way to do that:
+Both Network Associates (formerly McAfee) and Norton anti-virus
+products have been reported to "hang" when extracting Cygwin tar
+archives.  If this happens to you, consider disabling your anti-virus
+software when running Cygwin Setup.  The following procedure should be
+a fairly safe way to do that:
 
 @enumerate
 @item Download @code{setup.exe} and scan it explicitly.
@@ -83,19 +86,20 @@ procedure should be a fairly safe way to do that:
 @item Re-activate your anti-virus software and scan everything
 in C:\cygwin (or wherever you chose to install).  If you're concerned
 about a malicious package, say if a mirror is compromised, then you
-should scan your entire hard disk after running setup.
+should scan your entire hard disk after running Cygwin Setup.
 
 @end enumerate
 
-This should be safe provided setup.exe is not substituted by something
-malicious.
+This should be safe, but only if Cygwin Setup is not substituted by
+something malicious.
 
 @subsection What packages should I download?
 
-When using @samp{setup.exe} for the first time, the default is to
-install a minimal subset of packages.  If you want anything beyond
-that, you will have to select it explicitly.  See
-@file{http://cygwin.com/packages/} for a searchable list of packages available.
+When using Cygwin Setup for the first time, the default is to install
+a minimal subset of packages.  If you want anything beyond that, you
+will have to select it explicitly.  See
+@file{http://cygwin.com/packages/} for a searchable list of available
+packages.
 
 If you want to build programs, of course you'll need @samp{gcc},
 @samp{binutils}, @samp{make} and probably other packages from the
@@ -106,11 +110,12 @@ If you want to build programs, of course you'll need @samp{gcc},
 In the past, the default was to install everything, much to the
 irritation of many users.  Now the default is to install only a basic
 core of packages.  At the moment, there is no easy way to get
-everything.  You must do the following:
+everything.  In the current version of Cygwin Setup, if you want
+everything, you must do the following:
 
 @enumerate
 
-@item When the GUI says ``Select packages to install'', click on the
+@item When the Cygwin Setup says ``Select packages to install'', click on the
 ``View'' button until it says ``Full''.
 
 @item Wherever it says ``Skip'', click twice until it gives the
@@ -120,14 +125,14 @@ installed.
 @end enumerate
 
 If a package you've selected for installation has prerequisites, those
-will automatically be installed too.  It's a lot of clicking but you
-only the first time.  Once you install a package, any subsequent
-updates to that package will be installed by default.  Note that new
-packages are added rather frequently, so you'll have to regularly
-check the list for any ``Skip'' entries if you want to stay up to date
-with a complete installation.
+will automatically be installed too.  It's a lot of clicking but only
+the first time.  Once you install a package, any subsequent updates to
+that package will be installed by default.  Note that new packages are
+added regularly, so you will always have to check the list for any
+``Skip'' entries if you want to stay up to date with a complete
+installation.
 
-This should become much easier in a future version of @samp{setup.exe}.
+This should become much easier in a future version of Cygwin Setup.
 
 @subsection How much disk space does Cygwin require?
 
@@ -142,11 +147,10 @@ subdirectories there.
 
 @subsection What if setup fails?
 
-First, make sure that you are using the latest version of
-@code{setup.exe}.  It's a work in progress, with improvements and
-bugfixes being made often.  The latest version is always available from
-the 'Install Cygwin now' link on the Cygwin Home Page at
-@file{http://cygwin.com/}.
+First, make sure that you are using the latest version of Cygwin
+Setup.  It is a work in progress, with improvements and bugfixes being
+made often.  The latest version is always available from the 'Install
+Cygwin now' link on the Cygwin Home Page at @file{http://cygwin.com/}.
 
 If you are downloading from the internet, setup will fail if it cannot
 download the list of mirrors at
@@ -174,9 +178,8 @@ what happened that wasn't supposed to happen, etc.
 
 @subsection What's the difference between packages in @samp{latest} and @samp{contrib}?
 
-There is no difference as far as @code{setup.exe} is concerned, and
-you should not worry about this either.  The distinction is
-historical, not practical.
+There is no difference as far as Cygwin Setup is concerned.  The
+distinction is historical, not practical.
 
 @subsection My Windows logon name has a space in it, will this cause problems?
 
@@ -196,7 +199,7 @@ README file for that package.)
 
 @subsection How do I uninstall individual packages?
 
-Run @code{setup.exe} as you would to install packages.  In the list of
+Run Cygwin Setup as you would to install packages.  In the list of
 packages to install, browse the relevant category or click on the
 ``View'' button to get a full listing.  Click on the cycle glyph until
 the action reads ``Uninstall''.  Proceed by clicking ``Next''.
@@ -255,7 +258,7 @@ snapshots apply:
 
 @enumerate
 
-@item Close all Cygwin apps, including shells and services
+@item Close @strong{all} Cygwin applications, including shells and services
 (e.g. inetd), before updating @code{cygwin1.dll}.  You may have to
 restart Windows to clear the DLL from memory.