* faq-setup.xml (faq.setup.setup): Correct URL typo.

(faq.setup.snapshots): Clarify.

2 files changed, 43 insertions, 24 deletions

diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 17b414e63..1cd9be0db 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,6 +1,8 @@
 2006-01-12  Igor Peshansky  <pechtcha@cs.nyu.edu>
 
 	* doctool.c (scan_directory): Ignore "CVS" directories.
+	* faq-setup.xml (faq.setup.setup): Correct URL typo.
+	(faq.setup.snapshots): Clarify.
 
 2005-12-30  Christopher Faylor  <cgf@timesys.com>
 
diff --git a/winsup/doc/faq-setup.xml b/winsup/doc/faq-setup.xml
index 360bee803..e0ef693f2 100644
--- a/winsup/doc/faq-setup.xml
+++ b/winsup/doc/faq-setup.xml
@@ -8,14 +8,14 @@ installer ``Cygwin Setup''.  It is flexible and easy to use.
 You can pick and choose the packages you wish to install, and update
 them individually.  Full source code is available for all packages and
 tools.  More information on using Cygwin Setup may be found at
-<ulink url="http://cygwin.com/cygwin-ug-net/setup-net.html">http://cygwin.com/cygwin-ug-net/setup-net.html</ulink>.
+<ulink url="http://cygwin.com/cygwin-ug-net/setup-net.html" />.
 </para>
 <para>If you do it any other way, 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
 difficulties, especially if you are behind a firewall or have other
 specific requirements.  If something doesn't work right for you, and
 it's not covered here or in the latest development snapshot at
-<ulink url="http://cygwin.com/setup/">http://cygwin.com/setup/</ulink>, then by all means report it to the
+<ulink url="http://cygwin.com/snapshots/">http://cygwin.com/snapshots/</ulink>, then by all means report it to the
 mailing list.
 </para>
 <para>For a searchable list of packages that can be installed with Cygwin,
@@ -392,37 +392,54 @@ thing stored in the registry.
 <para>First, are you sure you want to do this?  Snapshots are risky.  They
 have not been tested.  Use them <emphasis role='bold'>only</emphasis> if there is a feature or
 bugfix that you need to try, and you are willing to deal with any
-problems.
-</para>
-<para>Before installing a snapshot, you must first Close <emphasis role='bold'>all</emphasis> Cygwin
-applications, including shells and services (e.g. inetd, sshd), before
-updating <literal>cygwin1.dll</literal>.  You may have to restart Windows to clear
-the DLL from memory.
-</para>
-<para>You cannot use Setup to install a snapshot.
+problems, or at the request of a Cygwin developer.
 </para>
 <para>You should generally install the full
 <literal>cygwin-inst-YYYYMMDD.tar.bz2</literal> update, rather than just the DLL,
-otherwise some components may be out of sync.  Cygwin tar won't be
-able to update <literal>/usr/bin/cygwin1.dll</literal>, but it should succeed with
-everything else.
+otherwise some components may be out of sync.
 </para>
-<orderedlist>
-<listitem><para>Download the snapshot, and run:
+<para>You cannot use Cygwin Setup to install a snapshot.
+</para>
+<para>First, you will need to download the snapshot from the snapshots
+page at <ulink url="http://cygwin.com/snapshots/">http://cygwin.com/snapshots/</ulink>.  Note the directory where
+you saved the snapshot tarball.
+</para>
+<para>Before installing a snapshot, you must first Close <emphasis role='bold'>all</emphasis> Cygwin
+applications, including shells and services (e.g., <literal>inetd</literal>, <literal>sshd</literal>).
+You will not be able to replace <literal>cygwin1.dll</literal> if any Cygwin process is
+running.  You may have to restart Windows to clear the DLL from memory
+(beware of automatic service startup).
+</para>
+<para>Most of the downloaded snapshot can be installed using <literal>tar</literal>.  Cygwin
+<literal>tar</literal> won't be able to update <literal>/usr/bin/cygwin1.dll</literal> (because it's
+used by <literal>tar</literal> itself), but it should succeed with everything else.  If
+you are only installing the DLL snapshot, skip the first tar command.  Open
+a <literal>bash</literal> shell (it should be the only running Cygwin process) and issue
+the following commands:
 <screen>
-	cd /
-        tar jxvf /posix/path/to/cygwin-inst-YYYYMMDD.tar.bz2 --exclude=usr/bin/cygwin1.dll
-        cd /tmp
-        tar jxvf /posix/path/to/cygwin-inst-YYYYMMDD.tar.bz2 usr/bin/cygwin1.dll
+	/bin/tar -C/ -jxvf /posix/path/to/cygwin-inst-YYYYMMDD.tar.bz2 --exclude=usr/bin/cygwin1.dll
+	/bin/tar -C/tmp -jxvf /posix/path/to/cygwin-inst-YYYYMMDD.tar.bz2 usr/bin/cygwin1.dll
+	/bin/mv /bin/cygwin1.dll /bin/cygwin1-prev.dll
 </screen>
 </para>
-</listitem>
-<listitem><para>After closing all Cygwin apps (see above), use Explorer or the
+<para>Note that after the "<literal>mv</literal>" command you will not be able to run any
+Cygwin programs.  Exit the bash shell, and use Explorer or the
 Windows command shell to move <literal>C:\cygwin\tmp\usr\bin\cygwin1.dll</literal>
-to <literal>C:\cygwin\bin\cygwin1.dll</literal>.
+to <literal>C:\cygwin\bin\cygwin1.dll</literal> (assuming you installed Cygwin in
+<literal>C:\cygwin</literal>).
+</para>
+<para>The operative word in trying the snapshots is "<emphasis>trying</emphasis>".  If you
+notice a problem with the snapshot that was not present in the release
+DLL (what we call a "regression"), please report it to the Cygwin
+mailing list (see <ulink url="http://cygwin.com/problems.html">http://cygwin.com/problems.html</ulink> for problem
+reporting guidelines).  If you wish to go back to the older version of the
+DLL, again, close all Cygwin processes, delete
+<literal>C:\cygwin\bin\cygwin1.dll</literal>, and
+rename <literal>C:\cygwin\bin\cygwin1-prev.dll</literal> back to
+<literal>C:\cygwin\bin\cygwin1.dll</literal> (again assuming that your "<literal>/</literal>" is
+<literal>C:\cygwin</literal>).  To restore the rest of the snapshot
+files, reinstall the "<literal>cygwin</literal>" package using Setup.
 </para>
-</listitem>
-</orderedlist>
 
 </answer></qandaentry>