Use pcapng as the name of the file format.

At one point, I remember a discussion resulting in the official name of
the next-generation replacement for pcap format being changed to
"pcapng", with no hyphen.

Make Wireshark reflect that.

Change-Id: Ie66fb13a0fe3a8682143106dab601952e9154e2a
Reviewed-on: https://code.wireshark.org/review/25214
Reviewed-by: Guy Harris <guy@alum.mit.edu>

4 files changed, 11 insertions, 11 deletions

diff --git a/doc/dumpcap.pod b/doc/dumpcap.pod
index e1e816bc4f..4c38223ef9 100644
--- a/doc/dumpcap.pod
+++ b/doc/dumpcap.pod
@@ -39,7 +39,7 @@ S<[ B<--time-stamp-type> E<lt>typeE<gt> ]>
 
 B<Dumpcap> is a network traffic dump tool.  It lets you capture packet
 data from a live network and write the packets to a file.  B<Dumpcap>'s
-default capture file format is B<pcap-ng> format.
+default capture file format is B<pcapng> format.
 When the B<-P> option is specified, the output file is written in the
 B<pcap> format.
 
@@ -226,7 +226,7 @@ read data from the standard input.  Data read from pipes must be in
 standard pcap format.
 
 This option can occur multiple times. When capturing from multiple
-interfaces, the capture file will be saved in pcap-ng format.
+interfaces, the capture file will be saved in pcapng format.
 
 Note: the Win32 version of B<Dumpcap> doesn't support capturing from
 pipes or stdin!
@@ -263,7 +263,7 @@ B<TShark>; its format is subject to change from release to release.
 
 =item -n
 
-Save files as pcap-ng. This is the default.
+Save files as pcapng. This is the default.
 
 =item -N  E<lt>packet limitE<gt>
 
@@ -290,8 +290,8 @@ promiscuous mode.
 
 =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
+Save files as pcap instead of the default pcapng. In situations that require
+pcapng, such as capturing from multiple interfaces, this option will be
 overridden.
 
 =item -q
@@ -352,7 +352,7 @@ the default capture link type is used if provided.
 Add a capture comment to the output file.
 
 This option is only available if we output the captured packets to a
-single file in pcap-ng format. Only one capture comment may be set per
+single file in pcapng format. Only one capture comment may be set per
 output file.
 
 =item --list-time-stamp-types
diff --git a/doc/text2pcap.pod b/doc/text2pcap.pod
index d878bf14aa..d19dab7fdd 100644
--- a/doc/text2pcap.pod
+++ b/doc/text2pcap.pod
@@ -111,7 +111,7 @@ multiple times to generate more debugging information.
 
 The text before the packet starts either with an I or O indicating that
 the packet is inbound or outbound.
-This is only stored if the output format is PCAP-NG.
+This is only stored if the output format is pcapng.
 
 =item -e E<lt>l3pidE<gt>
 
@@ -163,7 +163,7 @@ TCP packets.
 
 =item -n
 
-Write PCAP-NG file instead of a PCAP.
+Write the file in pcapng format rather than pcap format.
 
 =item -o hex|oct|dec
 
diff --git a/doc/tshark.pod b/doc/tshark.pod
index dad95b6f3d..59120d2358 100644
--- a/doc/tshark.pod
+++ b/doc/tshark.pod
@@ -539,7 +539,7 @@ read data from the standard input.  Data read from pipes must be in
 standard pcap format.
 
 This option can occur multiple times.  When capturing from multiple
-interfaces, the capture file will be saved in pcap-ng format.
+interfaces, the capture file will be saved in pcapng format.
 
 Note: the Win32 version of B<TShark> doesn't support capturing from
 pipes!
diff --git a/doc/wireshark.pod.template b/doc/wireshark.pod.template
index 09fb6feaa2..a5960f22a4 100644
--- a/doc/wireshark.pod.template
+++ b/doc/wireshark.pod.template
@@ -75,7 +75,7 @@ and various other tools using libpcap's/WinPcap's/tcpdump's/WinDump's
 capture format
 
 =item *
-pcap-ng - "next-generation" successor to pcap format
+pcapng - "next-generation" successor to pcap format
 
 =item *
 B<snoop> and B<atmsnoop> captures
@@ -415,7 +415,7 @@ of the form ``\\pipe\.\B<pipename>''.  Data read from pipes must be in
 standard pcap format.
 
 This option can occur multiple times.  When capturing from multiple
-interfaces, the capture file will be saved in pcap-ng format.
+interfaces, the capture file will be saved in pcapng format.
 
 =item -I