Update to reflect current reality.

Cygwin has both 32-bit and 64-bit versions, with separate installers.

Change-Id: I02b2699b9b3dbd3b3c65f7a372c6d423829f449b
Reviewed-on: https://code.wireshark.org/review/2532
Reviewed-by: Guy Harris <guy@alum.mit.edu>

2 files changed, 27 insertions, 19 deletions

diff --git a/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc b/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
index 0e13ceacbb..6b103c024e 100644
--- a/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_quick_setup.asciidoc
@@ -118,7 +118,10 @@ problems.
 
 ==== Install Cygwin
 
-http://www.cygwin.com/setup.exe[Download the Cygwin installer] and start it.
+On 32-bit Windows, http://www.cygwin.com/setup-x86.exe[download the
+32-bit Cygwin installer] and start it.  On 64-bit Windows,
+http://www.cygwin.com/setup-x86_64.exe[download the 64-bit Cygwin
+installer] and start it.
 
 At the "Select Packages" page, you'll need to select
 some additional packages which are not installed by default.
@@ -183,9 +186,10 @@ The official command-line installer is available at http://msysgit.github.io/.
 
 ===== From Cygwin
 
-Cygwin comes with a port of git. To install it, run Cygwin's setup.exe, navigate
-to Devel/git, and if the package has a "Skip" item in the "New" column, click on
-the "Skip" item so it shows a version number.
+Cygwin comes with a port of git.  To install it, run Cygwin's
+setup-x86.exe or setup-x86_64, navigate to Devel/git, and if the package
+has a "Skip" item in the "New" column, click on the "Skip" item so it
+shows a version number.
 
 ===== Git Extensions
 
diff --git a/docbook/wsdg_src/WSDG_chapter_tools.asciidoc b/docbook/wsdg_src/WSDG_chapter_tools.asciidoc
index 0fbb856204..8f5a8c1d2f 100644
--- a/docbook/wsdg_src/WSDG_chapter_tools.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_tools.asciidoc
@@ -54,7 +54,8 @@ development tasks in <<ChapterSources>>.
 Cygwin provides a lot of UNIX based tools on the Win32 platform. It uses a UNIX
 emulation layer which might be a bit slower compared to the native Win32 tools,
 but at an acceptable level. The installation and update is pretty easy and done
-through a single utility, 'setup.exe'.
+through a single utility, 'setup-x86.exe' for 32-bit Windows and
+'setup-x86_64.exe' for 64-bit Windows.
 
 The native Windows tools will typically be a bit faster but more complicated to
 install, as you would have to download the tools from different web sites and
@@ -69,16 +70,18 @@ of Cygwin is required in any case. This may change in the future as packaging
 systems such as NuGet and Chocolatey mature.
 ====
 
-Although Cygwin consists of several separate packages, the installation and
-update is done through a single utility, 'setup.exe', which acts similar to
-other web based installers. All tools will be installed into one base folder.
-The default is 'C:\cygwin'.
+Although Cygwin consists of several separate packages, the installation
+and update is done through a single utility, 'setup-x86.exe' or
+'setup-x86_64.exe', which acts similar to other web based installers. 
+All tools will be installed into one base folder.  The default is
+'C:\cygwin'. 
 
-You will find 'setup.exe' at http://www.cygwin.com/[]. Click on one of the
-"Install Cygwin now" links to download 'setup.exe'. After the download
-completes, run it.
+You will find 'setup-x86.exe', for 32-bit systems, and
+'setup-x86_64.exe', for 64-bit systems, at http://www.cygwin.com/[]. 
+Click on one of the "Install Cygwin now" links to download the
+appropriate setup utility.  After the download completes, run it. 
 
-Setup.exe will ask you for some settings. The defaults
+The setup utility will ask you for some settings. The defaults
 should usually work well, at least initially. At the "Select
 Packages" page, you'll need to select some additional packages,
 which are not installed by default. Navigate to the required
@@ -98,12 +101,13 @@ interpreters (command.com / cmd.exe) but much more powerful.
 
 ==== Add/Update/Remove Cygwin Packages
 
-If you want to add, update, or remove packages later you can do so by running
-'setup.exe' again. At the "Select Packages" page, the entry in the "New" column
-will control what is done (or not) with the package. If a new version of a
-package is available, the new version number will be displayed, so it will be
-automatically updated. You can change the current setting by simply clicking at
-it, it will change between:
+If you want to add, update, or remove packages later you can do so by
+running the setup utility again.  At the "Select Packages" page, the
+entry in the "New" column will control what is done (or not) with the
+package.  If a new version of a package is available, the new version
+number will be displayed, so it will be automatically updated.  You can
+change the current setting by simply clicking at it, it will change
+between:
 
 * 'A specific version number.' This specific package version will be installed.