summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2011-10-26 04:53:48 +0000
committerGuy Harris <guy@alum.mit.edu>2011-10-26 04:53:48 +0000
commit7068d5df0af8700440845b403cb21a000c92abf2 (patch)
treea5c58519262cac3f3c184e7800a7d3fc8211df70 /doc
parent986c31ef880c2102ffc9937313acdaa0f059948f (diff)
downloadwireshark-7068d5df0af8700440845b403cb21a000c92abf2.tar.gz
Sync up the file format lists, add the Aethra files, and promote pcap-ng
to come right after pcap and not to be tagged as experimental. svn path=/trunk/; revision=39594
Diffstat (limited to 'doc')
-rw-r--r--doc/wireshark.pod.template30
1 files changed, 28 insertions, 2 deletions
diff --git a/doc/wireshark.pod.template b/doc/wireshark.pod.template
index d5beb90e36..0e155a3ee0 100644
--- a/doc/wireshark.pod.template
+++ b/doc/wireshark.pod.template
@@ -57,10 +57,14 @@ B<Wireshark> can read / import the following file formats:
=over 4
=item *
-libpcap, tcpdump and various other tools using tcpdump's capture format
+libpcap - captures from B<Wireshark>/B<TShark>/B<dumpcap>, B<tcpdump>,
+and various other tools using libpcap's/tcpdump's capture format
=item *
-B<snoop> and B<atmsnoop>
+pcap-ng - "next-generation" successor to libpcap format
+
+=item *
+B<snoop> and B<atmsnoop> captures
=item *
Shomiti/Finisar B<Surveyor> captures
@@ -138,11 +142,33 @@ Linux Bluez Bluetooth stack B<hcidump -w> traces
Catapult DCT2000 .out files
=item *
+Gammu generated text output from Nokia DCT3 phones in Netmonitor mode
+
+=item *
+IBM Series (OS/400) Comm traces (ASCII & UNICODE)
+
+=item *
+Juniper Netscreen snoop files
+
+=item *
+Symbian OS btsnoop files
+
+=item *
TamoSoft CommView files
=item *
+Textronix K12xx 32bit .rf5 format files
+
+=item *
+Textronix K12 text file format captures
+
+=item *
Apple PacketLogger files
+=item *
+Files from Aethra Telecommunications' PC108 software for their test
+instruments
+
=back
There is no need to tell B<Wireshark> what type of