From e553c70fe84d96edbe4b402d11e6db60b6965610 Mon Sep 17 00:00:00 2001
From: Anders Broman <anders.broman@ericsson.com>
Date: Mon, 23 Jan 2012 07:48:53 +0000
Subject: 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
---
 dumpcap.c  | 9 +++++----
 editcap.c  | 2 +-
 mergecap.c | 2 +-
 tshark.c   | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/dumpcap.c b/dumpcap.c
index cdc3aabb56..21e342c1ff 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -364,7 +364,7 @@ print_usage(gboolean print_ver)
         output = stdout;
         fprintf(output,
                 "Dumpcap " VERSION "%s\n"
-                "Capture network packets and dump them into a libpcap file.\n"
+                "Capture network packets and dump them into a pcapng file.\n"
                 "See http://www.wireshark.org for more information.\n",
                 wireshark_svnversion);
     } else {
@@ -415,7 +415,8 @@ print_usage(gboolean print_ver)
     fprintf(output, "  -b <ringbuffer opt.> ... duration:NUM - switch to next file after NUM secs\n");
     fprintf(output, "                           filesize:NUM - switch to next file after NUM KB\n");
     fprintf(output, "                              files:NUM - ringbuffer: replace after NUM files\n");
-    fprintf(output, "  -n                       use pcapng format instead of pcap\n");
+    fprintf(output, "  -n                       use pcapng format instead of pcap (default)\n");
+    fprintf(output, "  -P                       use libpcap format instead of pcapng\n");
     fprintf(output, "\n");
     fprintf(output, "Miscellaneous:\n");
     fprintf(output, "  -t                       use a separate thread per interface\n");
@@ -423,8 +424,8 @@ print_usage(gboolean print_ver)
     fprintf(output, "  -v                       print version information and exit\n");
     fprintf(output, "  -h                       display this help and exit\n");
     fprintf(output, "\n");
-    fprintf(output, "Example: dumpcap -i eth0 -a duration:60 -w output.pcap\n");
-    fprintf(output, "\"Capture network packets from interface eth0 until 60s passed into output.pcap\"\n");
+    fprintf(output, "Example: dumpcap -i eth0 -a duration:60 -w output.pcapng\n");
+    fprintf(output, "\"Capture network packets from interface eth0 until 60s passed into output.pcapng\"\n");
     fprintf(output, "\n");
     fprintf(output, "Use Ctrl-C to stop capturing at any time.\n");
 }
diff --git a/editcap.c b/editcap.c
index 2d18247d7b..d643ea45c6 100644
--- a/editcap.c
+++ b/editcap.c
@@ -723,7 +723,7 @@ usage(gboolean is_error)
   fprintf(output, "  -i <seconds per file>  split the packet output to different files\n");
   fprintf(output, "                         based on uniform time intervals\n");
   fprintf(output, "                         with a maximum of <seconds per file> each.\n");
-  fprintf(output, "  -F <capture type>      set the output file type; default is libpcap.\n");
+  fprintf(output, "  -F <capture type>      set the output file type; default is pcapng.\n");
   fprintf(output, "                         an empty \"-F\" option will list the file types.\n");
   fprintf(output, "  -T <encap type>        set the output file encapsulation type;\n");
   fprintf(output, "                         default is the same as the input file.\n");
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");
diff --git a/tshark.c b/tshark.c
index f2bd7bf5d2..3419f5e5c4 100644
--- a/tshark.c
+++ b/tshark.c
@@ -291,7 +291,7 @@ print_usage(gboolean print_ver)
   fprintf(output, "  -w <outfile|->           write packets to a pcap-format file named \"outfile\"\n");
   fprintf(output, "                           (or to the standard output for \"-\")\n");
   fprintf(output, "  -C <config profile>      start with specified configuration profile\n");
-  fprintf(output, "  -F <output file type>    set the output file type, default is libpcap\n");
+  fprintf(output, "  -F <output file type>    set the output file type, default is pcapng\n");
   fprintf(output, "                           an empty \"-F\" option will list the file types\n");
   fprintf(output, "  -V                       add output of packet tree        (Packet Details)\n");
   fprintf(output, "  -O <protocols>           Only show packet details of these protocols, comma\n");
-- 
cgit v1.2.3