Rewrote "Adding or updating packages",

plus a few other minor changes.

1 files changed, 50 insertions, 47 deletions

diff --git a/winsup/doc/install.texinfo b/winsup/doc/install.texinfo
index bcfe4b2e4..a41469538 100644
--- a/winsup/doc/install.texinfo
+++ b/winsup/doc/install.texinfo
@@ -7,11 +7,11 @@ choose the packages you wish to install, and update them individually.
 
 The following packages are available with the latest net release:
 
-ash(really '/bin/sh'), bash, binutils, bison, byacc, bzip2, clear, common,
-cygwin, dejagnu, diff, expect, fileutils, findutils, flex, gawk, gcc,
-gdb, gperf, grep, groff, gzip, inetutils, less, libpng, login, m4, make,
-man, patch, sed, shellutils, tar, tcltk, termcap, texinfo, textutils,
-time, zlib
+ash, bash, binutils, bison, byacc, bzip2, clear, common, cygwin,
+dejagnu, diff, expect, fileutils, findutils, flex, gawk, gcc, gdb,
+gperf, grep, groff, gzip, inetutils, less, libpng, login, m4, make, man,
+patch, sed, shellutils, tar, tcltk, termcap, texinfo, textutils, time,
+zlib
 
 Full source code is available for all packages and tools.
 
@@ -57,8 +57,8 @@ C:\cygwin           /                   user         binmode
 Note that /bin and /usr/bin point to the same location, as do /lib and
 /usr/lib.  This is intentional, and you should not undo these mounts
 unless you @emph{really} know what you are doing.  Currently,
-@code{setup.exe} creates only binary mounts, but future versions will be
-more flexible.
+@code{setup.exe} creates only binary mounts, but future versions will
+probably be more flexible.
 
 You can let @code{setup.exe} download all the files for you on the fly.
 This is the 'internet' installation.  Or you can download all (or some)
@@ -87,8 +87,9 @@ Then proceed according to your choice below.
 
 Shut down @strong{all cygwin applications} (including inetd, etc.).
 
-Then, @strong{in a command window} ("MS-DOS Prompt" in Windows 95/98),
-'@code{cd}' to the temporary directory and type '@code{setup.exe}'.
+Then, in a @strong{Windows command prompt} ("MS-DOS Prompt" in Windows
+95/98), '@code{cd}' to the temporary directory and type
+'@code{setup.exe}'.
 
 When prompted, specify the location of the root directory, or accept the
 default.
@@ -99,13 +100,14 @@ the default.
 Setup will connect to sourceware.cygnus.com to read a list of mirror
 sites.  Choose one from the list, or choose 'other' to supply your own.
 If you supply your own, you must provide a full URL, not just the ftp
-hostname.  Setup will then proceed to download all packages from the ftp
-site.  Of course this may take a while if you have a slow connection.
+hostname.  Setup will then proceed to download and install all packages
+from the ftp site.  Of course this may take a while if you have a slow
+connection.
 
 When finished, Setup will have created a "Cygnus Solutions" folder on
 your Start Menu, containing a shortcut to @code{cygwin.bat}, which
 invokes bash with various environment variables set correctly.  The
-"Uninstall Cygwin" shortcut, if present, is unlikely to do a complete
+"Uninstall Cygwin" shortcut, if present, is unlikely to do a proper
 job.  If you want to completely uninstall Cygwin, you will probably have
 to delete some things by hand.
 
@@ -131,13 +133,14 @@ installation.
 When you have all the necessary tar files together with
 @code{setup.exe}, proceed as you would for an internet installation,
 except choose directory installation ('d') when prompted.  Setup will
-install from the tar files that it finds there.  Here are the details
-again:
+install all the tar files that it finds there.  Here are the gory
+details again:
 
 Shut down @strong{all cygwin applications} (including inetd, etc.).
 
-Then, @strong{in a command window} ("MS-DOS Prompt" in Windows 95/98),
-'@code{cd}' to the temporary directory and type '@code{setup.exe}'.
+Then, in a @strong{Windows command prompt} ("MS-DOS Prompt" in Windows
+95/98), '@code{cd}' to the temporary directory and type
+'@code{setup.exe}'.
 
 When prompted, specify the location of the root directory, or accept the
 default.
@@ -148,7 +151,7 @@ This is @strong{not} the default.
 When finished, Setup will have created a "Cygnus Solutions" folder on
 your Start Menu, containing a shortcut to @code{cygwin.bat}, which
 invokes bash with various environment variables set correctly.  The
-"Uninstall Cygwin" shortcut, if present, is unlikely to do a complete
+"Uninstall Cygwin" shortcut, if present, is unlikely to do a proper
 job.  If you want to completely uninstall Cygwin, you will probably have
 to delete some things by hand.
 
@@ -162,39 +165,40 @@ if your installation failed for some reason.
 Later versions of @code{setup.exe} permit you to add and/or update
 packages to an existing cygwin installation.
 
-To update your installation, create an empty directory, cd to it, and
-download the latest version of @code{setup.exe} from the @code{latest}
-directory at a Cygwin mirror near you.
+@strong{You cannot use this method to update a B18, B19, B20, B20.1 or
+CD-ROM (1.0) installation of Cygwin.  You must have previously installed
+a net release of Cygwin 1.1.0 or greater, using @code{setup.exe}, before
+you can update packages with 'setup -u'.}
 
-Once you've downloaded @code{setup.exe}, type
+To update your installation, create an empty temporary directory, and
+download the latest version of @code{setup.exe} to it from a Cygwin
+mirror near you.
+
+Then, in a @strong{Windows command prompt} ("MS-DOS Prompt" in Windows
+95/98), '@code{cd}' to the temporary directory and type
 @example
-	./setup <pkg>
+	setup -u <pkg>
 @end example
 where "<pkg>" is the name of the package you wish to update, such as
 "cygwin" or "gdb" or "make" or ...
 
-Answer the questions as you did when you first installed Cygwin.  This
-will update the package.  As with the initial installation, you can
-update from the (i)nternet or from the (d)irectory.  The latter requires
-that you download the @code{.tar.gz} file of the package ahead of time,
-along with @code{setup.exe}.
+Specify the root directory as you did when you first installed Cygwin.
+This will update the package.  As with the initial installation, you can
+update from the internet ('i') or from the directory ('d').  The latter
+requires that you download the @code{.tar.gz} file of the package ahead
+of time, along with @code{setup.exe}.
 
-If you are updating "cygwin", then you must close @strong{all} Cygwin
-applications (including @code{inetd}, for example), and run
-@code{setup.exe} from the Windows command prompt.
+If you are updating the package "cygwin", then you must close
+@strong{all} Cygwin applications (including @code{inetd}, for example),
+before running setup.
 
-If you supply the @code{-u} option to @code{setup.exe}, then
-@code{setup.exe} will only update the package if an older version is
-currently installed.  For example:
-@example
-	./setup -u gdb
-@end example
-However, if you currently have a development snapshot installed, setup
-may fail to update the package, because development snapshots have their
-version numbers "bumped" to the next release number.  In this case, you
-should not use @code{-u}.  Omitting @code{-u} forces @code{setup.exe} to
-perform the update, regardless of whether @code{setup.exe} deems it
-necessary.
+You can omit the '-u' option, which will force setup to install the
+latest package (from internet or directory), regardless of whether
+@code{setup.exe} believes it is necessary.  You @strong{must} omit '-u'
+if you are updating from a development snapshot, because development
+snapshots have their version numbers "bumped" to the next release
+number.  In this case, @code{setup.exe} will think your installation is
+already up-to-date.
 
 Once setup is complete you may remove the temporary directory.  It will
 contain @code{setup.exe}, the downloaded @code{.tar.gz} files, and a
@@ -207,24 +211,23 @@ if your installation failed for some reason.
 
 This means that @code{setup.exe} could not make an http connection to
 @file{http://sourceware.cygnus.com/cygwin/mirrors.html}.  This is
-required for an (i)nternet install.  Either sourceware.cygnus.com was
+required for an internet ('i') install.  Either sourceware.cygnus.com was
 too busy, or there is a problem with your network.  Note that
 @code{setup.exe} has very limited proxy functionality for firewalls, and
 depends on IE4 or later being installed and configured properly.  If you
-cannot get the (i)nternet installation to work, just download the
-packages yourself and do a (d)irectory install.
+cannot get the internet installation to work, just download the
+packages yourself and do a directory ('d') install.
 
 @subsubsection System hangs when unpacking tar archives
 
 Your anti-virus software is interfering with @code{setup.exe}.  You will
 have to disable it before running setup.  In that case, you will
 probably want to:
-
 @enumerate
 @item download all the .tar.gz files for the packages, along with @code{setup.exe}
 @item scan it all for viruses
 @item disable the anti-virus software
-@item perform a (d)irectory install
+@item perform a directory ('d') install
 @item re-enable the anti-virus software
 @item scan everything below your Cygwin root directory (@code{C:\cygwin} by default)
 @end enumerate