Indicate what you're supposed to do with vcredist_x86.exe (download it

to the WIRESHARK_LIB_DIR, and don't run it after downloading it).

Indicate that the version of vcredist_x86.exe you download depends not
only on the major version of the VC++ you have but on what service packs
you have.

svn path=/trunk/; revision=43010

1 files changed, 61 insertions, 26 deletions

diff --git a/docbook/wsdg_src/WSDG_chapter_tools.xml b/docbook/wsdg_src/WSDG_chapter_tools.xml
index 29068b8090..a93035906b 100644
--- a/docbook/wsdg_src/WSDG_chapter_tools.xml
+++ b/docbook/wsdg_src/WSDG_chapter_tools.xml
@@ -749,6 +749,15 @@ Stop.]]>
           </listitem>
         </itemizedlist>
       </para>
+      <para>
+        In all cases where vcredist_x86.exe is downloaded, it should be
+        downloaded to the directory into which the support libraries for
+        Wireshark have been downloaded and installed. This directory is
+        specified by the WIRESHARK_LIB_DIR setting in the
+        <filename>config.nmake</filename> file; by default it is
+	<filename>C:\wireshark-win32-libs</filename>.  It need not, and
+        should not, be run after being downloaded.
+      </para>
       <section>
         <title>msvcr80.dll / vcredist_x86.exe - Version 8.0
         (2005)</title>
@@ -786,64 +795,90 @@ Stop.]]>
           <itemizedlist>
             <listitem>
               <para>
-              <command>8.0.50608.0</command>, from: "Microsoft
-              Visual C++ 2005" (and probably the Express Edition as
-              well):
-              <ulink url="http://www.microsoft.com/downloads/details.aspx?FamilyId=32BC1BEE-A3F9-4C13-9C99-220B62A191EE" /></para>
+                for Microsoft Visual C++ 2005, and probably
+                Microsoft Visual C++ 2005 Express Edition without
+                Service Pack 1, use <command>8.0.50608.0</command>,
+                from: "Microsoft Visual C++ 2005":
+                <ulink url="http://www.microsoft.com/downloads/details.aspx?FamilyId=32BC1BEE-A3F9-4C13-9C99-220B62A191EE" />
+              </para>
             </listitem>
             <listitem>
               <para>
-              <command>8.0.50727.762</command>, from: "Microsoft
-              Visual C++ 2005 Express Edition - ENU Service Pack 1
-              (KB926748)":
-              <ulink url="http://www.microsoft.com/downloads/details.aspx?familyid=200B2FD9-AE1A-4A14-984D-389C36F85647" /></para>
+                for Microsoft Visual C++ 2005 Express Edition with
+                Service Pack 1, use
+                <command>8.0.50727.762</command>, from: "Microsoft
+                Visual C++ 2005 Express Edition - ENU Service Pack 1
+                (KB926748)":
+                <ulink url="http://www.microsoft.com/downloads/details.aspx?familyid=200B2FD9-AE1A-4A14-984D-389C36F85647" />
+              </para>
             </listitem>
           </itemizedlist>
         </para>
-        <para>Please report to the developer mailing list, if you
-        find a different version number!</para>
+        <para>
+          Please report to the developer mailing list, if you
+          find a different version number!
+        </para>
       </section>
       <section>
         <title>msvcr90.dll / vcredist_x86.exe - Version 9.0 (2008)</title>
         <para>
+          For Microsoft Visual C++ 2008 (MSVC 9), only method 3 is used.
+        </para>
+        <para>
           <itemizedlist>
             <listitem>
               <para>
-              <command>9.0.21022.8</command>, from: "Microsoft Visual C++
-			  2008 Redistributable Package (x86)":
-              <ulink url="http://www.microsoft.com/downloads/details.aspx?FamilyID=9B2DA534-3E03-4391-8A4D-074B9F2BC1BF" /></para>
+                for Microsoft Visual C++ 2008 without Service Pack 1,
+                use <command>9.0.21022.8</command>, from:
+                "Microsoft Visual C++ 2008 Redistributable Package (x86)":
+                <ulink url="http://www.microsoft.com/downloads/details.aspx?FamilyID=9B2DA534-3E03-4391-8A4D-074B9F2BC1BF" />
+              </para>
             </listitem>
             <listitem>
               <para>
-              <command>9.0.30729.17</command>, from: "Microsoft Visual C++
-			  2008 SP1 Redistributable Package (x86)":
-              <ulink url="http://www.microsoft.com/downloads/details.aspx?FamilyID=A5C84275-3B97-4AB7-A40D-3802B2AF5FC2" /></para>
+                for Microsoft Visual C++ 2008 with Service Pack 1, use
+                <command>9.0.30729.17</command>, from: "Microsoft Visual C++
+                2008 SP1 Redistributable Package (x86)":
+                <ulink url="http://www.microsoft.com/downloads/details.aspx?FamilyID=A5C84275-3B97-4AB7-A40D-3802B2AF5FC2" />
+              </para>
             </listitem>
           </itemizedlist>
         </para>
-        <para>Please report to the developer mailing list, if you
-        find a different version number!</para>
+        <para>
+          Please report to the developer mailing list, if you
+          find a different version number!
+        </para>
       </section>
       <section>
         <title>msvcr100.dll / vcredist_x86.exe - Version 10.0 (2010)</title>
         <para>
+          For Microsoft Visual C++ 2010 (MSVC 10), only method 3 is
+          used.
+        </para>
+        <para>
           <itemizedlist>
             <listitem>
               <para>
-              <command>10.0.30319.1</command>, from: "Microsoft Visual C++
-			  2010 Redistributable Package (x86)":
-              <ulink url="http://www.microsoft.com/download/en/details.aspx?displaylang=en&amp;id=5555" /></para>
+                for Microsoft Visual C++ 2010 without Service Pack 1, use
+                <command>10.0.30319.1</command>, from: "Microsoft Visual
+                C++ 2010 Redistributable Package (x86)":
+                <ulink url="http://www.microsoft.com/download/en/details.aspx?displaylang=en&amp;id=5555" />
+              </para>
             </listitem>
             <listitem>
               <para>
-              <command>10.0.40219.1</command>, from: "Microsoft Visual C++
-			  2010 SP1 Redistributable Package (x86)":
-              <ulink url="http://www.microsoft.com/download/en/details.aspx?displaylang=en&amp;id=8328" /></para>
+                for Microsoft Visual C++ 2010 with Service Pack 1, use
+                <command>10.0.40219.1</command>, from: "Microsoft Visual
+                C++ 2010 SP1 Redistributable Package (x86)":
+                <ulink url="http://www.microsoft.com/download/en/details.aspx?displaylang=en&amp;id=8328" />
+              </para>
             </listitem>
           </itemizedlist>
         </para>
-        <para>Please report to the developer mailing list, if you
-        find a different version number!</para>
+        <para>
+          Please report to the developer mailing list, if you
+          find a different version number!
+        </para>
       </section>
     </section>
     <section>