use correct capitalization of 'BlackBerry'

"sure" deraadt@

11 files changed, 28 insertions, 28 deletions

diff --git a/share/man/man4/uberry.4 b/share/man/man4/uberry.4
index 563bd071b83..767e3a47177 100644
--- a/share/man/man4/uberry.4
+++ b/share/man/man4/uberry.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: uberry.4,v 1.5 2007/08/31 14:54:29 jmc Exp $
+.\" $OpenBSD: uberry.4,v 1.6 2015/04/02 14:24:02 jasper Exp $
 .\"
 .\" Copyright (c) 2006 Theo de Raadt <deraadt@openbsd.org>
 .\"
@@ -14,19 +14,19 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: August 31 2007 $
+.Dd $Mdocdate: April 2 2015 $
 .Dt UBERRY 4
 .Os
 .Sh NAME
 .Nm uberry
-.Nd Research In Motion Blackberry
+.Nd Research In Motion BlackBerry
 .Sh SYNOPSIS
 .Cd "uberry*     at uhub?"
 .Sh DESCRIPTION
 The
 .Nm
 driver provides the most minimal support for the USB-connected
-Research In Motion Blackberry devices, permitting them to be
+Research In Motion BlackBerry devices, permitting them to be
 charged and powered from a USB port.
 .Sh SEE ALSO
 .Xr uhub 4 ,
diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4
index 0c4a2f19c76..4195da214c1 100644
--- a/share/man/man4/usb.4
+++ b/share/man/man4/usb.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: usb.4,v 1.163 2015/02/15 22:26:45 bentley Exp $
+.\"	$OpenBSD: usb.4,v 1.164 2015/04/02 14:24:02 jasper Exp $
 .\"	$NetBSD: usb.4,v 1.15 1999/07/29 14:20:32 augustss Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 15 2015 $
+.Dd $Mdocdate: April 2 2015 $
 .Dt USB 4
 .Os
 .Sh NAME
@@ -276,7 +276,7 @@ YUREX USB twitch/jiggle of knee sensor
 .Ss Miscellaneous devices
 .Bl -tag -width 12n -offset ind -compact
 .It Xr uberry 4
-Research In Motion Blackberry
+Research In Motion BlackBerry
 .It Xr ugen 4
 USB generic device support
 .It Xr ugl 4
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index c096b09fb19..1ebb8a6e065 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.385 2015/03/24 12:00:39 dlg Exp $
+#	$OpenBSD: GENERIC,v 1.386 2015/04/02 14:24:02 jasper Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -244,7 +244,7 @@ url*	at uhub?		# Realtek RTL8150L based adapters
 wi*	at uhub?		# WaveLAN IEEE 802.11DS
 udsbr*	at uhub?		# D-Link DSB-R100 radio
 radio*	at udsbr?		# USB radio
-uberry*	at uhub?		# Research In Motion Blackberry
+uberry*	at uhub?		# Research In Motion BlackBerry
 ugen*	at uhub?		# USB Generic driver
 uath*	at uhub?		# Atheros AR5005UG/AR5005UX
 ural*	at uhub?		# Ralink RT2500USB
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index ded36109522..2fd961201e3 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.795 2015/03/24 12:00:39 dlg Exp $
+#	$OpenBSD: GENERIC,v 1.796 2015/04/02 14:24:02 jasper Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -297,7 +297,7 @@ url*	at uhub?		# Realtek RTL8150L based adapters
 wi*	at uhub?		# WaveLAN IEEE 802.11DS
 udsbr*	at uhub?		# D-Link DSB-R100 radio
 radio*	at udsbr?		# USB radio
-uberry*	at uhub?		# Research In Motion Blackberry
+uberry*	at uhub?		# Research In Motion BlackBerry
 ugen*	at uhub?		# USB Generic driver
 uath*	at uhub?		# Atheros AR5005UG/AR5005UX
 ural*	at uhub?		# Ralink RT2500USB
diff --git a/sys/arch/loongson/conf/GENERIC b/sys/arch/loongson/conf/GENERIC
index d23e390c199..7b8922e67d8 100644
--- a/sys/arch/loongson/conf/GENERIC
+++ b/sys/arch/loongson/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.48 2015/01/04 20:55:38 uaa Exp $
+#	$OpenBSD: GENERIC,v 1.49 2015/04/02 14:24:02 jasper Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -160,7 +160,7 @@ rsu*		at uhub?	# Realtek RTL8188SU/RTL8191SU/RTL8192SU
 urtwn*		at uhub?	# Realtek RTL8188CU/RTL8192CU
 wi*		at uhub?	# WaveLAN IEEE 802.11DS
 zyd*		at uhub?	# Zydas ZD1211
-uberry*		at uhub?	# Research In Motion Blackberry 
+uberry*		at uhub?	# Research In Motion BlackBerry 
 udcf*		at uhub?	# Gude Expert mouseCLOCK
 uthum*		at uhidev?	# TEMPerHUM sensor
 ugold*		at uhidev?	# gold TEMPer sensor
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 62b0d89007d..374d5471763 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.247 2015/03/24 12:00:39 dlg Exp $g
+#	$OpenBSD: GENERIC,v 1.248 2015/04/02 14:24:02 jasper Exp $g
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -271,7 +271,7 @@ url*	at uhub?		# Realtek RTL8150L based adapters
 wi*	at uhub?		# WaveLAN IEEE 802.11DS
 udsbr*	at uhub?		# D-Link DSB-R100 radio
 radio*	at udsbr?		# USB radio
-uberry*	at uhub?		# Research In Motion Blackberry
+uberry*	at uhub?		# Research In Motion BlackBerry
 ugen*	at uhub?		# USB Generic driver
 uath*	at uhub?		# Atheros AR5005UG/AR5005UX
 ural*	at uhub?		# Ralink RT2500USB
diff --git a/sys/dev/usb/files.usb b/sys/dev/usb/files.usb
index 89c67bad0a0..4c270b80ef6 100644
--- a/sys/dev/usb/files.usb
+++ b/sys/dev/usb/files.usb
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.usb,v 1.121 2015/01/03 20:22:56 uaa Exp $
+#	$OpenBSD: files.usb,v 1.122 2015/04/02 14:24:02 jasper Exp $
 #	$NetBSD: files.usb,v 1.16 2000/02/14 20:29:54 augustss Exp $
 #
 # Config file and device description for machine-independent USB code.
@@ -420,7 +420,7 @@ device	uow: onewirebus
 attach	uow at uhub
 file	dev/usb/uow.c			uow
 
-# Research In Motion Blackberry
+# Research In Motion BlackBerry
 device	uberry {}
 attach	uberry at uhub
 file	dev/usb/uberry.c		uberry
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 287eedfaebf..7e119919539 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.645 2015/02/16 14:51:44 sthen Exp $
+$OpenBSD: usbdevs,v 1.646 2015/04/02 14:24:02 jasper Exp $
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
 /*
@@ -3520,9 +3520,9 @@ product REALTEK RTL8192SU	0xc512	RTL8192SU
 product RENESAS RX610		0x0053	RX610 RX-Stick
 
 /* Research In Motion products */
-product RIM BLACKBERRY		0x0001	Blackberry
+product RIM BLACKBERRY		0x0001	BlackBerry
 product RIM PEARL_DUAL		0x0004	RIM Mass Storage Device
-product RIM PEARL		0x0006	Blackberry pearl
+product RIM PEARL		0x0006	BlackBerry pearl
 
 /* Ricoh products */
 product RICOH VGPVCC2		0x1830	VGP-VCC2 Camera
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index e8b37653376..bfa74ccd545 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbdevs.h,v 1.657 2015/02/16 14:51:58 sthen Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.658 2015/04/02 14:24:02 jasper Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -3527,9 +3527,9 @@
 #define	USB_PRODUCT_RENESAS_RX610	0x0053		/* RX610 RX-Stick */
 
 /* Research In Motion products */
-#define	USB_PRODUCT_RIM_BLACKBERRY	0x0001		/* Blackberry */
+#define	USB_PRODUCT_RIM_BLACKBERRY	0x0001		/* BlackBerry */
 #define	USB_PRODUCT_RIM_PEARL_DUAL	0x0004		/* RIM Mass Storage Device */
-#define	USB_PRODUCT_RIM_PEARL	0x0006		/* Blackberry pearl */
+#define	USB_PRODUCT_RIM_PEARL	0x0006		/* BlackBerry pearl */
 
 /* Ricoh products */
 #define	USB_PRODUCT_RICOH_VGPVCC2	0x1830		/* VGP-VCC2 Camera */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index bad5d902388..289503c6ffb 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.651 2015/02/16 14:51:58 sthen Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.652 2015/04/02 14:24:02 jasper Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -8727,7 +8727,7 @@ const struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_RIM, USB_PRODUCT_RIM_BLACKBERRY,
-	    "Blackberry",
+	    "BlackBerry",
 	},
 	{
 	    USB_VENDOR_RIM, USB_PRODUCT_RIM_PEARL_DUAL,
@@ -8735,7 +8735,7 @@ const struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_RIM, USB_PRODUCT_RIM_PEARL,
-	    "Blackberry pearl",
+	    "BlackBerry pearl",
 	},
 	{
 	    USB_VENDOR_RICOH, USB_PRODUCT_RICOH_VGPVCC2,
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index a8d9032c54e..cc732be9692 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sd.c,v 1.259 2015/03/08 20:49:38 krw Exp $	*/
+/*	$OpenBSD: sd.c,v 1.260 2015/04/02 14:24:02 jasper Exp $	*/
 /*	$NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $	*/
 
 /*-
@@ -203,7 +203,7 @@ sdattach(struct device *parent, struct device *self, void *aux)
 		scsi_start(sc_link, SSS_START, sd_autoconf);
 
 	/*
-	 * Some devices (e.g. Blackberry Pearl) won't admit they have
+	 * Some devices (e.g. BlackBerry Pearl) won't admit they have
 	 * media loaded unless its been locked in.
 	 */
 	if ((sc_link->flags & SDEV_REMOVABLE) != 0)