Module Name:    src
Committed By:   martin
Date:           Sun Jun 21 10:28:20 UTC 2020

Modified Files:
        src/share/misc [netbsd-9]: acronyms acronyms-o.real acronyms.comp
            bsd-family-tree

Log Message:
Pull up following revision(s) (requested by sevan in ticket #967):

        share/misc/acronyms: revision 1.302
        share/misc/acronyms: revision 1.303
        share/misc/acronyms: revision 1.304
        share/misc/bsd-family-tree: revision 1.82
        share/misc/acronyms-o.real: revision 1.7
        share/misc/acronyms-o.real: revision 1.8
        share/misc/acronyms.comp: revision 1.302
        share/misc/acronyms.comp: revision 1.303
        share/misc/acronyms.comp: revision 1.304
        share/misc/acronyms.comp: revision 1.305
        share/misc/acronyms.comp: revision 1.306
        share/misc/acronyms.comp: revision 1.307
        share/misc/acronyms: revision 1.300
        share/misc/acronyms: revision 1.301

LSO   large send offload
Add OWASP
BMP, DGEMM, DIB, GEMM, WMF
Add FHRP, GLBP, HSRP
IME, SCIM
QOI
ACAB
FTP
ACAB (worksafe variant)
FQA GCHQ
URM
BAU
Sync with r359561


To generate a diff of this commit:
cvs rdiff -u -r1.287.2.2 -r1.287.2.3 src/share/misc/acronyms
cvs rdiff -u -r1.6 -r1.6.6.1 src/share/misc/acronyms-o.real
cvs rdiff -u -r1.283.2.2 -r1.283.2.3 src/share/misc/acronyms.comp
cvs rdiff -u -r1.75.2.2 -r1.75.2.3 src/share/misc/bsd-family-tree

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.287.2.2 src/share/misc/acronyms:1.287.2.3
--- src/share/misc/acronyms:1.287.2.2	Tue Apr 28 18:00:56 2020
+++ src/share/misc/acronyms	Sun Jun 21 10:28:20 2020
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.287.2.2 2020/04/28 18:00:56 martin Exp $
+$NetBSD: acronyms,v 1.287.2.3 2020/06/21 10:28:20 martin Exp $
 10Q	thank you
 10X	thanks
 1337	elite ("leet")
@@ -9,6 +9,7 @@ A/S/L	age/sex/location
 AAMOF	as a matter of fact
 ABD	all but dissertation
 AC	audible chuckle
+ACAB	all cats are beautiful
 ADD	attention deficit disorder
 ADHD	attention deficit (and) hyperactivity disorder
 ADN	any day now
@@ -58,6 +59,7 @@ B/W	bandwidth
 B/W	between
 BAI	goodbye
 BAK	back at keyboard
+BAU	business as usual
 BBIAB	be back in a bit
 BBL	[I'll] be back later
 BBR	burnt beyond repair
@@ -167,6 +169,7 @@ FNO	from now on
 FOC	free of charge
 FPS	first person shooter
 FPS	frames per second
+FQA	frequently questioned answer
 FRAND	fair, reasonable, and non-discriminatory
 FSDO	for some definition of
 FSVO	for some value of
@@ -191,6 +194,7 @@ GAC	get a clue
 GAL	get a life
 GBTW	get back to work
 GCD	greatest common divisor
+GCHQ	Government Communications Headquarters (UK)
 GDPR	General Data Protection Regulation
 GF	girlfriend
 GFCI	ground-fault circuit interrupter
@@ -466,6 +470,7 @@ PTT	post-telephone-telegraph
 PTV	parental tunnel vision
 QED	quod erat demonstrandum
 QFT	quoted for truth
+QOI	quality of information
 RA	residential advisor
 RAND	reasonable and non-discriminatory
 RCD	residual current device
@@ -584,6 +589,7 @@ UGT	universal greeting time
 UPC	Universal Product Code
 UR	your
 UR	{you're, you are}
+URM	underrepresented minority
 UTSL	use the source, Luke
 VCR	video cassette recorder
 VEG	very evil grin

Index: src/share/misc/acronyms-o.real
diff -u src/share/misc/acronyms-o.real:1.6 src/share/misc/acronyms-o.real:1.6.6.1
--- src/share/misc/acronyms-o.real:1.6	Sat Nov 18 08:19:21 2017
+++ src/share/misc/acronyms-o.real	Sun Jun 21 10:28:20 2020
@@ -1,4 +1,5 @@
-# $NetBSD: acronyms-o.real,v 1.6 2017/11/18 08:19:21 pgoyette Exp $
+# $NetBSD: acronyms-o.real,v 1.6.6.1 2020/06/21 10:28:20 martin Exp $
+ACAB	all cops are bastards
 AFU	all fucked up
 AYFKM	are you fucking kidding me
 B/S	bullshit
@@ -21,6 +22,7 @@ FSCK	fuck
 FTFA	from the fucking article
 FTFM	fuck the fuckin' manual!
 FTMFW	for the motherfucking win
+FTP	fuck the police
 FTS	fuck that shit
 FUBAR	fucked up beyond all recognition
 FYIAD	fuck you, I'm a dragon!

Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.283.2.2 src/share/misc/acronyms.comp:1.283.2.3
--- src/share/misc/acronyms.comp:1.283.2.2	Tue Apr 28 18:00:56 2020
+++ src/share/misc/acronyms.comp	Sun Jun 21 10:28:20 2020
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.283.2.2 2020/04/28 18:00:56 martin Exp $
+$NetBSD: acronyms.comp,v 1.283.2.3 2020/06/21 10:28:20 martin Exp $
 3WHS	three-way handshake
 8VSB	8-state vestigial side band modulation
 AA	anti-aliasing
@@ -155,6 +155,8 @@ BLE	Bluetooth low energy
 BLOB	binary large object
 BM	bus master
 BMC	baseboard management controller
+BMP	basic multilingual plane
+BMP	bitmap image file
 BMIC	bus master interface controller
 BN	boundary neutral
 BNF	Backus-Naur form
@@ -394,9 +396,11 @@ DFSAN	Data Flow Sanitizer
 DFT	diagnostic function test
 DFT	discrete Fourier transform
 DGL	data generation language
+DGEMM	double precision general matrix multiply
 DH	Diffie-Hellman
 DHCP	Dynamic Host Configuration Protocol
 DIA	dedicated Internet access
+DIB	device independent bitmap
 DIFS	distributed inter-frame space
 DIMM	dual inline memory module
 DIRT	design in real time
@@ -575,6 +579,7 @@ FFS	Fast File System
 FFS	find first set
 FFT	fast Fourier transform
 FG	floating gate
+FHRP	first hop redundancy protocol
 FHSS	frequency hop spread spectrum
 FID	frequency identifier
 FIFO	first in, first out
@@ -617,12 +622,14 @@ GDT	global descriptor table
 GECOS	general comprehensive operating supervisor
 GEM	graphics environment manager
 GEM	graphics execution manager
+GEMM	general matrix multiply
 GENA	general event notification architecture
 GHC	Glasgow Haskell compiler
 GHES	generic hardware error source
 GIC	generic interrupt controller
 GID	group identifier
 GIF	graphics interchange format
+GLBP	gateway load balancing protocol
 GMCH	graphics and memory controller hub
 GNU	GNU's Not Unix
 GOP	graphics output protocol
@@ -673,6 +680,7 @@ HPD	hot plug detection
 HPET	high precision event timer
 HSM	hardware security module
 HSM	hierarchical storage management 
+HSRP	hot standby router protocol
 HT	hyper-threading
 HTC	hardware thermal control
 HTCC	high temperature co-fired ceramic
@@ -730,6 +738,7 @@ ILM	internal loopback mode
 ILOM	integrated lights-out management
 ILP	instruction level parallelism
 IM	instant messaging
+IME	input method editor
 IMAP	Internet Message Access Protocol
 IMC	integrated memory controller
 IMCR	interrupt mode configuration register
@@ -882,6 +891,7 @@ LSL	load segment limit
 LSM	log structured merge
 LSN	Large Scale NAT
 LSN	log sequence number
+LSO	large send offload
 LSR	label switch router
 LTCC	low temperature co-fired ceramic
 LTO	linear tape-open
@@ -1116,6 +1126,7 @@ OTP	one time password
 OTP	open telecom platform
 OU	organizational unit
 OUI	organizationally unique identifier
+OWASP	Open Web Application Security Project
 OWL	Web Ontology Language
 P2P	PCI to PCI
 P2P	peer to peer
@@ -1274,6 +1285,8 @@ QBE	query by example
 QC	quality control
 QDI	quasi delay insensitive
 QCIF	quarter common intermediate format
+QOI	quality of implementation
+QOI	quick order interface
 QOS	quality of service
 QVL	qualified vendor list
 R/O	read only
@@ -1403,6 +1416,7 @@ SCCP	skinny call control protocol
 SCCS	Source Code Control System
 SCI	scalable coherent interface
 SCI	system control interrupt
+SCIM	smart common input method
 SCM	software configuration management
 SCM	source code management
 SCM	storage-class memory
@@ -1753,6 +1767,7 @@ WHEA	Windows hardware error architecture
 WIFI	wireless fidelity
 WLAN	wireless local area network
 WM	write miss
+WMF	Windows meta file
 WMI	Windows Management Instrumentation
 WOL	Wake-on-LAN
 WOM	Wake-on-Modem

Index: src/share/misc/bsd-family-tree
diff -u src/share/misc/bsd-family-tree:1.75.2.2 src/share/misc/bsd-family-tree:1.75.2.3
--- src/share/misc/bsd-family-tree:1.75.2.2	Tue Apr 28 18:06:24 2020
+++ src/share/misc/bsd-family-tree	Sun Jun 21 10:28:20 2020
@@ -493,7 +493,7 @@ Tenth   Edition         1989-10-xx [QCU]
 2.9BSD-Seismo		1985-08-xx [SMS]
 2.10BSD			1987-04-xx [KKK]
 2.10.1BSD		1989-01-xx [SMS]
-2.11BSD			1992-02-xx [SMS]
+2.11BSD			1991-03-14 [SMS]
 2.11BSD rev #430	1999-12-13 [SMS]
 
 32V			1978-1[01]-xx [QCU] 1979-03-26 [TUHS]
@@ -873,5 +873,5 @@ Steven M. Schultz for providing 2.8BSD, 
 Copyright (c) 1997-2012 Wolfram Schneider <wo...@freebsd.org>
 URL: https://svnweb.freebsd.org/base/head/share/misc/bsd-family-tree
 
-$FreeBSD: head/share/misc/bsd-family-tree 359561 2020-04-02 11:08:19Z sevan $
-$NetBSD: bsd-family-tree,v 1.75.2.2 2020/04/28 18:06:24 martin Exp $
+$FreeBSD: head/share/misc/bsd-family-tree 361673 2020-05-31 21:38:33Z imp $
+$NetBSD: bsd-family-tree,v 1.75.2.3 2020/06/21 10:28:20 martin Exp $

Reply via email to