From owner-p4-projects  Fri Feb 21  9:58:14 2003
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AD78A37B405; Fri, 21 Feb 2003 09:58:11 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5878137B401
	for <perforce@freebsd.org>; Fri, 21 Feb 2003 09:58:11 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0029F43F3F
	for <perforce@freebsd.org>; Fri, 21 Feb 2003 09:58:10 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h1LHwA0U096820
	for <perforce@freebsd.org>; Fri, 21 Feb 2003 09:58:10 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h1LHwAgq096816
	for perforce@freebsd.org; Fri, 21 Feb 2003 09:58:10 -0800 (PST)
Date: Fri, 21 Feb 2003 09:58:10 -0800 (PST)
Message-Id: <200302211758.h1LHwAgq096816@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 25538 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=25538

Change 25538 by rwatson@rwatson_tislabs on 2003/02/21 09:57:51

	Submerge changes due to conflicts in base tree.

Affected files ...

.. //depot/projects/trustedbsd/mac/sbin/disklabel/disklabel.8#13 integrate

Differences ...

==== //depot/projects/trustedbsd/mac/sbin/disklabel/disklabel.8#13 (text+ko) ====

@@ -501,7 +501,6 @@
 sectors/cylinder: 969
 cylinders: 1211
 sectors/unit: 1173930
-boot block size: 8192
 rpm: 3600
 interleave: 1
 trackskew: 0
@@ -543,11 +542,6 @@
 specifies that the drive can perform bad sector remapping.
 .It Nm sectors/unit
 describes the total size of the disk.  This value must be correct.
-.It Nm boot block size
-specifies the total length of the boot block allowable on the disk.
-This defaults to 8192, as it always has, but may be increased if there is
-more space available, with a UFS2 filesystem as the first partition or
-via other means.
 .It Nm the partition table
 This is the
 .Ux
@@ -786,7 +780,6 @@
 sectors/cylinder: 1008
 cylinders: 40633
 sectors/unit: 40959009
-boot block size: 8192
 rpm: 3600
 interleave: 1
 trackskew: 0

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message