summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorChris Maynard <Christopher.Maynard@GTECH.COM>2013-03-21 17:30:35 +0000
committerChris Maynard <Christopher.Maynard@GTECH.COM>2013-03-21 17:30:35 +0000
commit63b578b1825616ca76d6ebfe5d502d8dd655d95c (patch)
tree6ae2bd13b43dc7226a7d953cd9058c0f1ec5996b /doc
parent1b6ff3edc5b30944166773b93800e8fd79fc36c2 (diff)
downloadwireshark-63b578b1825616ca76d6ebfe5d502d8dd655d95c.tar.gz
Updated tshark man page and release notes to document the change in '-x' behavior with r45715.
svn path=/trunk/; revision=48456
Diffstat (limited to 'doc')
-rw-r--r--doc/tshark.pod9
1 files changed, 4 insertions, 5 deletions
diff --git a/doc/tshark.pod b/doc/tshark.pod
index 24d62c6f41..1a8c1c1036 100644
--- a/doc/tshark.pod
+++ b/doc/tshark.pod
@@ -580,8 +580,8 @@ promiscuous mode.
=item -P
-Decode and display packets even while writing raw packet data using the
-B<-w> option.
+Decode and display the packet summary, even if writing raw packet data using
+the B<-w> option.
=item -q
@@ -696,8 +696,7 @@ Print the version and exit.
=item -V
-Cause B<TShark> to print a view of the packet details rather
-than a one-line summary of the packet.
+Cause B<TShark> to print a view of the packet details.
=item -w E<lt>outfileE<gt> | -
@@ -727,7 +726,7 @@ B<n> write network address resolution information (pcapng only)
=item -x
Cause B<TShark> to print a hex and ASCII dump of the packet data
-after printing the summary or details.
+after printing the summary and/or details, if either are also being displayed.
=item -X E<lt>eXtension optionsE<gt>