aboutsummaryrefslogtreecommitdiffstats
path: root/docbook
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 /docbook
parent986c31ef880c2102ffc9937313acdaa0f059948f (diff)
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 'docbook')
-rw-r--r--docbook/wsug_src/WSUG_chapter_io.xml6
1 files changed, 4 insertions, 2 deletions
diff --git a/docbook/wsug_src/WSUG_chapter_io.xml b/docbook/wsug_src/WSUG_chapter_io.xml
index 689422668f..4e1c71e77b 100644
--- a/docbook/wsug_src/WSUG_chapter_io.xml
+++ b/docbook/wsug_src/WSUG_chapter_io.xml
@@ -269,7 +269,8 @@
The following file formats from other capture tools can be opened by
<application>Wireshark</application>:
<itemizedlist>
- <listitem><para>libpcap, tcpdump and various other tools using tcpdump's capture format</para></listitem>
+ <listitem><para>libpcap - captures from <emphasis>Wireshark</emphasis>/<emphasis>TShark</emphasis>/<emphasis>dumpcap</emphasis>, <emphasis>tcpdump</emphasis>, and various other tools using libpcap's/tcpdump's capture format</para></listitem>
+ <listitem><para>pcap-ng - "next-generation" successor to libpcap format</para></listitem>
<listitem><para>Sun snoop and atmsnoop</para></listitem>
<listitem><para>Shomiti/Finisar <emphasis>Surveyor</emphasis> captures</para></listitem>
<listitem><para>Novell <emphasis>LANalyzer</emphasis> captures</para></listitem>
@@ -303,7 +304,8 @@
<listitem><para>Tamosoft CommView captures</para></listitem>
<listitem><para>Textronix K12xx 32bit .rf5 format captures</para></listitem>
<listitem><para>Textronix K12 text file format captures</para></listitem>
- <listitem><para>Wireshark .pcapng captures (Experimental)</para></listitem>
+ <listitem><para>Apple PacketLogger captures</para></listitem>
+ <listitem><para>Captures from Aethra Telecommunications' PC108 software for their test instruments</para></listitem>
<listitem><para>... new file formats are added from time to time</para></listitem>
</itemizedlist>
</para>