some minor fixes for the Win32 setup guide:

- command.com -> cmd.exe
- reverse the calling of vcvars32 and setenv environment setting scripts (to avoid problems with nmake)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@21767 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/docbook/wsdg_src/WSDG_chapter_quick_setup.xml b/docbook/wsdg_src/WSDG_chapter_quick_setup.xml
index 573a2e79dae9acc4e8664daf91e62126dd964b12..c4fc436c4a8940fdc766d168220b0f14feb7f547 100644 (file)
--- a/docbook/wsdg_src/WSDG_chapter_quick_setup.xml
+++ b/docbook/wsdg_src/WSDG_chapter_quick_setup.xml
@@ -244,17 +244,11 @@
       Files appears elsewhere</para>
     </section>
     <section id="ChSetupPrepareCommandCom">
-      <title>Prepare command.com</title>
-      <para>Prepare command.com - set environment and current dir. 
+      <title>Prepare cmd.exe</title>
+      <para>Prepare cmd.exe - set environment and current dir. 
       <orderedlist>
         <listitem>
-          <para>start command.com</para>
-        </listitem>
-        <listitem>
-          <para>call "C:\Program Files\Microsoft Visual Studio
-          8\VC\bin\vcvars32.bat" to set environment variables of
-          Visual C++ 2005 Express Edition 
-          <superscript>12</superscript></para>
+          <para>start cmd.exe</para>
         </listitem>
         <listitem>
           <para>call "C:\Program Files\Microsoft Platform SDK for
@@ -262,6 +256,12 @@
           variables of Platform SDK Server 2003 R2 
           <superscript>12</superscript></para>
         </listitem>
+        <listitem>
+          <para>call "C:\Program Files\Microsoft Visual Studio
+          8\VC\bin\vcvars32.bat" to set environment variables of
+          Visual C++ 2005 Express Edition 
+          <superscript>12</superscript></para>
+        </listitem>
         <listitem>
           <para>cd C:\wireshark to jump into the source
           directory</para>
@@ -276,7 +276,7 @@
       different values here, e.g. a german version uses
       C:/Programme - take this also in account where C:\Program
       Files appears elsewhereNote: You need to repeat steps 1 - 4
-      each time you open a new command.com!</para>
+      each time you open a new cmd.exe!</para>
     </section>
     <section id="ChToolsWin32Verify">
       <title>Verify installed tools</title>
@@ -338,8 +338,8 @@
       <title>Install Libraries</title>
       <orderedlist>
         <listitem>
-          <para>If you've closed command.com in the meantime,
-          prepare command.com again</para>
+          <para>If you've closed cmd.exe in the meantime,
+          prepare cmd.exe again</para>
         </listitem>
         <listitem>
           <para>nmake -f Makefile.nmake verify_tools verify
@@ -366,8 +366,8 @@
       first time! 
       <orderedlist>
         <listitem>
-          <para>If you've closed command.com in the meantime,
-          prepare command.com again</para>
+          <para>If you've closed cmd.exe in the meantime,
+          prepare cmd.exe again</para>
         </listitem>
         <listitem>
           <para>nmake -f Makefile.nmake distclean to cleanup the
@@ -380,8 +380,8 @@
       <para>Now it's time to build Wireshark ... 
       <orderedlist>
         <listitem>
-          <para>If you've closed command.com in the meantime,
-          prepare command.com again</para>
+          <para>If you've closed cmd.exe in the meantime,
+          prepare cmd.exe again</para>
         </listitem>
         <listitem>
           <para>nmake -f Makefile.nmake all to build
@@ -434,8 +434,8 @@
           <superscript>1</superscript></para>
         </listitem>
         <listitem>
-          <para>If you've closed command.com in the meantime,
-          prepare command.com again</para>
+          <para>If you've closed cmd.exe in the meantime,
+          prepare cmd.exe again</para>
         </listitem>
         <listitem>
           <para>nmake -f Makefile.nmake packaging build Wireshark