Make pcap-ng the default. Add a compile-time option to prefer pcap-ng or

pcap.  Add a "-P" capture option which tries to use pcap instead of
pcap-ng ("-P" seemed to be the best option but we may want to use a
different letter).

Update the documentation and release notes.

svn path=/trunk/; revision=37696

1 files changed, 8 insertions, 2 deletions

diff --git a/doc/dumpcap.pod b/doc/dumpcap.pod
index 9f73b1e923..861db49dde 100644
--- a/doc/dumpcap.pod
+++ b/doc/dumpcap.pod
@@ -20,6 +20,7 @@ S<[ B<-L> ]>
 S<[ B<-n> ]>
 S<[ B<-M> ]>
 S<[ B<-p> ]>
+S<[ B<-P> ]>
 S<[ B<-q> ]>
 S<[ B<-s> E<lt>capture snaplenE<gt> ]>
 S<[ B<-S> ]>
@@ -212,8 +213,7 @@ B<TShark>; its format is subject to change from release to release.
 
 =item -n
 
-Write the output file in the pcap-ng format instead of the default pcap
-format.
+Save files as pcap-ng. This is the default.
 
 =item -p
 
@@ -224,6 +224,12 @@ traffic sent to or from the machine on which B<Dumpcap> is running,
 broadcast traffic, and multicast traffic to addresses received by that
 machine.
 
+=item -P
+
+Save files as pcap instead of the default pcap-ng. In situations that require
+pcap-ng, such as capturing from multiple interfaces, this option will be
+overridden.
+
 =item -q
 
 When capturing packets, don't display the continuous count of packets