aboutsummaryrefslogtreecommitdiffstats
path: root/docbook/wsug_src
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2018-01-08 16:38:10 -0800
committerGuy Harris <guy@alum.mit.edu>2018-01-09 00:38:51 +0000
commitaf0f49e80dce20b50ca757b52c2454e137ce1c74 (patch)
treef4bdde99005a0d8374ebea72ff76f58b4c30073c /docbook/wsug_src
parent94479aded162aecce6289bdf26f95073bed0dc55 (diff)
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>
Diffstat (limited to 'docbook/wsug_src')
-rw-r--r--docbook/wsug_src/WSUG_chapter_capture.asciidoc6
-rw-r--r--docbook/wsug_src/text2pcap-h.txt4
2 files changed, 5 insertions, 5 deletions
diff --git a/docbook/wsug_src/WSUG_chapter_capture.asciidoc b/docbook/wsug_src/WSUG_chapter_capture.asciidoc
index 635756221b..5e44aa4c63 100644
--- a/docbook/wsug_src/WSUG_chapter_capture.asciidoc
+++ b/docbook/wsug_src/WSUG_chapter_capture.asciidoc
@@ -272,12 +272,12 @@ _Use multiple files_::
Instead of using a single file Wireshark will automatically switch to a new
one if a specific trigger condition is reached.
-_Use pcap-ng format_:: This checkbox allows you to specify that
-Wireshark saves the captured packets in pcap-ng format. This next
+_Use pcapng format_:: This checkbox allows you to specify that
+Wireshark saves the captured packets in pcapng format. This next
generation capture file format is currently in development. If more than
one interface is chosen for capturing, this checkbox is set by default.
See {wireshark-wiki-url}Development/PcapNg for more details on
-pcap-ng.
+pcapng.
_Next file every n megabyte(s)_::
Multiple files only. Switch to the next file after the given number of
diff --git a/docbook/wsug_src/text2pcap-h.txt b/docbook/wsug_src/text2pcap-h.txt
index 4ea9c5df55..8cbaefbe14 100644
--- a/docbook/wsug_src/text2pcap-h.txt
+++ b/docbook/wsug_src/text2pcap-h.txt
@@ -22,7 +22,7 @@ Input:
used as the default for unspecified fields.
-D the text before the packet starts with an I or an 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.
-a enable ASCII text dump identification.
The start of the ASCII text dump can be identified
and excluded from the packet data, even if it looks
@@ -76,4 +76,4 @@ Miscellaneous:
-h display this help and exit.
-d show detailed debug of parser states.
-q generate no output at all (automatically disables -d).
- -n use PCAP-NG instead of PCAP as output format.
+ -n use pcapng instead of pcap as output format.