From 4c19d29b7ca86d666b5168e0612c6b3374bb8d1b Mon Sep 17 00:00:00 2001
From: Chris Maynard <Christopher.Maynard@GTECH.COM>
Date: Wed, 11 Dec 2013 16:52:40 +0000
Subject: Improve tshark command-line error help.  Fixes
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9548 and adds addtional
 help, better formatting, sorting and some minimal documentation of the -u
 option to the tshark man page.

svn path=/trunk/; revision=53938
---
 doc/tshark.pod | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

(limited to 'doc/tshark.pod')

diff --git a/doc/tshark.pod b/doc/tshark.pod
index 15723ea219..4d5b5ed4af 100644
--- a/doc/tshark.pod
+++ b/doc/tshark.pod
@@ -39,7 +39,8 @@ S<[ B<-R> E<lt>Read filterE<gt> ]>
 S<[ B<-s> E<lt>capture snaplenE<gt> ]>
 S<[ B<-S> E<lt>separatorE<gt> ]>
 S<[ B<-t> a|ad|adoy|d|dd|e|r|u|ud|udoy ]>
-S<[ B<-T> pdml|psml|ps|text|fields ]>
+S<[ B<-T> fields|pdml|ps|psml|text ]>
+S<[ B<-u> E<lt>seconds typeE<gt>]>
 S<[ B<-v> ]>
 S<[ B<-V> ]>
 S<[ B<-w> E<lt>outfileE<gt>|- ]>
@@ -560,6 +561,8 @@ are turned on.
 
 The argument is a string that may contain the letters:
 
+B<C> to enable concurrent (asynchronous) DNS lookups
+
 B<m> to enable MAC address resolution
 
 B<n> to enable network address resolution
@@ -569,8 +572,6 @@ resolution
 
 B<t> to enable transport-layer port number resolution
 
-B<C> to enable concurrent (asynchronous) DNS lookups
-
 =item -o  E<lt>preferenceE<gt>:E<lt>valueE<gt>
 
 Set a preference value, overriding the default value and any value read
@@ -704,35 +705,42 @@ was captured
 
 The default format is relative.
 
-=item -T  pdml|psml|ps|text|fields
+=item -T  fields|pdml|ps|psml|text
 
 Set the format of the output when viewing decoded packet data.  The
 options are one of:
 
+B<fields> The values of fields specified with the B<-e> option, in a
+form specified by the B<-E> option.  For example,
+
+  -T fields -E separator=, -E quote=d
+
+would generate comma-separated values (CSV) output suitable for importing
+into your favorite spreadsheet program.
+
 B<pdml> Packet Details Markup Language, an XML-based format for the details of
 a decoded packet.  This information is equivalent to the packet details
 printed with the B<-V> flag.
 
-B<psml> Packet Summary Markup Language, an XML-based format for the summary
-information of a decoded packet.  This information is equivalent to the
-information shown in the one-line summary printed by default.
-
 B<ps> PostScript for a human-readable one-line summary of each of the packets,
 or a multi-line view of the details of each of the packets, depending on
 whether the B<-V> flag was specified.
 
+B<psml> Packet Summary Markup Language, an XML-based format for the summary
+information of a decoded packet.  This information is equivalent to the
+information shown in the one-line summary printed by default.
+
 B<text> Text of a human-readable one-line summary of each of the packets, or a
 multi-line view of the details of each of the packets, depending on
 whether the B<-V> flag was specified.  This is the default.
 
-B<fields> The values of fields specified with the B<-e> option, in a
-form specified by the B<-E> option.  For example,
+=item -u E<lt>seconds typeE<gt>
 
-  -T fields -E separator=, -E quote=d
+Specifies the seconds type.  Valid choices are:
 
-would generate comma-separated values (CSV) output suitable for importing
-into your favorite spreadsheet program.
+B<s> for seconds
 
+B<hms> for hours, minutes and seconds
 
 =item -v
 
-- 
cgit v1.2.3