Warren Young's patch to add a "Print" button to the "Follow TCP Stream"

data window.

Some (belated) man page updates.

svn path=/trunk/; revision=950

1 files changed, 22 insertions, 12 deletions

diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index 9ee9c7cbd4..6ffd658131 100644
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -47,11 +47,13 @@ shows a summary line, briefly describing what the packet is. A protocol tree is
 you to drill down to exact protocol or field that you interested in. Finally, a hex dump
 shows you exactly what the packet looks like when it goes over the wire.
 
-In addition, B<Ethereal> has some features that make it unique. It can assemble all
-the packets in a TCP conversation and show you the ASCII data in that conversation. Display
-filters in B<Ethereal> are very powerful; more fields are filterable in Ethereal than in other
-protocol analyzers, and the syntax you can use to create your filters is richer. As Ethereal
-progresses, expect more and more protocol fields to be allowed in display filters.
+In addition, B<Ethereal> has some features that make it unique.  It can
+assemble all the packets in a TCP conversation and show you the ASCII
+(or EBCDIC) data in that conversation.  Display filters in B<Ethereal>
+are very powerful; more fields are filterable in Ethereal than in other
+protocol analyzers, and the syntax you can use to create your filters is
+richer.  As Ethereal progresses, expect more and more protocol fields to
+be allowed in display filters.
 
 Packet capturing is performed with the pcap library. The capture filter syntax follows
 the rules of the pcap library. This syntax is different from the display filter syntax.
@@ -93,7 +95,8 @@ should match one of the names listed in "B<netstat -i>" or "B<ifconfig -a>".
 =item -k
 
 Starts the capture session immediately; this option requires 
-the B<-i> and B<-w> parameters.
+the B<-i> parameter, specifying the interface on which the capture
+should be done.
 
 =item -m
 
@@ -237,12 +240,18 @@ Expands all branches of the protocol tree.
 
 =item Tools:Follow TCP Stream
 
-If you have a TCP packet selected, it will display the contents of the TCP
-data stream in a separate window. This has the side-effect of leaving
-the list of packets in a filtered state; only those packets that make up
-the TCP stream are shown. You can revert to your old view by pressing
-ENTER in the display filter text box, thereby invoking your old
-display filter (or resetting it back to no display filter).
+If you have a TCP packet selected, it will display the contents of the
+data stream for the TCP connection to which that packet belongs, as
+text, in a separate window, and will leave the list of packets in a
+filtered state, with only those packets that are part of that TCP
+connection being displayed.  You can revert to your old view by pressing
+ENTER in the display filter text box, thereby invoking your old display
+filter (or resetting it back to no display filter).
+
+The window in which the data stream is displayed lets you select whether
+the data being displayed is to be treated as ASCII or EBCDIC text, and
+lets you print the text, using the same print options that are used for
+the I<File:Print Packet> menu item.
 
 =back
 
@@ -623,6 +632,7 @@ B<http://ethereal.zing.org>.
   Tomislav Vujec           <tvujec@carnet.hr>
   Kojak                    <kojak@bigwig.net>
   Uwe Girlich              <Uwe.Girlich@philosys.de>
+  Warren Young             <tangent@mail.com>
 
 Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to give his
 permission to use his version of snprintf.c.