Make the introductory section of the README file use the same style as

the introductory README section of the libpcap README file, giving
information about anonymous CVS and other additional information.

Update to note that non-patch mail should be sent to
"[email protected]", and that patches should be sent to
"[email protected]".

Merge in changes from the tcpdump 3.5 branch:

	"\f(CW" doesn't work on all systems - which appears to cause a
	subsequent "\fP" to revert to the font from which *roff last
	switched, which is often an italic or boldface font.  Use "\fR"
	instead of "\fP" to undo a "\f(CW".

and other changes not in the main line.

diff --git a/README b/README
index 150967324b7a0558ac9dfa3f369c19eaf1ec57e7..eee938ba1274169a98f2aeda2f7b18ba0fd29bbd 100644 (file)
--- a/README
+++ b/README
@@ -1,9 +1,24 @@
-@(#) $Header: /tcpdump/master/tcpdump/README,v 1.55 2000-01-28 00:10:22 fenner Exp $ (LBL)
+@(#) $Header: /tcpdump/master/tcpdump/README,v 1.56 2000-07-13 06:36:57 guy Exp $ (LBL)
 
 TCPDUMP 3.5
-tcpdump.org
[email protected]
-http://www.tcpdump.org/
+Now maintained by "The Tcpdump Group"
+See            www.tcpdump.org
+
+Please send inquiries/comments/reports to      [email protected]
+
+Anonymous CVS is available via:
+       cvs -d cvs.tcpdump.org:/tcpdump/master login
+       (password "anoncvs")
+       cvs -d cvs.tcpdump.org:/tcpdump/master checkout tcpdump
+
+Version 3.5 of TCPDUMP can be retrived with the CVS tag "tcpdump_3_5":
+       cvs -d cvs.tcpdump.org:/tcpdump/master checkout -r tcpdump_3_5 tcpdump
+
+Please send patches against the master copy to [email protected].
+
+formerly from  Lawrence Berkeley National Laboratory
+               Network Research Group <[email protected]>
+               ftp://ftp.ee.lbl.gov/tcpdump.tar.Z
 
 This directory contains source code for tcpdump, a tool for network
 monitoring and data acquisition.  This software was originally
@@ -51,9 +66,17 @@ It is a program that can be used to extract portions of tcpdump binary
 trace files. See the above distribution for further details and
 documentation.
 
-Problems, bugs, questions, desirable enhancements, source code
-contributions, etc., should be sent to the email address
-"[email protected]".
+Problems, bugs, questions, desirable enhancements, etc. 
+should be sent to the address "[email protected]".
+
+Source code contributions, etc. should be sent to the email address 
+"[email protected]".
+
+Current versions can be found at www.tcpdump.org
+
+ - The TCPdump team
+
+original text by: Steve McCanne, Craig Leres, Van Jacobson
 
 -------------------------------------
 This directory also contains some short awk programs intended as
@@ -203,4 +226,3 @@ The method was:
   - Once a week, tell your funding agent that you're discovering
     wonderful things and you'll write up that research report
     "real soon now".
-

diff --git a/tcpdump.1 b/tcpdump.1
index a66f7a56cd475e110a2b1591c1da014d2bc99742..e41269b1edf038d8a33e5b2970d9d1b7b902b8bf 100644 (file)
--- a/tcpdump.1
+++ b/tcpdump.1
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/tcpdump/Attic/tcpdump.1,v 1.80 2000-06-12 06:50:50 assar Exp $ (LBL)
+.\" @(#) $Header: /tcpdump/master/tcpdump/Attic/tcpdump.1,v 1.81 2000-07-13 06:36:58 guy Exp $ (LBL)
 .\"
 .\" Copyright (c) 1987, 1988, 1989, 1990, 1991, 1992, 1994, 1995, 1996, 1997
 .\"    The Regents of the University of California.  All rights reserved.
@@ -795,7 +795,7 @@ host \fIrtsg\fP to host \fIcsam\fP:
 .nf
 .sp .5
 \f(CWarp who-has csam tell rtsg
-arp reply csam is-at CSAM\fP
+arp reply csam is-at CSAM\fR
 .sp .5
 .fi
 .RE
@@ -819,7 +819,7 @@ broadcast and the second is point-to-point would be visible:
 .nf
 .sp .5
 \f(CWRTSG Broadcast 0806  64: arp who-has csam tell rtsg
-CSAM RTSG 0806  64: arp reply csam is-at CSAM\fP
+CSAM RTSG 0806  64: arp reply csam is-at CSAM\fR
 .sp .5
 .fi
 .RE
@@ -871,7 +871,7 @@ csam.login > rtsg.1023: . ack 2 win 4096
 rtsg.1023 > csam.login: P 2:21(19) ack 1 win 4096
 csam.login > rtsg.1023: P 1:2(1) ack 21 win 4077
 csam.login > rtsg.1023: P 2:3(1) ack 21 win 4077 urg 1
-csam.login > rtsg.1023: P 3:4(1) ack 21 win 4077 urg 1\fP\s+2
+csam.login > rtsg.1023: P 3:4(1) ack 21 win 4077 urg 1\fR\s+2
 .sp .5
 .fi
 .RE
@@ -1139,7 +1139,7 @@ Name server requests are formatted as
 .sp .5
 \fIsrc > dst: id op? flags qtype qclass name (len)\fP
 .sp .5
-\f(CWh2opolo.1538 > helios.domain: 3+ A? ucbvax.berkeley.edu. (37)\fP
+\f(CWh2opolo.1538 > helios.domain: 3+ A? ucbvax.berkeley.edu. (37)\fR
 .sp .5
 .fi
 .RE
@@ -1176,7 +1176,7 @@ Name server responses are formatted as
 \fIsrc > dst:  id op rcode flags a/n/au type class data (len)\fP
 .sp .5
 \f(CWhelios.domain > h2opolo.1538: 3 3/3/7 A 128.32.137.3 (273)
-helios.domain > h2opolo.1537: 2 NXDomain* 0/1/0 (97)\fP
+helios.domain > h2opolo.1537: 2 NXDomain* 0/1/0 (97)\fR
 .sp .5
 .fi
 .RE
@@ -1242,7 +1242,7 @@ sushi.201b > wrl.nfs:
        144 lookup fh 9,74/4096.6878 "xcolors"
 wrl.nfs > sushi.201b:
        reply ok 128 lookup fh 9,74/4134.3150
-\fP
+\fR
 .sp .5
 .fi
 .RE
@@ -1299,7 +1299,7 @@ NFS reply packets do not explicitly identify the RPC operation.  Instead,
 replies using the transaction ID.  If a reply does not closely follow the
 corresponding request, it might not be parsable.
 .HD
-AFS Request and Replies
+AFS Requests and Replies
 .LP
 Transarc AFS (Andrew File System) requests and replies are printed
 as:
@@ -1316,7 +1316,7 @@ elvis.7001 > pike.afsfs:
        rx data fs call rename old fid 536876964/1/1 ".newsrc.new"
        new fid 536876964/1/1 ".newsrc"
 pike.afsfs > elvis.7001: rx data fs reply rename
-\fP
+\fR
 .sp .5
 .fi
 .RE
@@ -1339,11 +1339,12 @@ AFS and RX.
 If the -v (verbose) flag is given, the RX call number and sequence number
 are printed.
 .LP
-If the -v flag is given twice, additional information is printed.
+If the -v flag is given twice, additional information is printed,
 such as the the RX call ID, serial number, and the RX packet flags.
 The MTU negotiation information is also printed from RX ack packets.
 .LP
-If the -v flag three times, the security index and service id are printed.
+If the -v flag is given three times, the security index and service id
+are printed.
 .LP
 Error codes are printed for abort packets, with the exception of Ubik
 beacon packets (because abort packets are used to signify a yes vote
@@ -1375,7 +1376,7 @@ Lines in this file have the form
 
 \f(CW1.254             ether
 16.1           icsd-net
-1.254.110      ace\fP
+1.254.110      ace\fR
 .sp .5
 .fi
 .RE
@@ -1398,7 +1399,7 @@ Appletalk addresses are printed in the form
 
 \f(CW144.1.209.2 > icsd-net.112.220
 office.2 > icsd-net.112.220
-jssmag.149.235 > icsd-net.2\fP
+jssmag.149.235 > icsd-net.2\fR
 .sp .5
 .fi
 .RE
@@ -1426,7 +1427,7 @@ protocol) and packet size.
 .sp .5
 \s-2\f(CWicsd-net.112.220 > jssmag.2: nbp-lkup 190: "=:LaserWriter@*"
 jssmag.209.2 > icsd-net.112.220: nbp-reply 190: "RM1140:LaserWriter@*" 250
-techpit.2 > icsd-net.112.220: nbp-reply 190: "techpit:LaserWriter@*" 186\fP\s+2
+techpit.2 > icsd-net.112.220: nbp-reply 190: "techpit:LaserWriter@*" 186\fR\s+2
 .sp .5
 .fi
 .RE
@@ -1455,7 +1456,7 @@ jssmag.209.165 > helios.132: atp-req  12266<3,5> 0xae030001
 helios.132 > jssmag.209.165: atp-resp 12266:3 (512) 0xae040000
 helios.132 > jssmag.209.165: atp-resp 12266:5 (512) 0xae040000
 jssmag.209.165 > helios.132: atp-rel  12266<0-7> 0xae030001
-jssmag.209.133 > helios.132: atp-req* 12267<0-7> 0xae030002\fP\s+2
+jssmag.209.133 > helios.132: atp-req* 12267<0-7> 0xae030002\fR\s+2
 .sp .5
 .fi
 .RE
@@ -1563,13 +1564,18 @@ The original distribution is available via anonymous ftp:
 IPv6/IPsec support is added by WIDE/KAME project.
 This program uses Eric Young's SSLeay library, under specific configuration.
 .SH BUGS
-Please send problems, bugs, questions, desirable enhancements, source
-code contributions, etc. to:
+Please send problems, bugs, questions, desirable enhancements, etc. to:
 .LP
 .RS
 [email protected]
 .RE
 .LP
+Please send source code contributions, etc. to:
+.LP
+.RS
[email protected]
+.RE
+.LP
 NIT doesn't let you watch your own outbound traffic, BPF will.
 We recommend that you use the latter.
 .LP