Note that we redistribute "using Visual C++ Redistributable Package" for

*all* 64-bit builds, regardless of whether you have Visual Studio Express
Edition or not.

You only need to download the redistributable package when you're using
the Express Edition or are doing 64-bit builds.

svn path=/trunk/; revision=45307

1 files changed, 23 insertions, 26 deletions

diff --git a/docbook/wsdg_src/WSDG_chapter_tools.xml b/docbook/wsdg_src/WSDG_chapter_tools.xml
index 20455b43fe..6729d5fd81 100644
--- a/docbook/wsdg_src/WSDG_chapter_tools.xml
+++ b/docbook/wsdg_src/WSDG_chapter_tools.xml
@@ -887,15 +887,14 @@ Stop.]]>
           <filename>wireshark.exe.manifest</filename>)
           and look for the version of the Microsoft.VC80.CRT entry. A
           portable version of 64-bit Wireshark is not built, so method 3
-          is used for 64-bit builds.
+          is used for all 64-bit builds.
         </para>
         <para>
           <itemizedlist>
             <listitem>
               <para>
-                For 32-bit builds using Microsoft Visual C++ 2005, and
-                probably Microsoft Visual C++ 2005 Express Edition
-                without Service Pack 1, you need
+                For 32-bit builds using Microsoft Visual C++ 2005
+                Express Edition without Service Pack 1, you need
                 <command>8.0.50608.0</command>,
                 from: "Microsoft Visual C++ 2005 Redistributable Package (x86)":
                 <ulink url="http://www.microsoft.com/download/details.aspx?id=3387" />.
@@ -904,8 +903,7 @@ Stop.]]>
             <listitem>
               <para>
                 For 64-bit x86 (x64) builds using Microsoft Visual C++
-                2005, and probably Microsoft Visual C++ 2005 Express Edition
-                without Service Pack 1, you need
+                2005, any edition, without Service Pack 1, you need
                 <command>{fill this in}</command>,
                 from: "Microsoft Visual C++ 2005 Redistributable Package (x64)":
                 <ulink url="http://www.microsoft.com/download/details.aspx?id=21254" />.
@@ -913,9 +911,8 @@ Stop.]]>
             </listitem>
             <listitem>
               <para>
-                For IA-64 builds using Microsoft Visual C++ 2005, and
-                probably Microsoft Visual C++ 2005 Express Edition
-                without Service Pack 1, you need
+                For IA-64 builds using Microsoft Visual C++ 2005, any
+                edition, without Service Pack 1, you need
                 <command>{fill this in}</command>,
                 from: "Microsoft Visual C++ 2005 Redistributable Package (IA64)":
                 <ulink url="http://www.microsoft.com/download/details.aspx?id=16326" />.
@@ -932,8 +929,8 @@ Stop.]]>
             </listitem>
             <listitem>
               <para>
-                For 64-bit x86 builds using Microsoft Visual C++ 2005
-                Express Edition with Service Pack 1, you need
+                For 64-bit x86 builds using Microsoft Visual C++ 2005,
+                any edition, with Service Pack 1, you need
                 <command>{fill this in}</command>, from: "Microsoft
                 Visual C++ 2005 SP1 Redistributable Package (x64)":
                 <ulink url="http://www.microsoft.com/download/details.aspx?id=18471" />.
@@ -995,14 +992,14 @@ Stop.]]>
           <filename>wireshark.exe.manifest</filename>)
           and look for the version of the Microsoft.VC90.CRT entry. A
           portable version of 64-bit Wireshark is not built, so method 3
-          is used for 64-bit builds.
+          is used for all 64-bit builds.
         </para>
         <para>
           <itemizedlist>
             <listitem>
               <para>
                 For 32-bit builds using Microsoft Visual C++ 2008
-                without Service Pack 1, you need
+                Express Edition without Service Pack 1, you need
                 <command>9.0.21022.8</command>, from:
                 "Microsoft Visual C++ 2008 Redistributable Package (x86)":
                 <ulink url="http://www.microsoft.com/download/details.aspx?id=29" />.
@@ -1010,8 +1007,8 @@ Stop.]]>
             </listitem>
             <listitem>
               <para>
-                For 64-bit builds using Microsoft Visual C++ 2008
-                without Service Pack 1, you need
+                For 64-bit builds using Microsoft Visual C++ 2008,
+                any edition, without Service Pack 1, you need
                 <command>9.0.21022.8</command>, from:
                 "Microsoft Visual C++ 2008 Redistributable Package (x64)":
                 <ulink url="http://www.microsoft.com/download/details.aspx?id=15336" />.
@@ -1020,7 +1017,7 @@ Stop.]]>
             <listitem>
               <para>
                 For 32-bit builds with Microsoft Visual C++ 2008
-                with Service Pack 1, you need
+                Express Edition with Service Pack 1, you need
                 <command>9.0.30729.17</command>, from:
                 "Microsoft Visual C++ 2008 SP1 Redistributable Package (x86)":
                 <ulink url="http://www.microsoft.com/download/details.aspx?id=5582" />.
@@ -1028,8 +1025,8 @@ Stop.]]>
             </listitem>
             <listitem>
               <para>
-                For 64-bit builds with Microsoft Visual C++ 2008
-                with Service Pack 1, you need
+                For 64-bit builds with Microsoft Visual C++ 2008,
+                any edition, with Service Pack 1, you need
                 <command>9.0.30729.17</command>, from:
                 "Microsoft Visual C++ 2008 SP1 Redistributable Package (x64)":
                 <ulink url="http://www.microsoft.com/download/details.aspx?id=2092" />.
@@ -1091,14 +1088,14 @@ Stop.]]>
           <filename>wireshark.exe.manifest</filename>)
           and look for the version of the Microsoft.VC100.CRT entry. A
           portable version of 64-bit Wireshark is not built, so method 1
-          is used for 64-bit builds.
+          is used for all 64-bit builds.
         </para>
         <para>
           <itemizedlist>
             <listitem>
               <para>
                 For 32-bit builds using Microsoft Visual C++ 2010
-                without Service Pack 1, you need
+                Express Edition without Service Pack 1, you need
                 <command>10.0.30319.1</command>, from: "Microsoft Visual
                 C++ 2010 Redistributable Package (x86)":
                 <ulink url="http://www.microsoft.com/download/en/details.aspx?id=5555" />.
@@ -1106,8 +1103,8 @@ Stop.]]>
             </listitem>
             <listitem>
               <para>
-                For 64-bit builds using Microsoft Visual C++ 2010
-                without Service Pack 1, you need
+                For 64-bit builds using Microsoft Visual C++ 2010,
+                any edition, without Service Pack 1, you need
                 <command>10.0.30319.1</command>, from: "Microsoft Visual
                 C++ 2010 Redistributable Package (x64)":
                 <ulink url="http://www.microsoft.com/download/details.aspx?id=14632" />.
@@ -1115,8 +1112,8 @@ Stop.]]>
             </listitem>
             <listitem>
               <para>
-                For 32-bit builds using Microsoft Visual C++ 2010 with
-                Service Pack 1, you need
+                For 32-bit builds using Microsoft Visual C++ 2010
+                Express Edition with Service Pack 1, you need
                 <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?id=8328" />.
@@ -1124,8 +1121,8 @@ Stop.]]>
             </listitem>
             <listitem>
               <para>
-                For 64-bit builds using Microsoft Visual C++ 2010 with
-                Service Pack 1, you need
+                For 64-bit builds using Microsoft Visual C++ 2010,
+                any edition, with Service Pack 1, you need
                 <command>10.0.40219.1</command>, from: "Microsoft Visual
                 C++ 2010 SP1 Redistributable Package (x64)":
                 <ulink url="http://www.microsoft.com/download/details.aspx?id=13523" />.