cdrom/CDROM -> CD-ROM;

7 files changed, 15 insertions, 15 deletions

diff --git a/share/man/man4/pcmcia.4 b/share/man/man4/pcmcia.4
index c924586d5ef..2222b966f2c 100644
--- a/share/man/man4/pcmcia.4
+++ b/share/man/man4/pcmcia.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pcmcia.4,v 1.38 2005/02/21 21:48:32 jsg Exp $
+.\"	$OpenBSD: pcmcia.4,v 1.39 2005/03/11 23:03:58 jmc Exp $
 .\"	$NetBSD: pcmcia.4,v 1.4 1998/06/07 09:10:30 enami Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -114,7 +114,7 @@ Adaptec APA-14[56]0 and NewMedia BusToaster SCSI controller cards.
 .Bl -tag -width 12n -offset ind -compact
 .It Xr wdc 4
 Devices which implement an ATA/IDE interface, such as mini disk drives,
-CDROMs.
+CD-ROMs.
 This includes Compact Flash cards which emulate a disk drive.
 .El
 .Pp
diff --git a/share/man/man5/bsd.port.mk.5 b/share/man/man5/bsd.port.mk.5
index f42ec987ac7..7c423b3c513 100644
--- a/share/man/man5/bsd.port.mk.5
+++ b/share/man/man5/bsd.port.mk.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bsd.port.mk.5,v 1.156 2004/12/02 21:55:23 jmc Exp $
+.\" $OpenBSD: bsd.port.mk.5,v 1.157 2005/03/11 23:03:58 jmc Exp $
 .\"
 .\" Copyright (c) 2000 Marc Espie
 .\"
@@ -628,7 +628,7 @@ if
 is set.
 .It Ev CDROM_PACKAGES
 User settings.
-Base location where packages suitable for a CDROM (see
+Base location where packages suitable for a CD-ROM (see
 PERMIT_PACKAGE_CDROM) will be placed
 (default: ${PKGREPOSITORYBASE}/cdrom)
 .It Ev CDROM_SITE
@@ -1917,7 +1917,7 @@ MASTER_SITES0=ftp://ftp.zoinx.org/pub/
 .It Ev PERMIT_{DISTFILES,PACKAGE}_{CDROM,FTP}
 Set to
 .Sq Yes
-if package or distribution files can be allowed on ftp sites or cdrom without
+if package or distribution files can be allowed on ftp sites or CD-ROM without
 legal issues.
 Set to reason not to otherwise.
 PERMIT_* lines in the Makefile should be preceded with a comment explaining
diff --git a/share/man/man7/mirroring-ports.7 b/share/man/man7/mirroring-ports.7
index d9984a7a94a..d90a53e1a17 100644
--- a/share/man/man7/mirroring-ports.7
+++ b/share/man/man7/mirroring-ports.7
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mirroring-ports.7,v 1.13 2004/04/27 12:00:03 jmc Exp $
+.\" $OpenBSD: mirroring-ports.7,v 1.14 2005/03/11 23:03:58 jmc Exp $
 .\"
 .\" Copyright (c) 2000 Marc Espie
 .\"
@@ -82,7 +82,7 @@ Targets
 .Ar ftp
 and
 .Ar cdrom
-can be used to retrieve all distfiles necessary to build ftp and cdrom
+can be used to retrieve all distfiles necessary to build ftp and CD-ROM
 packages, respectively.
 Actual fetching is usually invoked with a parallel-make option, so that
 several retrievals through ftp can proceed simultaneously.
diff --git a/share/man/man8/compat_ibcs2.8 b/share/man/man8/compat_ibcs2.8
index e78ed1807c6..febf0b07044 100644
--- a/share/man/man8/compat_ibcs2.8
+++ b/share/man/man8/compat_ibcs2.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: compat_ibcs2.8,v 1.14 2003/08/23 19:26:25 tedu Exp $
+.\"	$OpenBSD: compat_ibcs2.8,v 1.15 2005/03/11 23:03:58 jmc Exp $
 .\"
 .\" Copyright (c) 1998 Scott Bartram
 .\" Copyright (c) 1995 Frank van der Linden
@@ -167,7 +167,7 @@ obtained from an SCO distribution.
 As of January 1998, SCO sells a copy of SCO OpenServer (iBCS2) and/or
 SCO UnixWare (SVR4) for personal/non-commercial use for only the cost
 of shipping (about $20US).
-The distribution comes on an ISO9660-format CDROM which can be mounted
+The distribution comes on an ISO9660-format CD-ROM which can be mounted
 and used to copy the necessary files.
 .Sh BUGS
 The information about SCO distributions may become outdated.
diff --git a/share/man/man8/compat_linux.8 b/share/man/man8/compat_linux.8
index 95904b8e2d3..948c993ab25 100644
--- a/share/man/man8/compat_linux.8
+++ b/share/man/man8/compat_linux.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: compat_linux.8,v 1.35 2003/09/07 21:00:41 jmc Exp $
+.\"	$OpenBSD: compat_linux.8,v 1.36 2005/03/11 23:03:58 jmc Exp $
 .\"	$NetBSD: compat_linux.8,v 1.2 1995/10/16 20:17:59 fvdl Exp $
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -380,7 +380,7 @@ Only the DSP device is emulated, the following link should be created:
 .Pp
 .D1 /emul/linux/dev/dsp -> /dev/audio
 .Ss Other links Linux binaries may require
-CD-ROM support requires a link to the cdrom device, similar to:
+CD-ROM support requires a link to the CD-ROM device, similar to:
 .Pp
 .D1 /emul/linux/dev/cdrom -> /dev/cd0a   (first CD-ROM)
 .Ss File systems
diff --git a/share/man/man8/man8.sparc/boot_sparc.8 b/share/man/man8/man8.sparc/boot_sparc.8
index ff1bcd934c2..bb78c269074 100644
--- a/share/man/man8/man8.sparc/boot_sparc.8
+++ b/share/man/man8/man8.sparc/boot_sparc.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot_sparc.8,v 1.11 2004/12/27 16:41:15 miod Exp $
+.\"	$OpenBSD: boot_sparc.8,v 1.12 2005/03/11 23:03:59 jmc Exp $
 .\"	$NetBSD: boot_sparc.8,v 1.4 1995/04/25 11:37:25 pk Exp $
 .\"
 .\" Copyright (c) 1992, 1993
@@ -59,7 +59,7 @@ or
 .Dq xy
 disk, or an
 .Tn SCSI
-cdrom
+CD-ROM
 .Pq Dq cd
 or tape drive
 .Pq Dq st .
diff --git a/share/man/man8/man8.sparc64/boot_sparc64.8 b/share/man/man8/man8.sparc64/boot_sparc64.8
index 208d4e6d8e2..7a004f035f0 100644
--- a/share/man/man8/man8.sparc64/boot_sparc64.8
+++ b/share/man/man8/man8.sparc64/boot_sparc64.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot_sparc64.8,v 1.9 2004/12/27 16:41:15 miod Exp $
+.\"	$OpenBSD: boot_sparc64.8,v 1.10 2005/03/11 23:03:59 jmc Exp $
 .\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -54,7 +54,7 @@ which must currently be an
 .Pq Dq sd
 or IDE
 .Pq Dq wd
-disk drive, or a cdrom
+disk drive, or a CD-ROM
 .Pq Dq cd ,
 or an
 .Tn SCSI