Move GPS, OTS, and the "trademark" definition of TM from acronyms.comp

to acronyms. (OTS is maybe debatable, but COTS is in acronyms and the
two should clearly be together.)

share/misc/acronyms

@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.201 2011/02/10 19:25:42 jruoho Exp $
+$NetBSD: acronyms,v 1.202 2011/02/12 19:32:42 dholland Exp $
 10Q	thank you
 10X	thanks
 1337	elite ("leet")
@@ -144,6 +144,7 @@ GJ	good job
 GL	good luck
 GLHF	good luck, have fun
 GMTA	great minds think alike
+GPS	global positioning system
 GR8	great
 GTFO	get the fuck out
 GTG	got to go
@@ -263,6 +264,7 @@ OOI	out of interest
 OT	off topic
 OTL	out to lunch
 OTOH	on the other hand
+OTS	off the shelf
 OTT	over the top
 OTTOMH	off the top of my head
 OWTTE	or words to that effect
@@ -350,6 +352,7 @@ TINC	there is no cabal
 TLA	three letter acronym
 TLC	tender loving care
 TLDR	too long, didn't read
+TM	trademark
 TMA	too many abbreviations
 TMG	too much government
 TMI	too much information

share/misc/acronyms.comp

@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.117 2011/02/10 17:52:18 jruoho Exp $
+$NetBSD: acronyms.comp,v 1.118 2011/02/12 19:32:42 dholland Exp $
 
 3WHS	three-way handshake
 ABI	application binary interface
@@ -246,7 +246,6 @@ GOT	global offset table
 GPE	general purpose event
 GPF	general protection fault
 GPL	GNU/general public license
-GPS	global positioning system
 GPU	graphics processing unit
 GRE	generic routing encapsulation
 GSI	global system interrupt
@@ -477,7 +476,6 @@ OSS	open source software
 OSS	open sound system
 OSVW	operating system visible workarounds
 OTP	one time password
-OTS	off the shelf
 OUI	organizationally unique identifier
 OWL	Web ontology language
 P2P	peer to peer
@@ -676,7 +674,6 @@ TLB	transition lookaside buffer
 TLD	top level domain
 TLS	transport layer security
 TLS	thread local storage
-TM	trademark
 TM	Turing machine
 TMDS	transition minimized differential signaling
 TMO	timeout