From: guy <guy>
Date: Thu, 13 Jul 2000 06:24:14 +0000 (+0000)
Subject: Merge in changes from the libpcap 0.5 branch:
X-Git-Tag: libpcap-0.6.1~120
X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/e7039d24f44345c2a34ef208e85231003c17a425

Merge in changes from the libpcap 0.5 branch:

	Update to note that non-patch mail should be sent to
	"tcpdump-workers@tcpdump.org", and that patches should be sent to
	"patches@tcpdump.org".
---

diff --git a/README b/README
index 3a9cf8c4..c9be6b54 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-@(#) $Header: /tcpdump/master/libpcap/README,v 1.21 2000-06-16 17:50:17 mcr Exp $ (LBL)
+@(#) $Header: /tcpdump/master/libpcap/README,v 1.22 2000-07-13 06:24:14 guy Exp $ (LBL)
 
 LIBPCAP 0.5
 Now maintained by "The Tcpdump Group"
@@ -54,7 +54,12 @@ to Ultrix using the kernel source and/or object patches available in:
 
 	ftp://gatekeeper.dec.com/pub/DEC/net/bpfext42.tar.Z.
 
-Problems, bugs, questions, desirable enhancements, source code
-contributions, etc., should be sent to the email address
-"tcpdump-workers@tcpdump.org".
+Problems, bugs, questions, desirable enhancements, etc. 
+should be sent to the address "tcpdump-workers@tcpdump.org".
 
+Source code contributions, etc. should be sent to the email address 
+"patches@tcpdump.org".
+
+Current versions can be found at www.tcpdump.org
+
+ - The TCPdump team
diff --git a/pcap.3 b/pcap.3
index 24fd0b0f..b07dcb06 100644
--- a/pcap.3
+++ b/pcap.3
@@ -361,10 +361,20 @@ Craig Leres and
 Steven McCanne, all of the
 Lawrence Berkeley National Laboratory, University of California, Berkeley, CA.
 .LP
-It is currently being maintained by tcpdump.org.
+The current version is available from "The Tcpdump Group"'s Web site at
 .LP
 .RS
 .I http://www.tcpdump.org/
 .RE
 .SH BUGS
-Please send bug reports to tcpdump-workers@tcpdump.org.
+Please send problems, bugs, questions, desirable enhancements, etc. to:
+.LP
+.RS
+tcpdump-workers@tcpdump.org
+.RE
+.LP
+Please send source code contributions, etc. to:
+.LP
+.RS
+patches@tcpdump.org
+.RE