Update some links (the "[Ff]amily[Ii]d=" links just redirected to the

"id=" links when I last tried them).

There  are apparently both x86 and x86 versions of the VC++ 2005
distributables and, at least for the non-SP1 versions, there's also an
IA64 version.  List them.

If the URLs have the country and language in them, the displaylang= item
doesn't seem to work (tried with both "displaylang=en" and
"displaylang=de" with both "en-us" and "de-de").  Remove it.

Fix some typoes.

svn path=/trunk/; revision=43026

1 files changed, 45 insertions, 17 deletions

diff --git a/docbook/wsdg_src/WSDG_chapter_tools.xml b/docbook/wsdg_src/WSDG_chapter_tools.xml
index 78ded4bebd..d150d82ad3 100644
--- a/docbook/wsdg_src/WSDG_chapter_tools.xml
+++ b/docbook/wsdg_src/WSDG_chapter_tools.xml
@@ -780,8 +780,8 @@ Stop.]]>
         <title>msvcr80.dll / vcredist_x86.exe - Version 8.0
         (2005)</title>
         <para>There are three redistribution methods that MSDN
-        mentions for MSVC 8 (see: "
-        <ulink url="http://msdn2.microsoft.com/en-us/library/ms235316%28VS.80%29.aspx">
+        mentions for MSVC 8 (see:
+        "<ulink url="http://msdn2.microsoft.com/en-us/library/ms235316%28VS.80%29.aspx">
         Choosing a Deployment Method</ulink>"):</para>
         <para>
           <orderedlist>
@@ -793,7 +793,7 @@ Stop.]]>
             <listitem>
               <para>copy the folder content of Microsoft.VC80.CRT to
               the target directory (e.g. <filename>C:\Program
-              Files\Wireshark</filename></para>
+              Files\Wireshark</filename>)</para>
             </listitem>
             <listitem>
               <para>
@@ -817,22 +817,50 @@ Stop.]]>
           <itemizedlist>
             <listitem>
               <para>
-                For 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, and
+                probably Microsoft Visual C++ 2005 Express Edition
+                without Service Pack 1, you need
                 <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" />.
+                from: "Microsoft Visual C++ 2005 Redistributable Package (x86)":
+                <ulink url="http://www.microsoft.com/en-us/download/details.aspx?id=3387" />.
               </para>
             </listitem>
             <listitem>
               <para>
-                For Microsoft Visual C++ 2005 Express Edition with
-                Service Pack 1, you need
+                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
+                <command>{fill this in}</command>,
+                from: "Microsoft Visual C++ 2005 Redistributable Package (x64)":
+                <ulink url="http://www.microsoft.com/en-us/download/details.aspx?id=21254" />.
+              </para>
+            </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
+                <command>{fill this in}</command>,
+                from: "Microsoft Visual C++ 2005 Redistributable Package (IA64)":
+                <ulink url="http://www.microsoft.com/en-us/download/details.aspx?id=16326" />.
+              </para>
+            </listitem>
+            <listitem>
+              <para>
+                For 32-bit builds using Microsoft Visual C++ 2005
+                Express Edition with Service Pack 1, you need
                 <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" />.
+                Visual C++ 2005 SP1 Redistributable Package (x86)":
+                <ulink url="http://www.microsoft.com/en-us/download/details.aspx?id=5638" />.
+              </para>
+            </listitem>
+            <listitem>
+              <para>
+                For 64-bit x86 builds using Microsoft Visual C++ 2005
+                Express 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/en-us/download/details.aspx?id=18471" />.
               </para>
             </listitem>
           </itemizedlist>
@@ -857,7 +885,7 @@ Stop.]]>
                 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/downloads/details.aspx?FamilyID=9B2DA534-3E03-4391-8A4D-074B9F2BC1BF" />.
+                <ulink url="http://www.microsoft.com/en-us/download/details.aspx?id=29" />.
               </para>
             </listitem>
             <listitem>
@@ -875,7 +903,7 @@ Stop.]]>
                 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/downloads/details.aspx?FamilyID=A5C84275-3B97-4AB7-A40D-3802B2AF5FC2" />.
+                <ulink url="http://www.microsoft.com/en-us/download/details.aspx?id=5582" />.
               </para>
             </listitem>
             <listitem>
@@ -909,7 +937,7 @@ Stop.]]>
                 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?displaylang=en&amp;id=5555" />.
+                <ulink url="http://www.microsoft.com/download/en/details.aspx?id=5555" />.
               </para>
             </listitem>
             <listitem>
@@ -927,7 +955,7 @@ Stop.]]>
                 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?displaylang=en&amp;id=8328" />.
+                <ulink url="http://www.microsoft.com/download/en/details.aspx?id=8328" />.
               </para>
             </listitem>
             <listitem>