the user's guide are describing 0.10.12 already, bump up version

update the Windows installation section to reflect the current installer changes

svn path=/trunk/; revision=15094

1 files changed, 77 insertions, 42 deletions

diff --git a/docbook/eug_src/EUG_chapter_build_install.xml b/docbook/eug_src/EUG_chapter_build_install.xml
index 69756c8bb9..ddbfc38103 100644
--- a/docbook/eug_src/EUG_chapter_build_install.xml
+++ b/docbook/eug_src/EUG_chapter_build_install.xml
@@ -441,9 +441,9 @@ apt-get install ethereal
     </para>
     <para>
 	  For further information how to build Ethereal for Windows from the 
-	  sources, have a look at the file 
-	  <ulink url="http://anonsvn.ethereal.com/ethereal/trunk/README.win32">Readme.win32</ulink>, 
-	  which can be found in the doc directory of the Ethereal sources.
+	  sources, have a look at the Development Wiki:
+	  <ulink url="http://wiki.ethereal.com/Development">http://wiki.ethereal.com/Development</ulink>
+	  for the latest available development documentation.
     </para>
   </section>
   
@@ -451,44 +451,38 @@ apt-get install ethereal
     <title>Installing Ethereal under Windows</title>
     <para>
       In this section we explore installing Ethereal under Windows from the 
-      binary packages.  You must follow two steps:
-      <orderedlist>
-	<listitem>
-	  <para>
-	    <command>Install WinPcap</command>. 
-		You will find a single installer exe called something 
-		like "auto-installer", which can be installed under various Windows 
-		systems, including 9x/Me/NT4.0/2000/XP. This installer is located at: 
-	    <ulink url="&WinPcapDownloadWebsite;">&WinPcapDownloadWebsite;</ulink>.
-	    You should download the latest released version (the latest one not 
-		marked "beta") and execute it. 
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    <command>Install Ethereal</command>. 
-		You may acquire a binary installable of Ethereal at 
+      binary packages.  
+	</para>
+  <section id="ChBuildInstallComponents">
+    <title>Ethereal Installer</title>
+	<para>
+		You may acquire a binary installer of Ethereal at 
 	    <ulink url="&EtherealBinariesPage;">&EtherealBinariesPage;</ulink>.  
-	    Download the installer and execute it.
-	  </para>
-	</listitem>
-      </orderedlist>
-	  Both steps are extremely simply, as you only have to download and 
-	  install the two exe files. 
+	</para>
+	<para>
+	    Simply download the installer and execute it.
+	</para>
+	<note><title>Note!</title>
+	<para>
+	Since Ethereal Version 0.10.12, the WinPcap installer has become part of 
+	the main Ethereal installer, so you don't need to download and install 
+	two separate packages any longer.
     </para>
+	</note>
+  </section>
   <section id="ChBuildInstallComponents">
-    <title>Installable Components</title>
+    <title>Ethereal Installer Settings</title>
     <para>
 	Beside the usual installer options like where to install the program, 
 	there are several optional components.
     </para>
     <tip><title>Tip!</title>
 	<para>
-	If you are unsure which components to select, just keep the default settings.
+	If you are unsure which settings to select, just keep the default settings.
     </para>
 	</tip>
     <para>
-	The components being installed 
+	The Components
 	(both Ethereal GTK1 and 2 cannot be installed at the same time):
 	<itemizedlist>
 	<listitem><para>
@@ -507,6 +501,28 @@ apt-get install ethereal
 	<command>Tethereal</command> - Tethereal is a command-line based network 
 	protocol analyzer.
 	</para></listitem>
+	</itemizedlist>
+	The dissection extensions for Ethereal and Tethereal:
+	<itemizedlist>
+	<listitem><para>
+	<command>Dissector Plugins</command> - Plugins with some extended dissections.
+	</para></listitem>
+	<listitem><para>
+	<command>Tree Statistics Plugins</command> - Plugins with some extended statistics.
+	</para></listitem>
+	<listitem><para>
+	<command>Mate - Meta Analysis and Tracing Engine</command> - user 
+	configurable extension(s) of the display filter engine, see 
+	<ulink url="http://wiki.ethereal.com/Mate">http://wiki.ethereal.com/Mate</ulink>
+	for details.
+	</para></listitem>
+	<listitem><para>
+	<command>SNMP MIBs</command> - SNMP MIBs for a more detailed SNMP 
+	dissection.
+	</para></listitem>
+	</itemizedlist>
+	The Tools:
+	<itemizedlist>
 	<listitem><para>
 	<command>Editcap</command> - Editcap is a program that reads a capture 
 	file and writes some or all of the packets into another capture file.
@@ -524,23 +540,17 @@ apt-get install ethereal
 	information on capture files.
 	</para></listitem>
 	</itemizedlist>
-	The dissection extensions for Ethereal and Tethereal:
+	The Additional Tasks:
 	<itemizedlist>
 	<listitem><para>
-	<command>Plugins</command> - Plugins with some extended dissections.
+	<command>Start Menu Shortcuts</command> - add some start menu shortcuts.
 	</para></listitem>
 	<listitem><para>
-	<command>SNMP MIBs</command> - SNMP MIBs for a more detailed SNMP 
-	dissection.
-	</para></listitem>
-	</itemizedlist>
-	The environment related things:
-	<itemizedlist>
-	<listitem><para>
-	<command>Start Menu Shortcuts</command> - Some start menu shortcuts.
+	<command>Desktop Icon</command> - add an Ethereal icon to the desktop.
 	</para></listitem>
 	<listitem><para>
-	<command>Desktop Icon</command> - Ethereal desktop icon.
+	<command>Quick Launch Icon</command> - add an Ethereal icon to the 
+	Explorer quick launch toolbar.
 	</para></listitem>
 	<listitem><para>
 	<command>Associate file extensions to Ethereal</command> - Associate 
@@ -549,6 +559,31 @@ apt-get install ethereal
 	</itemizedlist>
     </para>
   </section>
+  <section id="ChBuildInstallWinPcap">
+    <title>Install WinPcap</title>
+    <para>
+	As mentioned above, the Ethereal installer includes WinPcap. 
+    </para>
+    <para>
+	While running, the 
+	Ethereal installer detects which WinPcap version is currently 
+	running and will install WinPcap, if none or an older version is 
+	detected. So the following is only necessary if you want to 
+	try a different than the recommended WinPcap version, e.g. because a new 
+	WinPcap beta version was released.	
+    </para>
+    <para>
+	You will find a single installer exe called something 
+	like "auto-installer", which can be installed under various Windows 
+	systems, including 9x/Me/NT4.0/2000/XP. This installer is located at: 
+	<ulink url="&WinPcapDownloadWebsite;">&WinPcapDownloadWebsite;</ulink>.
+	</para>
+	<para>
+	Current information about the Ethereal related usage of WinPcap can be 
+	found at:
+	<ulink url="http://wiki.ethereal.com/WinPcap">http://wiki.ethereal.com/WinPcap</ulink>
+	</para>
+  </section>
   <section id="ChBuildInstallWinUpdate">
     <title>Update</title>
 	<para>
@@ -582,8 +617,8 @@ apt-get install ethereal
   <section id="ChBuildInstallWinUninstall">
     <title>Uninstall Ethereal</title>
     <para>
-	You can uninstall Ethereal the usual way, using the Software option 
-	inside the Control Panel. You will find two entries, one for Ethereal 
+	You can uninstall Ethereal the usual way, using the "Add or Remove Programs"
+	option inside the Control Panel. You will find two entries, one for Ethereal 
 	itself and one for WinPcap.
     </para>
   </section>