* faq-setup.xml: Minor snapshot instruction rewording. Update discussion about

setup*.exe.
* faq-using.xml: Update information about setup*.exe.
* faq-what.xml: Ditto.

4 files changed, 17 insertions, 17 deletions

diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 1bb19c776..41cd32ba4 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,10 @@
+2014-01-29  Christopher Faylor  <me.cygwin2014@cgf.cx>
+
+	* faq-setup.xml: Minor snapshot instruction rewording.  Update
+	discussion about setup*.exe.
+	* faq-using.xml: Update information about setup*.exe.
+	* faq-what.xml: Ditto.
+
 2014-01-27  Corinna Vinschen  <corinna@vinschen.de>
 
 	* new-features.xml (ov-new1.7.28): Add new section.
diff --git a/winsup/doc/faq-setup.xml b/winsup/doc/faq-setup.xml
index fc73886d2..d2a0f1cc0 100644
--- a/winsup/doc/faq-setup.xml
+++ b/winsup/doc/faq-setup.xml
@@ -11,16 +11,14 @@
 <answer>
 
 <para>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.  
+installer <command>setup-*.exe</command>.  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" />.
 </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
+<para>If you do it any other way, you're on your own!
+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/snapshots/">http://cygwin.com/snapshots/</ulink>, then by all means report it to the
 mailing list.
@@ -335,8 +333,7 @@ prior actions is in <literal>/var/log/setup.log</literal>.
 <answer>
 
 <para>First, make sure that you are using the latest version of Cygwin Setup.
-The latest version is always available from the 'Install Cygwin now' link on
-the Cygwin Home Page at <ulink
+The latest version is always available from the Cygwin Home Page at <ulink
 url="http://cygwin.com/">http://cygwin.com/</ulink>.  </para>
 <para>If you are downloading from the Internet, setup will fail if it cannot
 download the list of mirrors at <ulink
@@ -538,10 +535,6 @@ have not been tested.  Use them <emphasis role='bold'>only</emphasis> if there i
 bugfix that you need to try, and you are willing to deal with any
 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.
-</para>
 <para>You cannot use Cygwin Setup to install a snapshot.
 </para>
 <para>First, you will need to download the snapshot from the snapshots
@@ -561,8 +554,8 @@ 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>
-	/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/tar -C / -xvf /posix/path/to/cygwin-inst-YYYYMMDD.tar.* --exclude=usr/bin/cygwin1.dll
+	/bin/tar -C /tmp -xvf /posix/path/to/cygwin-inst-YYYYMMDD.tar.* usr/bin/cygwin1.dll
 </screen>
 </para>
 <para>Exit the bash shell, and use Explorer or the Windows command shell to
diff --git a/winsup/doc/faq-using.xml b/winsup/doc/faq-using.xml
index 7ac928f91..19e381624 100644
--- a/winsup/doc/faq-using.xml
+++ b/winsup/doc/faq-using.xml
@@ -332,7 +332,7 @@ to determine whether they are executable.
 <question><para>How do I print under Cygwin?</para></question>
 <answer>
 
-<para>lpr is available in the <ulink url="http://cygwin.com/setup.exe">setup.exe</ulink> cygutils package.  Some <ulink url="http://cygwin.com/ml/cygwin/2008-05/msg00123.html">usage hints</ulink> are available courtesy of Rodrigo Medina.
+<para>lpr is available in the cygutils package.  Some <ulink url="http://cygwin.com/ml/cygwin/2008-05/msg00123.html">usage hints</ulink> are available courtesy of Rodrigo Medina.
 </para>
 <para>Jason Tishler has written a couple of messages that explain how to use
 a2ps (for nicely formatted text in PostScript) and ghostscript (to print
@@ -420,7 +420,7 @@ if you have one a single Cygwin installation, for example, if you update the
 Cygwin package without exiting <emphasis>all</emphasis> Cygwin apps (including
 services like sshd) beforehand.</para>
 <para>The only DLL that is sanctioned by the Cygwin project is the one that
-you get by running <ulink url="http://cygwin.com/setup.exe">setup.exe</ulink>,
+you get by running <ulink url="http://cygwin.com/install.html">setup.exe</ulink>,
 installed in a directory controlled by this program.  If you have other
 versions on your system and desire help from the cygwin project, you should
 delete or rename all DLLs that are not installed by
diff --git a/winsup/doc/faq-what.xml b/winsup/doc/faq-what.xml
index 6960c687e..a57e224bc 100644
--- a/winsup/doc/faq-what.xml
+++ b/winsup/doc/faq-what.xml
@@ -112,8 +112,8 @@ the efforts of net volunteers who maintain the Cygwin binary ports.
 Each package has its own version numbers and its own release process.
 </para>
 <para>So, how do you get the most up-to-date version of Cygwin?  Easy.  Just
-download the Cygwin Setup program from
-<ulink url='http://cygwin.com/setup.exe'>http://cygwin.com/setup.exe</ulink>.  This program will handle the task
+download the Cygwin Setup program by following the instructions
+<ulink url='http://cygwin.com/install.html'>here</ulink>.  The setup program will handle the task
 of updating the packages on your system to the latest version. For
 more information about using Cygwin's <filename>setup.exe</filename>, see 
 <ulink url='http://cygwin.com/cygwin-ug-net/setup-net.html'>Setting Up Cygwin</ulink>