Module Name: src
Committed By: tls
Date: Sun Aug 10 06:53:28 UTC 2014
Modified Files:
src/share/misc [tls-earlyentropy]: acronyms acronyms.comp airport
bsd-family-tree inter.phone
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.223 -r1.223.2.1 src/share/misc/acronyms
cvs rdiff -u -r1.141 -r1.141.2.1 src/share/misc/acronyms.comp
cvs rdiff -u -r1.52 -r1.52.2.1 src/share/misc/airport
cvs rdiff -u -r1.54 -r1.54.2.1 src/share/misc/bsd-family-tree
cvs rdiff -u -r1.27 -r1.27.8.1 src/share/misc/inter.phone
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/acronyms
diff -u src/share/misc/acronyms:1.223 src/share/misc/acronyms:1.223.2.1
--- src/share/misc/acronyms:1.223 Mon Mar 10 17:56:21 2014
+++ src/share/misc/acronyms Sun Aug 10 06:53:28 2014
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.223 2014/03/10 17:56:21 mbalmer Exp $
+$NetBSD: acronyms,v 1.223.2.1 2014/08/10 06:53:28 tls Exp $
10Q thank you
10X thanks
1337 elite ("leet")
@@ -480,6 +480,7 @@ TBOMK the best of my knowledge
TCB taking care of business
TCO taken care of
TCO total cost of ownership
+TFOA things falling off aircraft
THNX thanks
THX thanks
TIA thanks in advance
Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.141 src/share/misc/acronyms.comp:1.141.2.1
--- src/share/misc/acronyms.comp:1.141 Sat Sep 28 18:01:49 2013
+++ src/share/misc/acronyms.comp Sun Aug 10 06:53:28 2014
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.141 2013/09/28 18:01:49 dholland Exp $
+$NetBSD: acronyms.comp,v 1.141.2.1 2014/08/10 06:53:28 tls Exp $
3WHS three-way handshake
8VSB 8-state vestigial side band modulation
AA anti-aliasing
@@ -1353,6 +1353,7 @@ XIP execute in place
XML Extensible Markup Language
XOR exclusive or
XP extreme programming
+XSI X/Open System Interface
XSL extensible stylesheet language
XSS cross site scripting
XT extended technology
Index: src/share/misc/airport
diff -u src/share/misc/airport:1.52 src/share/misc/airport:1.52.2.1
--- src/share/misc/airport:1.52 Fri Mar 28 10:16:28 2014
+++ src/share/misc/airport Sun Aug 10 06:53:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: airport,v 1.52 2014/03/28 10:16:28 apb Exp $
+# $NetBSD: airport,v 1.52.2.1 2014/08/10 06:53:28 tls Exp $
# @(#)airport 8.1 (Berkeley) 6/8/93
#
# Some of this information is from http://www.mapping.com/airportcodes.html.
@@ -2837,6 +2837,7 @@ HBZ:Heber Springs Municipal Airport, AR,
HCA:Big Spring, TX, USA
HCB:Shoal Cove, AK, USA
HCD:Hutchinson (Butler Field), MN, USA
+HCJ:Hechi Jinchengjiang Airport, China
HCM:Ell, Somalia
HCQ:Halls Creek, Western Australia, Australia
HCR:Holy Cross Airport, AK, USA
@@ -3729,7 +3730,7 @@ KGX:Grayling Airport, AK, USA
KGY:Kingaroy, Queensland, Australia
KGZ:Glacier Creek Airport, AK, USA
KHA:Khaneh, Iran
-KHC:Kerch, Krym (Crimea), Ukraine
+KHC:Kerch, Ukraine
KHE:Kherson, Mykolayiv, Ukraine
KHG:Kashi, China
KHH:Kaohsiung International, Taiwan
@@ -7028,7 +7029,7 @@ SIL:Sila, Papua New Guinea
SIM:Simbai, Papua New Guinea
SIN:Singapore
SIO:Smithton, Tasmania, Australia
-SIP:Simferopol, Adygea, Ukraine
+SIP:Simferopol, Ukraine
SIQ:Singkep (Dabo Airport), Indonesia
SIR:Sion (Sitten), Switzerland
SIS:Sishen, South Africa
@@ -7319,7 +7320,7 @@ SUE:Sturgeon Bay (Door County), WI, USA
SUF:Lamezia Terme, Italy
SUG:Surigao, Philippines
SUH:Sur, Oman
-SUI:Sokhumi, Abkhazia, Georgia
+SUI:Sukhum, Abkhazia
SUJ:Satu Mare, Romania
SUK:Samchok, South Korea
SUL:Sui, Pakistan
@@ -8171,7 +8172,7 @@ VIH:Rolla/Vichy (Rolla National Airport)
VIJ:Virgin Gorda (Valley), British Virgin Islands
VIK:Kavik, AK, USA
VIL:Dakhla (Villa Cisneros), Western Sahara
-VIN:Vinnytsya, Russia
+VIN:Vinnytsya, Ukraine
VIQ:Viqueque, Indonesia
VIS:Visalia Municipal Airport, CA, USA
VIT:Vitoria, Spain
Index: src/share/misc/bsd-family-tree
diff -u src/share/misc/bsd-family-tree:1.54 src/share/misc/bsd-family-tree:1.54.2.1
--- src/share/misc/bsd-family-tree:1.54 Mon Sep 30 03:48:51 2013
+++ src/share/misc/bsd-family-tree Sun Aug 10 06:53:28 2014
@@ -256,6 +256,9 @@ FreeBSD 5.2 | |
| | 8.3 | | | | | |
| | | | | | NetBSD | |
| | | | | | 5.1.3 | |
+ | | | | | | | | |
+ | | | | | | NetBSD | |
+ | | | | | | 5.1.4 | |
| | | | | | OpenBSD 5.1 |
| | | Mac OS X | `----. | |
| | | 10.8 | \ | |
@@ -263,26 +266,43 @@ FreeBSD 5.2 | |
| | | | | | | | OpenBSD 5.2 DragonFly 3.2.1
| FreeBSD | | | | | NetBSD | |
| 9.1 | | | | | 5.2 | |
- | | | | | | | | |
- | | | | | | NetBSD | |
- | | | | | | 5.2.1 | |
- | | | | | | | |
- | | | | | \ | |
- | | | | | NetBSD | |
- | | | | | 6.0.1 | |
- | | | | | | OpenBSD 5.3 DragonFly 3.4.1
- | | | | | NetBSD | |
- | | | | | 6.0.2 | |
- | | | | | | | |
- | | | | | NetBSD 6.0.3 | |
- | | | | | | |
- | | | | `-NetBSD 6.1 | |
- | FreeBSD | | | | |
- | 8.4 | | NetBSD 6.1.1 | |
- | | | | | |
- | | | NetBSD 6.1.2 | |
+ | | | | | | | | | |
+ | | | | | | | NetBSD | |
+ | | | | | | | 5.2.1 | |
+ | | | | | | | | | |
+ | | | | | | | NetBSD | |
+ | | | | | | | 5.2.2 | |
+ | | | | | | | | |
+ | | | | | | \ | |
+ | | | | | | NetBSD | |
+ | | | | | | 6.0.1 | |
+ | | | | | | | OpenBSD 5.3 DragonFly 3.4.1
+ | | | | | | NetBSD | |
+ | | | | | | 6.0.2 | |
+ | | | | | | | | |
+ | | | | | | NetBSD 6.0.3 | |
+ | | | | | | | | |
+ | | | | | | NetBSD 6.0.4 | |
+ | | | | | | | | |
+ | | | | | | NetBSD 6.0.5 | |
+ | | | | | | | |
+ | | | | | `-NetBSD 6.1 | |
+ | | FreeBSD | | | | |
+ | | 8.4 | | NetBSD 6.1.1 | |
+ | | | | | | |
+ | FreeBSD | | NetBSD 6.1.2 | |
+ | 9.2 Mac OS X | | | |
+ | 10.9 | | OpenBSD 5.4 |
+ | | | | | DragonFly 3.6.0
+ | | | | | |
+ *--FreeBSD | | NetBSD 6.1.3 | |
+ | 10.0 | | | | |
+ | | | NetBSD 6.1.4 | |
| | | | |
-FreeBSD 10 -current | NetBSD -current OpenBSD -current |
+ | | | | DragonFly 3.6.1
+ | | | OpenBSD 5.5 |
+ | | | | |
+FreeBSD 11 -current | NetBSD -current OpenBSD -current DragonFly -current
| | | | |
v v v v v
@@ -592,8 +612,21 @@ FreeBSD 8.4 2013-06-07 [FBD]
NetBSD 6.1.1 2013-08-22 [NBD]
NetBSD 5.1.3 2013-09-29 [NBD]
NetBSD 5.2.1 2013-09-29 [NBD]
+FreeBSD 9.2 2013-09-30 [FBD]
NetBSD 6.0.3 2013-09-30 [NBD]
NetBSD 6.1.2 2013-09-30 [NBD]
+Mac OS X 10.9 2013-10-22 [APL]
+OpenBSD 5.4 2013-11-01 [OBD]
+DragonFly 3.6.0 2013-11-25 [DFB]
+FreeBSD 10.0 2014-01-20 [FBD]
+NetBSD 5.1.4 2014-01-25 [NBD]
+NetBSD 5.2.2 2014-01-25 [NBD]
+NetBSD 6.0.4 2014-01-25 [NBD]
+NetBSD 6.1.3 2014-01-25 [NBD]
+DragonFly 3.6.1 2014-02-22 [DFB]
+NetBSD 6.0.5 2014-04-12 [NBD]
+NetBSD 6.1.4 2014-04-12 [NBD]
+OpenBSD 5.5 2014-05-01 [OBD]
Bibliography
------------------------
@@ -652,6 +685,6 @@ Steven M. Schultz for providing 2.8BSD,
--
Copyright (c) 1997-2012 Wolfram Schneider <wo...@freebsd.org>
-URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree
+URL: http://svnweb.freebsd.org/base/head/share/misc/bsd-family-tree
$FreeBSD$
Index: src/share/misc/inter.phone
diff -u src/share/misc/inter.phone:1.27 src/share/misc/inter.phone:1.27.8.1
--- src/share/misc/inter.phone:1.27 Tue Mar 6 17:11:15 2012
+++ src/share/misc/inter.phone Sun Aug 10 06:53:28 2014
@@ -1,5 +1,5 @@
# Country Code : City Code : City : Country
-# $NetBSD: inter.phone,v 1.27 2012/03/06 17:11:15 mbalmer Exp $
+# $NetBSD: inter.phone,v 1.27.8.1 2014/08/10 06:53:28 tls Exp $
# @(#)inter.phone 8.1 (Berkeley) 6/9/93
20:2:Cairo:Egypt, Arab Rep. of
20:3:Alexandria:Egypt, Arab Rep. of
@@ -303,8 +303,14 @@
86:20:Ghuangzhou:China, People's Rep. of
86:21:Shanghai:China, People's Rep. of
86:591:Fuzhou:China, People's Rep. of
-90:1:Istanbul:Turkey
-90:4:Ankara:Turkey
+90:212:Istanbul:Turkey
+90:312:Ankara:Turkey
+90:232:Izmir:Turkey
+90:224:Bursa:Turkey
+90:322:Adana:Turkey
+90:342:Gaziantep:Turkey
+90:332:Konya:Turkey
+90:242:Antalya:Turkey
91:11:New Delhi:India
91:22:Bombay:India
91:33:Calcutta:India
@@ -389,6 +395,9 @@
358:18:Ahvenanmaa:Finland
358:19:Uusimaa:Finland
359:2:Sofia:Bulgaria
+370:::Lithuania
+371:::Latvia
+372:::Estonia
420:2:Prague:Czech Republic
421:2:Bratislava:Slovak Republic
421:31:Dunajska Streda:Slovak Republic
