From: Gerald Combs <gerald.combs@riverbed.com>
Date: Sun, 2 Sep 2018 08:29:03 +0000 (+0000)
Subject: [Automatic update for 2018-09-02]
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=8f99b54a77c8747b310ebbc00cdbb51d4035cb99;p=metze%2Fwireshark%2Fwip.git

[Automatic update for 2018-09-02]

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

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

diff --git a/AUTHORS b/AUTHORS
index ebf818c9e5..c4018680eb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4166,6 +4166,7 @@ Ganesh Nawsupe		<ganesh991[AT]gmail.com>
 Garming Sam		<garming[AT]catalyst.net.nz>
 Gene Cumm		<gene.cumm[AT]gmail.com>
 Georg Brandl		<georg[AT]python.org>
+Gerald Combs		<gerald.combs[AT]riverbed.com>
 Gerard Garcia		<ggarcia[AT]deic.uab.cat>
 Gergely Nagy		<ngg[AT]ngg.hu>
 Gerhard KHUENY		<Gerhard.KHUENY[AT]bachmann.info>
@@ -4370,6 +4371,7 @@ Nicolas Darchis		<ndarchis[AT]cisco.com>
 Nicolas S. Dade		<nic.dade[AT]gmail.com>
 Nikhil Acharya Prakash	<nikhilap[AT]arista.com>
 Nikolai Ipatyev		<wallprime[AT]yandex.com>
+Nils Björklund		<nils.bjorklund[AT]effnet.com>
 Nils Ohlmeier		<github[AT]ohlmeier.org>
 Nitzan Carmi		<nitzanc[AT]mellanox.com>
 Noel Power		<noel.power[AT]suse.com>
@@ -4516,6 +4518,7 @@ Tobias Rasmusson	<tobias.rasmusson[AT]gmail.com>
 Tobias Stoeckmann	<tobias[AT]stoeckmann.org>
 Tom			<tom916[AT]qq.com>
 Tom Haynes		<loghyr[AT]primarydata.com>
+Tomas Konecny		<tomas.konecny[AT]eldis.cz>
 Tomas Kukosa		<tomas.kukosa[AT]ixperta.com>
 Trond Myklebust		<trond.myklebust[AT]primarydata.com>
 Ulf			<ulf33286[AT]gmail.com>
diff --git a/docbook/wsug_src/editcap-h.txt b/docbook/wsug_src/editcap-h.txt
index c17e0690e7..9a6fe2a843 100644
--- a/docbook/wsug_src/editcap-h.txt
+++ b/docbook/wsug_src/editcap-h.txt
@@ -1,4 +1,4 @@
-Editcap (Wireshark) 2.9.0 (v2.9.0rc0-1442-gfd419dd6)
+Editcap (Wireshark) 2.9.0 (v2.9.0rc0-1638-g57ee8486)
 Edit and/or translate the format of capture files.
 See https://www.wireshark.org for more information.
 
@@ -61,6 +61,9 @@ 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.
+  --seed <seed>          When used in conjunction with -E, set the seed to use for
+                         the pseudo-random number generator. This allows one to
+                         repeat a particular sequence of errors.
   -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.
diff --git a/enterprises.tsv b/enterprises.tsv
index b4bd6b89ff..11cfbde418 100644
--- 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-08-25)
+# (last updated 2018-09-01)
 
 0	Reserved
 1	NxNetworks
@@ -208,7 +208,7 @@
 198	University of Waterloo
 199	CCL/ITRI
 200	Coeur Postel
-201	Mitsubish Cable Industries, Ltd.
+201	Mitsubishi Cable Industries, Ltd. / RYOSEI SYSTEMS,LTD.
 202	SMC
 203	Crescendo Communication, Inc.
 204	Goodall Software Engineering
@@ -28973,7 +28973,7 @@
 29130	Lithuanian Academy of Physical Education
 29131	PERSONAL_JG
 29132	CalNet
-29133	ATIS UHER S.A.
+29133	VoiceCollect GmbH
 29134	SpeedXS
 29135	Salvadè S.r.l.
 29136	Toys R Us Corporation
@@ -52355,3 +52355,50 @@
 52542	LGM Ingénierie
 52543	ZVD
 52544	NoviFlow Inc.
+52545	Jackson College
+52546	Bloombox LLC
+52547	Bridge Group Ltd
+52548	Akademia Wojsk Ladowych
+52549	Telefonica Germany
+52550	Alameda County Water District
+52551	GO MY CODE
+52552	IBJ Leasing Company, Limited
+52553	Chingo Software Co., LTD.
+52554	PT Privy Identitas Digital
+52555	NINGBO TURN-LINK NETWORK COMMUNICATION EQUIPMENT CO., LTD
+52556	Unipark LTD
+52557	SGNR.net
+52558	TechCraft Co.,Ltd.
+52559	P-Cure LTD
+52560	VIZZIA Technologies
+52561	Jaeger Bau GmbH
+52562	Personal Soft
+52563	xBar7 Communications, LLC
+52564	FreeDSx SNMP
+52565	UMC H ELECTRONICS CO., LTD.
+52566	Mercer Financial Services
+52567	factuno UG (haftungsbeschränkt)
+52568	fair&smart
+52569	Secure ID LTD.
+52570	OMU
+52571	HIFSYS TECHNOLOGY INC.
+52572	Oghmasys IT Services GmbH
+52573	Keenetic Limited
+52574	StepOver GmbH
+52575	Kinexon GmbH
+52576	AJ's Power Source Inc.
+52577	Cisco SolutionsLab
+52578	Federal Reserve Bank of Kansas City
+52579	ReLegoTec
+52580	DigiCert, Inc.
+52581	Kamran Khan SC
+52582	TRUSTED ELECTRONIC SOLUTIONS S. L (BRANDDOCS)
+52583	Stöde Skog AB
+52584	Shakopee Public School District
+52585	Lanet Network Ltd
+52586	First Electronic Bank
+52587	Edgecore Networks Corporation
+52588	Spacelabs Healthcare
+52589	Bold Idea, INC
+52590	Ad Astra Information Systems
+52591	Old Naples Concierge Medicine