aboutsummaryrefslogtreecommitdiffstats
path: root/docbook
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2020-05-10 18:18:44 +0000
committerGerald Combs <gerald@wireshark.org>2020-05-10 18:18:48 +0000
commita941457d91dcb8cbb37e3a0ad6b0c1410a171f7b (patch)
tree1b98099b123508f132f872044deea239c39d86b4 /docbook
parenta32298b7f6dd0e411b4774334f32ede775e402b4 (diff)
[Automatic update for 2020-05-10]
Update manuf, services enterprise numbers, translations, and other items. Change-Id: If6b68e242160198aed0de5947813d0db20c799f2 Reviewed-on: https://code.wireshark.org/review/37173 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'docbook')
-rw-r--r--docbook/wsug_src/editcap-T.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/docbook/wsug_src/editcap-T.txt b/docbook/wsug_src/editcap-T.txt
index 26e723d10c..f6fe95aa91 100644
--- a/docbook/wsug_src/editcap-T.txt
+++ b/docbook/wsug_src/editcap-T.txt
@@ -95,7 +95,8 @@ editcap: The available encapsulation types for the "-T" flag are:
lin - Local Interconnect Network
linux-atm-clip - Linux ATM CLIP
linux-lapd - LAPD with Linux pseudo-header
- linux-sll - Linux cooked-mode capture
+ linux-sll - Linux cooked-mode capture v1
+ linux-sll2 - Linux cooked-mode capture v2
log_3GPP - 3GPP Phone Log
logcat - Android Logcat Binary format
logcat_brief - Android Logcat Brief text format
@@ -117,6 +118,7 @@ editcap: The available encapsulation types for the "-T" flag are:
mime - MIME
most - Media Oriented Systems Transport
mp2ts - ISO/IEC 13818-1 MPEG2-TS
+ mp4 - MP4 files
mpeg - MPEG
mtp2 - SS7 MTP2
mtp2-with-phdr - MTP2 with pseudoheader