Coalesce "-G fields2" and "-G fields3" into "-G fields", as discussed on -dev.

See: http://www.wireshark.org/lists/wireshark-dev/201304/msg00015.html

svn path=/trunk/; revision=48753

1 files changed, 7 insertions, 15 deletions

diff --git a/doc/tshark.pod b/doc/tshark.pod
index 8c3f314e3c..28061cd759 100644
--- a/doc/tshark.pod
+++ b/doc/tshark.pod
@@ -52,7 +52,7 @@ S<[ B<-z> E<lt>statisticsE<gt> ]>
 S<[ E<lt>capture filterE<gt> ]>
 
 B<tshark>
-B<-G> [fields|fields2|fields3|protocols|values|decodes|defaultprefs|currentprefs]
+B<-G> [fields|protocols|values|decodes|defaultprefs|currentprefs]
 
 =head1 DESCRIPTION
 
@@ -353,7 +353,7 @@ This option causes the output file(s) to be created with group-read permission
 (meaning that the output file(s) can be read by other members of the calling
 user's group).
 
-=item -G  [fields|fields2|fields3|protocols|values|decodes|defaultprefs|currentprefs]
+=item -G  [fields|protocols|values|decodes|defaultprefs|currentprefs]
 
 The B<-G> option will cause B<Tshark> to dump one of several types of glossaries
 and then exit.  If no specific glossary type is specified, then the B<fields> report will be generated by default.
@@ -379,17 +379,9 @@ The fields are tab-delimited.
  * Field 3 = field abbreviation
  * Field 4 = type ( textual representation of the ftenum type )
  * Field 5 = parent protocol abbreviation
- * Field 6 = blurb describing field
-
-B<fields2>  Same as the B<fields> report but includes two additional columns.
-
- * Field 7 = base for display (for integer types); "parent bitfield width" for FT_BOOLEAN
- * Field 8 = blurb describing field (yes, apparently we repeated this accidentally)
-
-B<fields3>  Same as the B<fields> report but includes two additional columns.
-
- * Field 7 = base for display (for integer types); "parent bitfield width" for FT_BOOLEAN
- * Field 8 = bitmask: format: hex: 0x....
+ * Field 6 = base for display (for integer types); "parent bitfield width" for FT_BOOLEAN
+ * Field 7 = bitmask: format: hex: 0x....
+ * Field 8 = blurb describing field
 
 B<protocols> Dumps the protocols in the registration database to stdout.
 An independent program can take this output and format it into nice tables
@@ -632,9 +624,9 @@ applied.
 Cause the specified filter (which uses the syntax of read/display filters,
 rather than that of capture filters) to be applied before printing a
 decoded form of packets or writing packets to a file.  Packets matching the
-filter are printed or written to file; packets that the matching packets 
+filter are printed or written to file; packets that the matching packets
 depend upon (e.g., fragments), are not printed but are written to file;
-packets not matching the filter nor depended upon are discarded rather 
+packets not matching the filter nor depended upon are discarded rather
 than being printed or written.
 
 Use this instead of -R for filtering using single-pass analysis. If doing