diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-01-23 07:48:53 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-01-23 07:48:53 +0000 |
| commit | e553c70fe84d96edbe4b402d11e6db60b6965610 (patch) | |
| tree | 2df89daccc3f62421ac82ef6b6290edd3e6eecac /mergecap.c | |
| parent | ef2bf47e321bbd034e0fbd535340a5f11b0d1312 (diff) | |
| download | wireshark-e553c70fe84d96edbe4b402d11e6db60b6965610.tar.gz wireshark-e553c70fe84d96edbe4b402d11e6db60b6965610.tar.bz2 wireshark-e553c70fe84d96edbe4b402d11e6db60b6965610.zip | |
From Michael Mann:
help page update (pcapng is now the default file format).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6551
svn path=/trunk/; revision=40658
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mergecap.c b/mergecap.c index bb95f2aaf3..db3873ef86 100644 --- a/mergecap.c +++ b/mergecap.c @@ -124,7 +124,7 @@ usage(void) fprintf(stderr, " default is to merge based on frame timestamps.\n"); fprintf(stderr, " -s <snaplen> truncate packets to <snaplen> bytes of data.\n"); fprintf(stderr, " -w <outfile>|- set the output filename to <outfile> or '-' for stdout.\n"); - fprintf(stderr, " -F <capture type> set the output file type; default is libpcap.\n"); + fprintf(stderr, " -F <capture type> set the output file type; default is pcapng.\n"); fprintf(stderr, " an empty \"-F\" option will list the file types.\n"); fprintf(stderr, " -T <encap type> set the output file encapsulation type;\n"); fprintf(stderr, " default is the same as the first input file.\n"); |