aboutsummaryrefslogtreecommitdiffstats
path: root/docbook/wsug_src
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2013-03-31 05:12:50 +0000
committerGuy Harris <guy@alum.mit.edu>2013-03-31 05:12:50 +0000
commitb5a890d27610c55a6e3578fcdafe9ed43444c761 (patch)
tree4450c7eb42df5ba49a7c5dd11b8f0d66ec4b52fa /docbook/wsug_src
parent7b32fc6873aeaeedc7ac66d3481913c2a14bc19d (diff)
Don't bundle "Open" and "Import" together; again, clarify that "Import"
is a somewhat limited function. svn path=/trunk/; revision=48667
Diffstat (limited to 'docbook/wsug_src')
-rw-r--r--docbook/wsug_src/WSUG_chapter_introduction.xml18
-rw-r--r--docbook/wsug_src/WSUG_chapter_io.xml9
2 files changed, 22 insertions, 5 deletions
diff --git a/docbook/wsug_src/WSUG_chapter_introduction.xml b/docbook/wsug_src/WSUG_chapter_introduction.xml
index 903a789be9..6bc15cfc32 100644
--- a/docbook/wsug_src/WSUG_chapter_introduction.xml
+++ b/docbook/wsug_src/WSUG_chapter_introduction.xml
@@ -65,18 +65,30 @@
</listitem>
<listitem>
<para>
+ <command>Open</command> files containing packet data captured with
+ tcpdump/WinDump, Wireshark, and a number of other packet capture
+ programs.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <command>Import</command> packets from text files containing hex
+ dumps of packet data.
+ </para>
+ <listitem>
+ <para>
Display packets with <command>very detailed protocol information</command>.
</para>
</listitem>
<listitem>
<para>
- <command>Open and Save</command> packet data captured.
+ <command>Save</command> packet data captured.
</para>
</listitem>
<listitem>
<para>
- <command>Import and Export</command> packet data from and to a lot of
- other capture programs.
+ <command>Export</command> some or all packets in a number of
+ capture file formats.
</para>
</listitem>
<listitem>
diff --git a/docbook/wsug_src/WSUG_chapter_io.xml b/docbook/wsug_src/WSUG_chapter_io.xml
index 7e76a88a13..6728142c24 100644
--- a/docbook/wsug_src/WSUG_chapter_io.xml
+++ b/docbook/wsug_src/WSUG_chapter_io.xml
@@ -10,7 +10,7 @@
<itemizedlist>
<listitem>
<para>
- Open/Import capture files in various capture file formats
+ Open capture files in various capture file formats
</para>
</listitem>
<listitem>
@@ -25,6 +25,11 @@
</listitem>
<listitem>
<para>
+ Import text files containing hex dumps of packets
+ </para>
+ </listitem>
+ <listitem>
+ <para>
Print packets
</para>
</listitem>
@@ -684,7 +689,7 @@
</section>
</section>
- <section id="ChIOImportSection"><title>Import text file</title>
+ <section id="ChIOImportSection"><title>Import hex dump</title>
<para>
Wireshark can read in an ASCII hex dump and write the data described
into a temporary libpcap capture file. It can read hex dumps with multiple