From: guy <guy>
Date: Wed, 23 Nov 2005 05:16:51 +0000 (+0000)
Subject: Make it clearer that the hex or hex-and-ASCII dump for "-x", "-xx",
X-Git-Tag: tcpdump-3.9.6~45
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/dbd0cbc147d140e9bd34eefa7b66a17f691d49e0

Make it clearer that the hex or hex-and-ASCII dump for "-x", "-xx",
"-X", and "-XX" doesn't *replace* the dissected dump, it *augments* it.
---

diff --git a/tcpdump.1 b/tcpdump.1
index 6601b451..0eca2191 100644
--- a/tcpdump.1
+++ b/tcpdump.1
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/tcpdump/Attic/tcpdump.1,v 1.167.2.7 2005-11-23 04:15:40 guy Exp $ (LBL)
+.\" @(#) $Header: /tcpdump/master/tcpdump/Attic/tcpdump.1,v 1.167.2.8 2005-11-23 05:16:51 guy Exp $ (LBL)
 .\"
 .\"	$NetBSD: tcpdump.8,v 1.9 2003/03/31 00:18:17 perry Exp $
 .\"
@@ -545,7 +545,9 @@ the files with enough leading 0s to support the maximum number of
 files, allowing them to sort correctly.
 .TP
 .B \-x
-Print each packet (minus its link level header) in hex.
+When parsing and printing,
+in addition to printing the headers of each packet, print the data of
+each packet (minus its link level header) in hex. 
 The smaller of the entire packet or
 .I snaplen
 bytes will be printed.  Note that this is the entire link-layer
@@ -554,16 +556,22 @@ will also be printed when the higher layer packet is shorter than the
 required padding.
 .TP
 .B \-xx
-Print each packet,
+When parsing and printing,
+in addition to printing the headers of each packet, print the data of
+each packet,
 .I including
 its link level header, in hex.
 .TP
 .B \-X
-Print each packet (minus its link level header) in hex and ASCII.
+When parsing and printing,
+in addition to printing the headers of each packet, print the data of
+each packet (minus its link level header) in hex and ASCII.
 This is very handy for analysing new protocols.
 .TP
 .B \-XX
-Print each packet,
+When parsing and printing,
+in addition to printing the headers of each packet, print the data of
+each packet,
 .I including
 its link level header, in hex and ASCII.
 .TP