[Automatic update for 2018-07-01]

Update manuf, services enterprise numbers, translations, and other items.

Change-Id: I41a23250a0b818b08475ede50792fd9acc37b2ae
Reviewed-on: https://code.wireshark.org/review/28547
Reviewed-by: Gerald Combs <gerald@wireshark.org>

diff --git a/AUTHORS b/AUTHORS
index df70f9293d3dbd0c2c1add3bbd5cea2696b312ee..23511788c1e2b1a21a7ca33335e97b33445eaa20 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -4220,6 +4220,7 @@ Jeffrey Smith             <whydoubt[AT]gmail.com>
 Jens Kilian            <jens.kilian[AT]advantest.com>
 Jeremy Browne          <jer[AT]ifni.ca>
 Jeremy Hitt            <jeremy.hitt[AT]isilon.com>
+Jeremy Martin          <boardermartin[AT]gmail.com>
 Jeroen Roovers         <jer[AT]gentoo.org>
 Jeroen Sack            <jeroen[AT]jeroensack.nl>
 Jesse Gross            <jesse[AT]kernel.org>
@@ -4304,6 +4305,7 @@ Mark Cunningham           <launchpad[AT]markcunningham.ie>
 Mark Phillips          <mark.s.phillips[AT]outlook.com>
 Mark Weel              <markweel[AT]hotmail.com>
 Marko Hrastovec                <marko.hrastovec[AT]gmail.com>
+Markus Becker          <markus.becker[AT]tridonic.com>
 Marouen Ghodhbane      <marouen.ghodhbane[AT]nxp.com>
 Martin Boye Petersen   <martinboyepetersen[AT]gmail.com>
 Martin Heusse          <martin.heusse[AT]imag.fr>
@@ -4500,6 +4502,7 @@ Ulf                       <ulf33286[AT]gmail.com>
 Uli Schlachter         <psychon[AT]znc.in>
 Umberto Corponi                <umberto.corponi[AT]athonet.com>
 Uri Simchoni           <urisimchoni[AT]gmail.com>
+Vadim Fedorenko                <vadimjunk[AT]gmail.com>
 Vadim Yanitskiy                <axilirator[AT]gmail.com>
 Valentin Vidic         <Valentin.Vidic[AT]CARNet.hr>
 Vasil Velichkov                <vvvelichkov[AT]gmail.com>

diff --git a/docbook/wsug_src/editcap-h.txt b/docbook/wsug_src/editcap-h.txt
index bc9fd2b07257b4359c950e53728202cb7c6ead1f..2c0351e7f963be817f20648a1cb9f8ba448f981f 100644 (file)
--- a/docbook/wsug_src/editcap-h.txt
+++ b/docbook/wsug_src/editcap-h.txt
@@ -1,4 +1,4 @@
-Editcap (Wireshark) 2.5.0 (v2.5.0rc0-1171-g33c00a67)
+Editcap (Wireshark) 2.9.0 (v2.9.0rc0-1126-g9d1cea0c)
 Edit and/or translate the format of capture files.
 See https://www.wireshark.org for more information.
 
@@ -25,17 +25,6 @@ Duplicate packet removal:
                          LESS THAN <dup time window> prior to current packet.
                          A <dup time window> is specified in relative seconds
                          (e.g. 0.000001).
-  -a <framenum>:<comment> Add or replace comment for given frame number
-
-  -I <bytes to ignore>   ignore the specified number of bytes at the beginning
-                         of the frame during MD5 hash calculation, unless the
-                         frame is too short, then the full frame is used.
-                         Useful to remove duplicated packets taken on
-                         several routers (different mac addresses for
-                         example).
-                         e.g. -I 26 in case of Ether/IP will ignore
-                         ether(14) and IP header(20 - 4(src ip) - 4(dst ip)).
-
            NOTE: The use of the 'Duplicate packet removal' options with
            other editcap options except -v may not always work as expected.
            Specifically the -r, -t or -S options will very likely NOT have the
@@ -69,6 +58,15 @@ Packet manipulation:
   -o <change offset>     When used in conjunction with -E, skip some bytes from the
                          beginning of the packet. This allows one to preserve some
                          bytes, in order to have some headers untouched.
+  -I <bytes to ignore>   ignore the specified number of bytes at the beginning
+                         of the frame during MD5 hash calculation, unless the
+                         frame is too short, then the full frame is used.
+                         Useful to remove duplicated packets taken on
+                         several routers (different mac addresses for
+                         example).
+                         e.g. -I 26 in case of Ether/IP will ignore
+                         ether(14) and IP header(20 - 4(src ip) - 4(dst ip)).
+  -a <framenum>:<comment> Add or replace comment for given frame number
 
 Output File(s):
   -c <packets per file>  split the packet output to different files based on

diff --git a/enterprises.tsv b/enterprises.tsv
index 40b7015e5865241c8f4ad9719c37bdd2016f1513..f481a1561fb0b79e10526df864eb2044b1b8e4b6 100644 (file)
--- a/enterprises.tsv
+++ b/enterprises.tsv
@@ -5,7 +5,7 @@
 # The format used here is: <NUMERICAL_ID><SPACE><NAME>
 # Where SPACE can be any sequence of spaces and tabs.
 #
-# (last updated 2018-06-23)
+# (last updated 2018-06-29)
 
 0      Reserved
 1      NxNetworks
@@ -13985,7 +13985,7 @@
 14119  Netlife AG
 14120  Letifer.org
 14121  Stone-IT
-14122  Wireless Broadband Alliance Ltd # formerly 'Wi-Fi Alliance'
+14122  Wireless Broadband Alliance Ltd
 14123  Expertcity Inc.
 14124  UK/CA/JN Joint Astronomy Centre
 14125  SENAO INTERNATIONAL CO., Ltd.
@@ -52039,3 +52039,39 @@
 52225  Block Array Corporation
 52226  PEPE Invest s.r.o.
 52227  Avanfort
+52228  music support group
+52229  Roboteurs Inc
+52230  WuHan SanJiang Space Network Communication Co,LTD
+52231  sentieris
+52232  Bitline Informatikberatung GmbH
+52233  Internetswitch
+52234  Hostsharing eG
+52235  ZheJiang Taoshi Technology CO.,LTD.
+52236  Lyon e-Sport
+52237  Covenant Transportation Group
+52238  AMP Robotics
+52239  Kernel Labs Inc.
+52240  Piwiteam
+52241  CENTRAL COAST MEDICAL ONCOLOGY CORP
+52242  Wataniya Mobile
+52243  Luminor Bank AS
+52244  NetWorkS!
+52245  meituan
+52246  HMSHost
+52247  Vivo Telefonica
+52248  Altergy Systems
+52249  Jefferson Lab
+52250  First Weber, Inc.
+52251  Enconnex LLC
+52252  MNF Group
+52253  Symbio Networks
+52254  Dabee.ca
+52255  Woodridge Baptist Church
+52256  GloryTrust, LLC
+52257  Ufi Space Co., Ltd.
+52258  SDNIMO
+52259  PSiDEO SA
+52260  happn
+52261  Suomen Tilaajavastuu Oy
+52262  Service Benefit Plan Administrative Services Corp
+52263  NK Lundströms Trävaror AB