Propagate Gerald Combs' man page fix to document "<<" and ">>".

diff --git a/CREDITS b/CREDITS
index 19c3c67c717b30b693aa0c3a2d8b3321a7957484..1f1ae6e10126a91dbae662ebfbf9cc637739a855 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -36,6 +36,7 @@ Additional people who have contributed patches:
        Frank Volf                      <[email protected]>
        Fulvio Risso                    <[email protected]>
        George Bakos                    <[email protected]>
+       Gerald Combs                    <[email protected]>
        Gert Doering                    <[email protected]>
         Greg Stark                      <[email protected]>
        Gilbert Ramirez Jr.             <[email protected]>

diff --git a/tcpdump.1 b/tcpdump.1
index e94fdb8bd8961feca154eb6ccb671591cfe85ef6..b99f08ba3e4b135ae570ea93e626d519762bdf16 100644 (file)
--- a/tcpdump.1
+++ b/tcpdump.1
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/tcpdump/Attic/tcpdump.1,v 1.148.2.2 2003-11-19 01:58:58 guy Exp $ (LBL)
+.\" @(#) $Header: /tcpdump/master/tcpdump/Attic/tcpdump.1,v 1.148.2.3 2003-11-23 23:43:41 guy Exp $ (LBL)
 .\"
 .\"    $NetBSD: tcpdump.8,v 1.9 2003/03/31 00:18:17 perry Exp $
 .\"
@@ -22,7 +22,7 @@
 .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
-.TH TCPDUMP 1  "18 November 2003"
+.TH TCPDUMP 1  "23 November 2003"
 .SH NAME
 tcpdump \- dump traffic on a network
 .SH SYNOPSIS
@@ -1013,10 +1013,11 @@ True if the packet is an ATM packet, for SunATM on Solaris, and is
 on a meta signaling circuit and is a Q.2931 Setup, Call Proceeding, Connect,
 Release, or Release Done message.
 .IP  "\fIexpr relop expr\fR"
-True if the relation holds, where \fIrelop\fR is one of >, <, >=, <=, =, !=,
-and \fIexpr\fR is an arithmetic expression composed of integer constants
-(expressed in standard C syntax), the normal binary operators
-[+, -, *, /, &, |], a length operator, and special packet data accessors.
+True if the relation holds, where \fIrelop\fR is one of >, <, >=, <=, =,
+!=, and \fIexpr\fR is an arithmetic expression composed of integer
+constants (expressed in standard C syntax), the normal binary operators
+[+, -, *, /, &, |, <<, >>], a length operator, and special packet data
+accessors.
 To access
 data inside the packet, use the following syntax:
 .in +.5i