Bring the information up to date regarding versions and sample output.

svn path=/trunk/; revision=22113

6 files changed, 34 insertions, 23 deletions

diff --git a/docbook/user-guide.xml b/docbook/user-guide.xml
index e66d22eb63..0bd219cc82 100644
--- a/docbook/user-guide.xml
+++ b/docbook/user-guide.xml
@@ -73,7 +73,7 @@ DOCUMENT SECTION
 <!--
 Wireshark Info
 -->
-  <!ENTITY WiresharkCurrentVersion "0.99.5">
+  <!ENTITY WiresharkCurrentVersion "0.99.6">
   <!ENTITY WiresharkWebSite "http://www.wireshark.org">
   <!ENTITY WiresharkUsersGuidePage "&WiresharkWebSite;/docs/#usersguide">
   <!ENTITY WiresharkDownloadPage "&WiresharkWebSite;/download.html">
diff --git a/docbook/wsdg_src/WSDG_chapter_libraries.xml b/docbook/wsdg_src/WSDG_chapter_libraries.xml
index f591fff5a1..a230b678ac 100644
--- a/docbook/wsdg_src/WSDG_chapter_libraries.xml
+++ b/docbook/wsdg_src/WSDG_chapter_libraries.xml
@@ -151,7 +151,7 @@
 	WIRESHARK_LIBS library path (all the subdirs, e.g. 
 	<filename>c:\wireshark-win32-libs\gtk+</filename>), 
 	except for the zip files located at the toplevel, which are the files 
-	downloaded the last time(s). You could do this, be entering at the command line:
+	downloaded the last time(s). You could do this, by entering at the command line:
 	</para>
 	<para>
 	<prompt>&gt;</prompt> <userinput>nmake -f Makefile.nmake clean_setup</userinput>
diff --git a/docbook/wsug_src/WSUG_app_tools.xml b/docbook/wsug_src/WSUG_app_tools.xml
index 0d3d8786c0..1310bb424b 100644
--- a/docbook/wsug_src/WSUG_app_tools.xml
+++ b/docbook/wsug_src/WSUG_app_tools.xml
@@ -83,7 +83,7 @@ tcpdump -i &lt;interface> -s 1500 -w &lt;some-file>
     <example id="AppToolsdumpcapEx">
       <title>Help information available from dumpcap</title>
       <programlisting>
-Dumpcap 0.99.0
+Dumpcap 0.99.6
 Capture network packets and dump them into a libpcap file.
 See http://www.wireshark.org for more information.
 
@@ -135,6 +135,10 @@ Use Ctrl-C to stop capturing at any time.
       <title>Help information available from capinfos</title>
       <programlisting>
 $ capinfos -h
+Capinfos 0.99.6
+Prints information about capture files.
+See http://www.wireshark.org for more information.
+
 Usage: capinfos [-t] [-c] [-s] [-d] [-u] [-a] [-e] [-y]
                 [-i] [-z] [-h] &lt;capfile&gt;
   where -t display the capture type of &lt;capfile&gt;
@@ -171,8 +175,8 @@ Usage: capinfos [-t] [-c] [-s] [-d] [-u] [-a] [-e] [-y]
     <example id="AppToolseditcapEx">
       <title>Help information available from editcap</title>
       <programlisting>
-$ editcap.exe -h
-Editcap 0.99.3
+$ editcap -h
+Editcap 0.99.6
 Edit and/or translate the format of capture files.
 See http://www.wireshark.org for more information.
 
@@ -207,9 +211,9 @@ Miscellaneous:
   -h                     display this help and exit
   -v                     verbose output
 
-$ editcap.exe -F
-editcap.exe: option requires an argument -- F
-editcap.exe: The available capture file types for "F":
+$ editcap -F
+editcap: option requires an argument -- F
+editcap: The available capture file types for "F":
     libpcap - Wireshark/tcpdump/... - libpcap
     nseclibpcap - Wireshark - nanosecond libpcap
     modlibpcap - Modified tcpdump - libpcap
@@ -230,9 +234,9 @@ editcap.exe: The available capture file types for "F":
     rf5 - Tektronix K12xx 32-bit .rf5 format
     visual - Visual Networks traffic capture
 
-$ editcap.exe -F
-editcap.exe: option requires an argument -- T
-editcap.exe: The available encapsulation types for "T":
+$ editcap -T
+editcap: option requires an argument -- T
+editcap: The available encapsulation types for "T":
     ether - Ethernet
     tr - Token Ring
     slip - SLIP
@@ -483,8 +487,11 @@ editcap.exe: The available encapsulation types for "T":
     <example id="AppToolsmergecapEx">
       <title>Help information available from mergecap</title>
       <programlisting>
-$ mergecap.exe -h
-mergecap version 0.10.5
+$ mergecap -h
+Mergecap version 0.99.6
+Merge two or more capture files into one.
+See http://www.wireshark.org for more information.
+
 Usage: mergecap [-hva] [-s &lt;snaplen&gt;] [-T &lt;encap type&gt;]
           [-F &lt;capture type&gt;] -w &lt;outfile&gt; &lt;infile&gt; [...]
 
@@ -711,9 +718,12 @@ Usage: mergecap [-hva] [-s &lt;snaplen&gt;] [-T &lt;encap type&gt;]
     <example id="AppToolstext2pcapEx">
       <title>Help information available for text2pcap</title>
       <programlisting>
-$ text2pcap.exe -h
+$ text2pcap -h
+Text2pcap 0.99.6
+Generate a capture file from an ASCII hexdump of packets.
+See http://www.wireshark.org for more information.
 
-Usage: text2pcap.exe [-h] [-d] [-q] [-o h|o] [-l typenum] [-e l3pid] [-i proto]
+Usage: text2pcap [-h] [-d] [-q] [-o h|o] [-l typenum] [-e l3pid] [-i proto]
           [-m max-packet] [-u srcp,destp] [-T srcp,destp] [-s srcp,destp,tag]
           [-S srcp,destp,tag] [-t timefmt] &lt;input-filename&gt; &lt;output-filename&gt;
 
@@ -1052,7 +1062,7 @@ edit Makefile.nmake
 	    If it complains about being unable to find some modules
 	    (eg tempfile.py),
 	    you may want to check if PYTHONPATH is set correctly.
-	    On my Linux box, it is  PYTHONPATH=/usr/lib/python1.5/
+	    On my Linux box, it is  PYTHONPATH=/usr/lib/python2.4/
 	  </para>
 	</listitem>
       </orderedlist>
diff --git a/docbook/wsug_src/WSUG_chapter_advanced.xml b/docbook/wsug_src/WSUG_chapter_advanced.xml
index b2da34fb3a..fdca87b7df 100644
--- a/docbook/wsug_src/WSUG_chapter_advanced.xml
+++ b/docbook/wsug_src/WSUG_chapter_advanced.xml
@@ -813,7 +813,8 @@
 	</sidebar>
   <section><title>Wireshark checksum validation</title>
 	<para>
-	Wireshark will validate the checksums of several protocols, e.g.: IP, TCP, ...
+	Wireshark will validate the checksums of several protocols,
+	e.g.: IP, TCP, UDP, ...
 	</para>
 	<para>
 	It will do the same calculation as a "normal receiver" would do,
diff --git a/docbook/wsug_src/WSUG_chapter_build_install.xml b/docbook/wsug_src/WSUG_chapter_build_install.xml
index 066c4ccf6a..ab087ba2d1 100644
--- a/docbook/wsug_src/WSUG_chapter_build_install.xml
+++ b/docbook/wsug_src/WSUG_chapter_build_install.xml
@@ -234,13 +234,13 @@ rpm -ivh libpcap-0.4-19.i386.rpm
       </para>
     </note>
     <para> 
-      Under Debian you can install Wireshark using apt-get.  apt-get will
+      Under Debian you can install Wireshark using aptitude.  aptitude will
       handle any dependency issues for you. <xref linkend="Ch02Ex5"/> shows 
 	how to do this.
 	<example id="Ch02Ex5">
 	  <title>Installing debs under Debian</title>
 	  <programlisting>
-apt-get install wireshark-dev
+aptitude install wireshark-dev
 	  </programlisting>
 	</example>
     </para>
@@ -363,9 +363,9 @@ rpm -ivh wireshark-&WiresharkCurrentVersion;.i386.rpm
     <para> 
       Use the following command to install Wireshark under Debian:
       <programlisting>
-apt-get install wireshark
+aptitude install wireshark
       </programlisting>
-      apt-get should take care of all of the dependency issues for you.
+      aptitude should take care of all of the dependency issues for you.
     </para>
   </section>
 
@@ -711,7 +711,7 @@ wireshark-setup-&WiresharkCurrentVersion;.exe /NCRC /S /desktopicon=yes
 	linkend="ChIntroMailingLists"/> for details how to subscribe to this list.
     </para>
     <para>
-	New versions of Wireshark usually become available every 8-12 weeks.
+	New versions of Wireshark usually become available every 4 to 8 months.
 	Updating Wireshark is done the same way as installing it, you simply 
 	download and start the installer exe. A reboot is usually not required and
 	all your personal settings remain unchanged.
diff --git a/docbook/wsug_src/WSUG_chapter_introduction.xml b/docbook/wsug_src/WSUG_chapter_introduction.xml
index be57d7386b..9193118b68 100644
--- a/docbook/wsug_src/WSUG_chapter_introduction.xml
+++ b/docbook/wsug_src/WSUG_chapter_introduction.xml
@@ -321,7 +321,7 @@
       downloading.
     </para>
     <para>
-	A new Wireshark version will typically become available every 4-8 weeks.
+	A new Wireshark version will typically become available every 4-8 months.
     </para>
     <para>
 	If you want to be notified about new Wireshark releases, you should