Visual C++ 2008 → 2010.

svn path=/trunk/; revision=44622

2 files changed, 22 insertions, 20 deletions

diff --git a/docbook/wsdg_src/WSDG_chapter_quick_setup.xml b/docbook/wsdg_src/WSDG_chapter_quick_setup.xml
index b1d2cdcac9..d2a3f88862 100644
--- a/docbook/wsdg_src/WSDG_chapter_quick_setup.xml
+++ b/docbook/wsdg_src/WSDG_chapter_quick_setup.xml
@@ -34,9 +34,9 @@
       <orderedlist>
         <listitem>
           <para>C compiler:
-          <ulink url="http://www.microsoft.com/express/Downloads/#Visual_Studio_2008_Express_Downloads">
+          <ulink url="http://www.microsoft.com/express/Downloads/#Visual_Studio_2010_Express_Downloads">
           Download</ulink> and install "Microsoft Visual C++
-          2008 Express Edition SP1." (This is a very large download.)</para>
+          2010 Express Edition SP1." (This is a very large download.)</para>
         </listitem>
         <!--
         <listitem>
@@ -78,15 +78,15 @@ set PATH=%PATH%;.
 set PATH=%PATH%;c:\cygwin\bin
 
 echo Setting up Visual Studio environment...
-call "c:\Program Files\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat"
+call "c:\Program Files\Microsoft Visual Studio 10.0\VC\bin\vcvars32.bat"
 
-title Command Prompt (VC++ 2008)]]>
+title Command Prompt (VC++ 2010)]]>
         </programlisting>
       </para>
       <para>Why is this recommended? While this is a huge download,
-      the 2008 Express Edition is the only free (as in beer)
+      the 2010 Express Edition is the only free (as in beer)
       version that includes the Visual Studio integrated
-      debugger. Visual C++ 2008 is also used to create official
+      debugger. Visual C++ 2010 is also used to create official
       Wireshark builds, so it will likely have fewer development-related
       problems.</para>
     </section>
@@ -247,14 +247,14 @@ title Command Prompt (VC++ 2008)]]>
                 <para><varname>MSVC_VARIANT</varname> : Make sure the variant for
                 your compiler is
                 uncommented, and that all others are commented out. For example,
-                if you're using Visual C++ 2008 Express Edition, find the line
+                if you're using Visual C++ 2010 Express Edition, find the line
                 <programlisting>
-<![CDATA[#MSVC_VARIANT=MSVC2008EE]]>
+<![CDATA[#MSVC_VARIANT=MSVC2010EE]]>
                 </programlisting>
                 and remove the comment character (#)
                 from the beginning of the line. Then, find the line
                 <programlisting>
-<![CDATA[MSVC_VARIANT=MSVC2008]]>
+<![CDATA[MSVC_VARIANT=MSVC2010]]>
                 </programlisting>
                 and comment it out, by prefixing a hash (#).
                 <superscript>1</superscript></para>
@@ -265,7 +265,7 @@ title Command Prompt (VC++ 2008)]]>
       </orderedlist>
       <superscript>1</superscript>Compiler dependent: This step
       depends on the compiler you are using. For compilers other than
-      Visual C++ 2008, see the table at
+      Visual C++ 2010, see the table at
       <xref linkend="ChToolsMSChain" />.</para>
       <para>
       <superscript>2</superscript>International Windows might use
@@ -289,8 +289,8 @@ title Command Prompt (VC++ 2008)]]>
         </listitem>
         -->
         <listitem>
-          <para>call <command>C:\Program Files\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat</command>
-          to set environment variables of Visual C++ 2008 Express Edition.
+          <para>call <command>C:\Program Files\Microsoft Visual Studio 10.0\VC\bin\vcvars32.bat</command>
+          to set environment variables of Visual C++ 2010 Express Edition.
           <superscript>1,2</superscript></para>
         </listitem>
         <listitem>
@@ -300,7 +300,7 @@ title Command Prompt (VC++ 2008)]]>
       </orderedlist>
       <superscript>1</superscript>Compiler dependent: This step
       depends on the compiler variant used, for other variants than
-      the recommended Visual C++ 2008 Express Edition see the table
+      the recommended Visual C++ 2010 Express Edition see the table
       at
       <xref linkend="ChToolsMSChain" />!</para>
       <para>
@@ -456,9 +456,9 @@ title Command Prompt (VC++ 2008)]]>
         </listitem>
         <listitem>
           <para><filename>vcredist_x86.exe</filename> :
-          <ulink url="http://www.microsoft.com/DOWNLOADS/details.aspx?FamilyID=a5c84275-3b97-4ab7-a40d-3802b2af5fc2&amp;displaylang=en">
+          <ulink url="http://www.microsoft.com/en-us/download/details.aspx?id=8328">
           Download</ulink> the C-Runtime redistributable for Visual
-          C++ 2008 Express Edition SP1 (<filename>vcredist_x86.exe</filename>)
+          C++ 2010 Express Edition SP1 (<filename>vcredist_x86.exe</filename>)
           and copy it into <filename>C:\wireshark-win32-libs</filename>
           <superscript>1</superscript>
           </para>
@@ -480,7 +480,7 @@ title Command Prompt (VC++ 2008)]]>
       </orderedlist>
       <superscript>1</superscript>Compiler dependent: This step
       depends on the compiler variant used; for other variants than
-      the recommended Visual C++ 2008 Express Edition SP1 see the table
+      the recommended Visual C++ 2010 Express Edition SP1 see the table
       at <xref linkend="ChToolsMSChain" />!</para>
     </section>
   </section>
diff --git a/docbook/wsdg_src/WSDG_chapter_tools.xml b/docbook/wsdg_src/WSDG_chapter_tools.xml
index 612163d174..27afa0b94d 100644
--- a/docbook/wsdg_src/WSDG_chapter_tools.xml
+++ b/docbook/wsdg_src/WSDG_chapter_tools.xml
@@ -246,12 +246,14 @@ PARTICULAR PURPOSE.]]>
     <section>
       <title>Toolchain Package Alternatives</title>
       <para>
-        The official Wireshark 1.6.x and 1.4.x releases are compiled using
-        Microsoft Visual C++ 2008 SP1. (The no longer supported 1.2.x release
-        was also compiled with Microsoft Visual C++ 2008 SP1). Other past releases, including the 1.0 branch,
+        The official Wireshark 1.8.x releases are compiled using
+        Microsoft Visual C++ 2010 SP1.
+        The official 1.2, 1.4, and 1.6 releases are and were compiled using        
+        Microsoft Visual C++ 2008 SP1.
+        Other past releases, including the 1.0 branch,
         were compiled using Microsoft Visual C++ 6.0. Using the release
         compilers is recommended for Wireshark development work. "Express
-        Edition" compilers such as Visual C++ 2008 Express Edition SP1 can be
+        Edition" compilers such as Visual C++ 2010 Express Edition SP1 can be
         used but any PortableApps or U3 packages you create will require the
         installation of a separate Visual C++ Redistributable package. See
         <quote><link linkend='msvc-runtime-redistributable' endterm='msvc-runtime-redistributable.title'/></quote>