aboutsummaryrefslogtreecommitdiffstats
path: root/docbook
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2004-09-15 21:13:16 +0000
committerUlf Lamping <ulf.lamping@web.de>2004-09-15 21:13:16 +0000
commit5ce2535c707f56ea19e80aaf1ecedf71856323a5 (patch)
tree92ce0f9b8bd12318d8985f3d07c6426d2cf80ae1 /docbook
parent04369efcea65095cc933b82f6f21ab56074e405c (diff)
add some info to the merge section
svn path=/trunk/; revision=12003
Diffstat (limited to 'docbook')
-rw-r--r--docbook/ug-src/EUG_chapter_io.xml9
1 files changed, 6 insertions, 3 deletions
diff --git a/docbook/ug-src/EUG_chapter_io.xml b/docbook/ug-src/EUG_chapter_io.xml
index 87841f30e7..1d1fe1dc79 100644
--- a/docbook/ug-src/EUG_chapter_io.xml
+++ b/docbook/ug-src/EUG_chapter_io.xml
@@ -329,16 +329,19 @@
interfaces at once (e.g. using multiple instances of Ethereal).
</para>
<para>
- Merging capture files can be done in three ways:
+ Merging capture files can be done in three ways:
<itemizedlist>
<listitem><para>
- Use the <command>menu item "Merge"</command> from the "File" menu,
+ Use the <command>menu item "Merge"</command> from the "File" menu,
to open the merge dialog, see <xref linkend="ChIOMergeDialog"/>.
+ This menu item will be disabled, until you have loaded a capture file.
</para></listitem>
<listitem><para>
Use <command>drag-and-drop</command> to drop multiple files on the
main window. Ethereal will try to merge the packets in chronological
- order from the dropped files into a newly created temporary file.
+ order from the dropped files into a newly created temporary file. If
+ you drop only a single file, it will simply replace a (maybe) existing
+ one.
</para></listitem>
<listitem><para>
Use the <command>mergecap</command> tool, which is a command