From 0d337768a7f6c9664dd8cf04d401fbadf25bd161 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 11 Dec 2009 02:31:47 +0000 Subject: Split "willcollect" into its two component words. Document "-z conv,ipv6" for Wireshark. Rewrite the descriptions of the "-z conv,{type}" options a bit. svn path=/trunk/; revision=31233 --- doc/tshark.pod | 24 ++++++++++++------------ doc/wireshark.pod.template | 17 +++++++++-------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/doc/tshark.pod b/doc/tshark.pod index 2cd26e3762..956cf14efd 100644 --- a/doc/tshark.pod +++ b/doc/tshark.pod @@ -532,8 +532,8 @@ Example: S> will colle If the optional I is provided, the stats will only be calculated on those calls that match that filter. -Example: S> willcollect SAMR -RTT statistics for a specific host. +Example: S> +will collect SAMR RTT statistics for a specific host. This option can be used multiple times on the command line. @@ -618,27 +618,27 @@ time and average response time. =item B<-z> conv,I[,I] -Create a table that lists all conversations that could be seen in the capture. -I specifies which type of conversation we want to generate the -statistics for; currently the supported ones are +Create a table that lists all conversations that could be seen in the +capture. I specifies the conversation endpoint types for which we +want to generate the statistics; currently the supported ones are: - "eth" Ethernet - "fc" Fibre Channel - "fddi" FDDI + "eth" Ethernet addresses + "fc" Fibre Channel addresses + "fddi" FDDI addresses "ip" IPv4 addresses "ipv6" IPv6 addresses "ipx" IPX addresses "tcp" TCP/IP socket pairs Both IPv4 and IPv6 are supported - "tr" Token Ring + "tr" Token Ring addresses "udp" UDP/IP socket pairs Both IPv4 and IPv6 are supported If the optional I is specified, only those packets that match the filter will be used in the calculations. The table is presented with one line for each conversation and displays -number of packets/bytes in each direction as well as total number of -packets/bytes. -The table is sorted according to total number of bytes. +the number of packets/bytes in each direction as well as the total +number of packets/bytes. The table is sorted according to the total +number of bytes. =item B<-z> proto,colinfo,I,I diff --git a/doc/wireshark.pod.template b/doc/wireshark.pod.template index 98193f910d..f6c6b436f6 100644 --- a/doc/wireshark.pod.template +++ b/doc/wireshark.pod.template @@ -683,25 +683,26 @@ MEGACO packets exchanged by the host at IP address 1.2.3.4 . =item B<-z> conv,I[,I] Create a table that lists all conversations that could be seen in the -capture. I specifies for which type of conversation we want to -generate the statistics; currently the supported ones are: +capture. I specifies the conversation endpoint types for which we +want to generate the statistics; currently the supported ones are: - "eth" Ethernet + "eth" Ethernet addresses "fc" Fibre Channel addresses "fddi" FDDI addresses - "ip" IP addresses + "ip" IPv4 addresses + "ipv6" IPv6 addresses "ipx" IPX addresses "tcp" TCP/IP socket pairs Both IPv4 and IPv6 are supported - "tr" TokenRing + "tr" Token Ring addresses "udp" UDP/IP socket pairs Both IPv4 and IPv6 are supported If the optional I is specified, only those packets that match the filter will be used in the calculations. The table is presented with one line for each conversation and displays -the number of packets/bytes in each direction as well as total number of -packets/bytes. By default, the table is sorted according to total number -of packets. +the number of packets/bytes in each direction as well as the total +number of packets/bytes. By default, the table is sorted according to +the total number of packets. These tables can also be generated at runtime by selecting the appropriate conversation type from the menu "Tools/Statistics/Conversation List/". -- cgit v1.2.3