Lump TCPIPtrace and UCX$TRACE together and add TCPtrace to the mix.

svn path=/trunk/; revision=7700

1 files changed, 9 insertions, 9 deletions

diff --git a/doc/mergecap.pod b/doc/mergecap.pod
index c104558a37..d0f105c5d6 100644
--- a/doc/mergecap.pod
+++ b/doc/mergecap.pod
@@ -30,15 +30,15 @@ WAN/LAN analyzer, B<Lucent/Ascend> router debug output, HP-UX's
 B<nettl>, the dump output from B<Toshiba's> ISDN routers, the output
 from B<i4btrace> from the ISDN4BSD project, the output in B<IPLog>
 format from the Cisco Secure Intrusion Detection System, B<pppd logs>
-(pppdump format), the output from VMS's B<TCPIPtrace> and B<UCX$TRACE>
-utilities, the text output from the B<DBS Etherwatch> VMS utility,
-traffic capture files from Visual Networks' Visual UpTime, and the
-output from B<CoSine> L2 debug.  There is no need to tell B<Mergecap>
-what type of file you are reading; it will determine the file type by
-itself.  B<Mergecap> is also capable of reading any of these file
-formats if they are compressed using gzip.  B<Mergecap> recognizes this
-directly from the file; the '.gz' extension is not required for this
-purpose.
+(pppdump format), the output from VMS's
+B<TCPIPtrace>/B<TCPtrace>/B<UCX$TRACE> utilities, the text output from
+the B<DBS Etherwatch> VMS utility, traffic capture files from Visual
+Networks' Visual UpTime, and the output from B<CoSine> L2 debug.  There
+is no need to tell B<Mergecap> what type of file you are reading; it
+will determine the file type by itself.  B<Mergecap> is also capable of
+reading any of these file formats if they are compressed using gzip. 
+B<Mergecap> recognizes this directly from the file; the '.gz' extension
+is not required for this purpose.
 
 By default, it writes the capture file in B<libpcap> format, and writes
 all of the packets in both input capture files to the output file.  The