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

svn path=/trunk/; revision=7700

4 files changed, 35 insertions, 34 deletions

diff --git a/doc/editcap.pod b/doc/editcap.pod
index a3cbf5ffa9..ef140b1022 100644
--- a/doc/editcap.pod
+++ b/doc/editcap.pod
@@ -33,14 +33,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<Editcap> what type
-of file you are reading; it will determine the file type by itself. 
-B<Editcap> is also capable of reading any of these file formats if they
-are compressed using gzip.  B<Editcap> 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<Editcap> what type of file you are reading; it will
+determine the file type by itself.  B<Editcap> is also capable of
+reading any of these file formats if they are compressed using gzip. 
+B<Editcap> 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 the capture file to the output file.  The B<-F>
diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index cf1eed198a..a3e5ad889c 100644
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -49,15 +49,15 @@ B<RADCOM>'s 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<Ethereal> what type of file you are reading; it will determine the
-file type by itself.  B<Ethereal> is also capable of reading any of
-these file formats if they are compressed using gzip.  B<Ethereal>
-recognizes this directly from the file; the '.gz' extension is not
-required for this purpose.
+logs> (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<Ethereal> what type of file you are reading; it
+will determine the file type by itself.  B<Ethereal> is also capable of
+reading any of these file formats if they are compressed using gzip. 
+B<Ethereal> recognizes this directly from the file; the '.gz' extension
+is not required for this purpose.
 
 Like other protocol analyzers, B<Ethereal>'s main window shows 3 views
 of a packet.  It shows a summary line, briefly describing what the
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
diff --git a/doc/tethereal.pod.template b/doc/tethereal.pod.template
index a8384aba08..f8125d85d6 100644
--- a/doc/tethereal.pod.template
+++ b/doc/tethereal.pod.template
@@ -50,14 +50,14 @@ 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<Tethereal> what type of file you are reading;
-it will determine the file type by itself.  B<Tethereal> is also capable
-of reading any of these file formats if they are compressed using gzip. 
-B<Tethereal> recognizes this directly from the file; the '.gz' extension
-is not required for this purpose.
+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<Tethereal> what type of file you are
+reading; it will determine the file type by itself.  B<Tethereal> is
+also capable of reading any of these file formats if they are compressed
+using gzip.  B<Tethereal> recognizes this directly from the file; the
+'.gz' extension is not required for this purpose.
 
 If the B<-w> flag is not specified, B<Tethereal> prints a decoded form
 of the packets it captures or reads; otherwise, it writes those packets