no more ccd(4);

4 files changed, 12 insertions, 35 deletions

diff --git a/sbin/raidctl/raidctl.8 b/sbin/raidctl/raidctl.8
index c00be5d3bc0..6673acc99b9 100644
--- a/sbin/raidctl/raidctl.8
+++ b/sbin/raidctl/raidctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: raidctl.8,v 1.42 2010/04/01 17:06:55 jmc Exp $
+.\"	$OpenBSD: raidctl.8,v 1.43 2011/10/06 22:22:10 jmc Exp $
 .\"     $NetBSD: raidctl.8,v 1.24 2001/07/10 01:30:52 lukem Exp $
 .\"
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
 .\" any improvements or extensions that they make and grant Carnegie the
 .\" rights to redistribute these changes.
 .\"
-.Dd $Mdocdate: April 1 2010 $
+.Dd $Mdocdate: October 6 2011 $
 .Dt RAIDCTL 8
 .Os
 .Sh NAME
@@ -1345,7 +1345,6 @@ Files used by
 to configure arrays at startup.
 .El
 .Sh SEE ALSO
-.Xr ccd 4 ,
 .Xr raid 4 ,
 .Xr rc 8
 .Sh HISTORY
diff --git a/share/man/man4/raid.4 b/share/man/man4/raid.4
index 7445c6fb384..788ad9d2d8e 100644
--- a/share/man/man4/raid.4
+++ b/share/man/man4/raid.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: raid.4,v 1.31 2010/04/01 17:06:55 jmc Exp $
+.\"	$OpenBSD: raid.4,v 1.32 2011/10/06 22:22:11 jmc Exp $
 .\"     $NetBSD: raid.4,v 1.20 2001/09/22 16:03:58 wiz Exp $
 .\"
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
 .\" any improvements or extensions that they make and grant Carnegie the
 .\" rights to redistribute these changes.
 .\"
-.Dd $Mdocdate: April 1 2010 $
+.Dd $Mdocdate: October 6 2011 $
 .Dt RAID 4
 .Os
 .Sh NAME
@@ -296,7 +296,6 @@ option	RAIDDEBUG
 device special files.
 .El
 .Sh SEE ALSO
-.Xr ccd 4 ,
 .Xr sd 4 ,
 .Xr wd 4 ,
 .Xr config 8 ,
diff --git a/share/man/man8/intro.8 b/share/man/man8/intro.8
index c5f1c565d8d..508d5b6d2fc 100644
--- a/share/man/man8/intro.8
+++ b/share/man/man8/intro.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.8,v 1.20 2011/09/20 21:48:35 ajacoutot Exp $
+.\"	$OpenBSD: intro.8,v 1.21 2011/10/06 22:22:11 jmc Exp $
 .\"	$NetBSD: intro.8,v 1.3 1994/11/30 19:36:24 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)intro.8	8.2 (Berkeley) 12/11/93
 .\"
-.Dd $Mdocdate: September 20 2011 $
+.Dd $Mdocdate: October 6 2011 $
 .Dt INTRO 8
 .Os
 .Sh NAME
@@ -172,22 +172,6 @@ Relevant
 .Xr rc.conf 8
 variables:
 .Va ntpd_flags .
-.Ss Concatenated disks (ccd)
-If you are using
-.Xr ccd 4
-concatenated disks, edit
-.Pa /etc/ccd.conf .
-Use the
-.Ic ccdconfig -U
-command to unload and the
-.Ic ccdconfig -C
-command to create tables internal to the kernel for the concatenated disks.
-You then
-.Xr mount 8 ,
-.Xr umount 8 ,
-and edit
-.Pa /etc/fstab
-as needed.
 .Ss BOOTP/DHCP server
 If this is a
 BOOTP or DHCP
diff --git a/share/man/man9/disk.9 b/share/man/man9/disk.9
index aee90d70582..931c36629c9 100644
--- a/share/man/man9/disk.9
+++ b/share/man/man9/disk.9
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: disk.9,v 1.29 2010/11/17 15:01:05 bluhm Exp $
+.\"	$OpenBSD: disk.9,v 1.30 2011/10/06 22:22:11 jmc Exp $
 .\"	$NetBSD: disk.9,v 1.2 1996/04/08 20:41:25 jtc Exp $
 .\"
 .\" Copyright (c) 1995, 1996 Jason R. Thorpe.
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 17 2010 $
+.Dd $Mdocdate: October 6 2011 $
 .Dt DISK 9
 .Os
 .Sh NAME
@@ -108,12 +108,10 @@ This list, called
 .Nm disklist ,
 may grow or shrink over time as disks are dynamically added and removed
 from the system.
-Drivers which currently make use of the detachment
-capability of the framework are the
-.Xr ccd 4
-and
+An example of a driver which currently makes use of the detachment
+capability of the framework is the
 .Xr vnd 4
-pseudo-device drivers.
+pseudo-device driver.
 .Pp
 The following is a brief description of each function in the framework:
 .Bl -tag -width "disk_unbusy()"
@@ -347,18 +345,15 @@ and
 .Pp
 The
 .Ox
-.Xr ccd 4 ,
 .Xr raid 4
 and
 .Xr vnd 4
 drivers utilize the detachment capability of the framework.
 They are located in
-.Pa sys/dev/ccd.c ,
-.Pa sys/dev/raidframe/ ,
+.Pa sys/dev/raidframe/
 and
 .Pa sys/dev/vnd.c .
 .Sh SEE ALSO
-.Xr ccd 4 ,
 .Xr raid 4 ,
 .Xr vnd 4 ,
 .Xr spl 9