From b5c508fba33452c36601090d080ddc688efad870 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Tue, 14 Nov 2000 11:20:58 +0000 Subject: Use Fx macro wherever possible. --- sbin/adjkerntz/adjkerntz.8 | 2 +- sbin/bsdlabel/bsdlabel.8 | 34 ++++++++++++++++++++++++++-------- sbin/cxconfig/cxconfig.8 | 6 +++--- sbin/disklabel/disklabel.8 | 34 ++++++++++++++++++++++++++-------- sbin/fdisk/fdisk.8 | 16 ++++++++-------- sbin/fdisk_pc98/fdisk.8 | 16 ++++++++-------- sbin/i386/cxconfig/cxconfig.8 | 6 +++--- sbin/i386/fdisk/fdisk.8 | 16 ++++++++-------- sbin/i386/nextboot/nextboot.8 | 2 +- sbin/ldconfig/ldconfig.8 | 3 ++- sbin/mount_hpfs/mount_hpfs.8 | 3 ++- sbin/mount_union/mount_union.8 | 3 ++- sbin/mount_unionfs/mount_unionfs.8 | 3 ++- sbin/nextboot/nextboot.8 | 2 +- sbin/pc98/fdisk/fdisk.8 | 16 ++++++++-------- sbin/vinum/vinum.8 | 8 ++++++-- 16 files changed, 107 insertions(+), 63 deletions(-) (limited to 'sbin') diff --git a/sbin/adjkerntz/adjkerntz.8 b/sbin/adjkerntz/adjkerntz.8 index 48b89fe813d9..15a99e2aa84e 100644 --- a/sbin/adjkerntz/adjkerntz.8 +++ b/sbin/adjkerntz/adjkerntz.8 @@ -47,7 +47,7 @@ file system. The main purpose of this thing is not general fixing of initially broken MS-DOS file timestamp idea but keeping the same timestamps between -.Bx Free +.Fx MS-DOS file system and MS-DOS operating system installed on the same machine. diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8 index 3b9e1395c3b3..13aa183da191 100644 --- a/sbin/bsdlabel/bsdlabel.8 +++ b/sbin/bsdlabel/bsdlabel.8 @@ -221,13 +221,17 @@ itself must be provided as the canonical name, i.e. not as a full path name. .Pp PC-based systems have special requirements in order for the BIOS to properly -recognize a FreeBSD disklabel. Older systems may require what is known as a +recognize a +.Fx +disklabel. Older systems may require what is known as a .Dq dangerously dedicated disklabel, which creates a fake DOS partition to work around problems older BIOSes have with modern disk geometries. On newer systems you generally want to create a normal DOS slice using .Ar fdisk -and then create a FreeBSD disklabel within that slice. This is described +and then create a +.Fx +disklabel within that slice. This is described later on in this page. .Pp Installing a new disklabel does not in of itself allow your system to boot @@ -303,7 +307,9 @@ the slice name such as .Pa da0s1 . Making a partition bootable can be tricky. If you are using a normal DOS slice you typically install (or leave) a standard MBR on the base disk and -then install the FreeBSD bootblocks in the slice. +then install the +.Fx +bootblocks in the slice. .Pp .Nm disklabel .Fl B @@ -403,17 +409,25 @@ on architectures like the Alpha, where only a single-stage boot is used). .Pp To initialize a disk from scratch the following sequence is recommended. Please note that this will wipe everything that was previously on the disk, -including any non-FreeBSD slices. +including any +.No non- Ns Fx +slices. .Bl -enum .It Use .Ar fdisk to initialize the DOS partition table, creating a real whole-disk slice to -hold the FreeBSD disklabel, and installing a master boot record. +hold the +.Fx +disklabel, and installing a master boot record. .It Use .Ar disklabel -to initialize a virgin FreeBSD disklabel and install FreeBSD boot blocks . +to initialize a virgin +.Fx +disklabel and install +.Fx +boot blocks. .It Use .Ar disklabel @@ -507,7 +521,9 @@ Flags may be or .Ar badsect . .Ar removable -is set for removable media drives, but no current FreeBSD driver evaluates this +is set for removable media drives, but no current +.Fx +driver evaluates this flag. .Ar ecc is no longer supported; @@ -559,7 +575,9 @@ Display the in-core label for .Pa da0s1 as obtained via .Pa /dev/da0s1 . -When reading a label, FreeBSD will allow you to specify the base disk name +When reading a label, +.Fx +will allow you to specify the base disk name even if the label resides on a slice. However, to be proper you should specify the base disk name only if you are using a .Dq dangerously-dedicated diff --git a/sbin/cxconfig/cxconfig.8 b/sbin/cxconfig/cxconfig.8 index 066c4e95e9a0..5b6d7cb0ccce 100644 --- a/sbin/cxconfig/cxconfig.8 +++ b/sbin/cxconfig/cxconfig.8 @@ -277,7 +277,7 @@ Frame address registers for address recognition. .El .Sh EXAMPLES Set up the channel 7 of the adapter Sigma-400 under -.Bx Free . +.Fx . Physical 4-wire leased line with Zelax+ M115 short-range modems. Synchronous mode, 128000 bits/sec, interface RS-232, protocol PpP/HDLC without keepalive support, NRZI encoding, @@ -288,7 +288,7 @@ ifconfig cx7 158.250.244.2 158.250.244.1 up .Ed .Pp Set up the channel 0 of the adapter Sigma-100 under -.Bx Free . +.Fx . Attachment to the near computer by short cable, internal clock source. Synchronous mode, 256000 bits/sec, interface RS-232, protocol Cisco/HDLC with keepalive support: @@ -306,7 +306,7 @@ ifconfig cx1 193.124.254.50 193.124.254.49 multicast up .Ed .Pp Set up the channel 0 of the adapter Sigma-840 under -.Bx Free . +.Fx . Attachment to the Cisco-4000 router by null-modem cable, internal clock source. Synchronous mode, 64000 bits/sec, interface RS-232, protocol PpP/HDLC with keepalive support and flow control, diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8 index 3b9e1395c3b3..13aa183da191 100644 --- a/sbin/disklabel/disklabel.8 +++ b/sbin/disklabel/disklabel.8 @@ -221,13 +221,17 @@ itself must be provided as the canonical name, i.e. not as a full path name. .Pp PC-based systems have special requirements in order for the BIOS to properly -recognize a FreeBSD disklabel. Older systems may require what is known as a +recognize a +.Fx +disklabel. Older systems may require what is known as a .Dq dangerously dedicated disklabel, which creates a fake DOS partition to work around problems older BIOSes have with modern disk geometries. On newer systems you generally want to create a normal DOS slice using .Ar fdisk -and then create a FreeBSD disklabel within that slice. This is described +and then create a +.Fx +disklabel within that slice. This is described later on in this page. .Pp Installing a new disklabel does not in of itself allow your system to boot @@ -303,7 +307,9 @@ the slice name such as .Pa da0s1 . Making a partition bootable can be tricky. If you are using a normal DOS slice you typically install (or leave) a standard MBR on the base disk and -then install the FreeBSD bootblocks in the slice. +then install the +.Fx +bootblocks in the slice. .Pp .Nm disklabel .Fl B @@ -403,17 +409,25 @@ on architectures like the Alpha, where only a single-stage boot is used). .Pp To initialize a disk from scratch the following sequence is recommended. Please note that this will wipe everything that was previously on the disk, -including any non-FreeBSD slices. +including any +.No non- Ns Fx +slices. .Bl -enum .It Use .Ar fdisk to initialize the DOS partition table, creating a real whole-disk slice to -hold the FreeBSD disklabel, and installing a master boot record. +hold the +.Fx +disklabel, and installing a master boot record. .It Use .Ar disklabel -to initialize a virgin FreeBSD disklabel and install FreeBSD boot blocks . +to initialize a virgin +.Fx +disklabel and install +.Fx +boot blocks. .It Use .Ar disklabel @@ -507,7 +521,9 @@ Flags may be or .Ar badsect . .Ar removable -is set for removable media drives, but no current FreeBSD driver evaluates this +is set for removable media drives, but no current +.Fx +driver evaluates this flag. .Ar ecc is no longer supported; @@ -559,7 +575,9 @@ Display the in-core label for .Pa da0s1 as obtained via .Pa /dev/da0s1 . -When reading a label, FreeBSD will allow you to specify the base disk name +When reading a label, +.Fx +will allow you to specify the base disk name even if the label resides on a slice. However, to be proper you should specify the base disk name only if you are using a .Dq dangerously-dedicated diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8 index 71b01c83f609..68cc63e08f79 100644 --- a/sbin/fdisk/fdisk.8 +++ b/sbin/fdisk/fdisk.8 @@ -40,7 +40,7 @@ program can be used to divide space on the disk into partitions and set one .Em active . .Sh DESCRIPTION The -.Bx Free +.Fx program .Nm serves a similar purpose to the DOS program. The first form is used to @@ -171,7 +171,7 @@ The second partition overlaps the end of the first. .Bl -tag -width "cyl, sector and head" .It Em "sysid" is used to label the partition. -.Bx Free +.Fx reserves the magic number 165 decimal (A5 in hex). .It Em "start and size" @@ -244,7 +244,7 @@ While the .Fl i flag is used to "initialize" sector 0; it will setup the last BIOS partition to use the whole disk for -.Bx Free ; +.Fx ; and make it active. .Sh NOTES The automatic calculation of starting cylinder etc. uses @@ -257,7 +257,7 @@ that use geometry translation under the BIOS. .Pp If you hand craft your disk layout, please make sure that the -.Bx Free +.Fx partition starts on a cylinder boundary. A number of decisions made later may assume this. (This might not be necessary later.) @@ -324,7 +324,7 @@ It is an error if the following is not true: .Pp The number of cylinders should be less than or equal to 1024, but this is not enforced, although a warning will be output. Note that bootable -.Bx Free +.Fx partitions (the "/" filesystem) must lie completely within the first 1024 cylinders; if this is not true, booting may fail. Non-bootable partitions do not have this restriction. @@ -368,7 +368,7 @@ if one is present. The .Ar type is 165 for -.Bx Free +.Fx partitions. Specifying a partition type of zero is the same as clearing the partition and marking it as unused; however, dummy values (such as "0") must still be specified for @@ -386,7 +386,7 @@ p 4 0 0 0 .Ed .Pp Example: to set partition 1 to a -.Bx Free +.Fx partition, starting at sector 1 for 2503871 sectors (note: these numbers will be rounded upwards and downwards to correspond to head and cylinder boundaries): @@ -429,7 +429,7 @@ is used where it should actually be in order to conform with the terms used elsewhere. .Pp You cannot use this command to completely dedicate a disk to -.Bx Free . +.Fx . The .Xr disklabel 8 command must be used for this. diff --git a/sbin/fdisk_pc98/fdisk.8 b/sbin/fdisk_pc98/fdisk.8 index fcc4eb5eee18..0f48fa6ebe0f 100644 --- a/sbin/fdisk_pc98/fdisk.8 +++ b/sbin/fdisk_pc98/fdisk.8 @@ -41,7 +41,7 @@ program can be used to divide space on the disk into partitions and set one .Em active . .Sh DESCRIPTION The -.Bx Free +.Fx program .Nm serves a similar purpose to the DOS program. The first form is used to @@ -197,7 +197,7 @@ The second partition overlaps the end of the first. .Bl -tag -width "cyl, sector and head" .It Em "sysmid" is used to label the partition. -.Bx Free +.Fx reserves the magic number 148 decimal (94 in hex). .It Em "start and size" @@ -272,7 +272,7 @@ While the .Fl i flag is used to "initialize" sector 0; it will setup the last BIOS partition to use the whole disk for -.Bx Free ; +.Fx ; and make it active. .Sh NOTES The automatic calculation of starting cylinder etc. uses @@ -285,7 +285,7 @@ that use geometry translation under the BIOS. .Pp If you hand craft your disk layout, please make sure that the -.Bx Free +.Fx partition starts on a cylinder boundary. A number of decisions made later may assume this. (This might not be necessary later.) @@ -352,7 +352,7 @@ It is an error if the following is not true: .Pp The number of cylinders should be less than or equal to 1024, but this is not enforced, although a warning will be output. Note that bootable -.Bx Free +.Fx partitions (the "/" filesystem) must lie completely within the first 1024 cylinders; if this is not true, booting may fail. Non-bootable partitions do not have this restriction. @@ -396,7 +396,7 @@ if one is present. The .Ar type is 165 for -.Bx Free +.Fx partitions. Specifying a partition type of zero is the same as clearing the partition and marking it as unused; however, dummy values (such as "0") must still be specified for @@ -414,7 +414,7 @@ p 4 0 0 0 .Ed .Pp Example: to set partition 1 to a -.Bx Free +.Fx partition, starting at sector 1 for 2503871 sectors (note: these numbers will be rounded upwards and downwards to correspond to head and cylinder boundaries): @@ -455,7 +455,7 @@ is used where it should actually be in order to conform with the terms used elsewhere. .Pp You cannot use this command to completely dedicate a disk to -.Bx Free . +.Fx . The .Xr disklabel 8 command must be used for this. diff --git a/sbin/i386/cxconfig/cxconfig.8 b/sbin/i386/cxconfig/cxconfig.8 index 066c4e95e9a0..5b6d7cb0ccce 100644 --- a/sbin/i386/cxconfig/cxconfig.8 +++ b/sbin/i386/cxconfig/cxconfig.8 @@ -277,7 +277,7 @@ Frame address registers for address recognition. .El .Sh EXAMPLES Set up the channel 7 of the adapter Sigma-400 under -.Bx Free . +.Fx . Physical 4-wire leased line with Zelax+ M115 short-range modems. Synchronous mode, 128000 bits/sec, interface RS-232, protocol PpP/HDLC without keepalive support, NRZI encoding, @@ -288,7 +288,7 @@ ifconfig cx7 158.250.244.2 158.250.244.1 up .Ed .Pp Set up the channel 0 of the adapter Sigma-100 under -.Bx Free . +.Fx . Attachment to the near computer by short cable, internal clock source. Synchronous mode, 256000 bits/sec, interface RS-232, protocol Cisco/HDLC with keepalive support: @@ -306,7 +306,7 @@ ifconfig cx1 193.124.254.50 193.124.254.49 multicast up .Ed .Pp Set up the channel 0 of the adapter Sigma-840 under -.Bx Free . +.Fx . Attachment to the Cisco-4000 router by null-modem cable, internal clock source. Synchronous mode, 64000 bits/sec, interface RS-232, protocol PpP/HDLC with keepalive support and flow control, diff --git a/sbin/i386/fdisk/fdisk.8 b/sbin/i386/fdisk/fdisk.8 index 71b01c83f609..68cc63e08f79 100644 --- a/sbin/i386/fdisk/fdisk.8 +++ b/sbin/i386/fdisk/fdisk.8 @@ -40,7 +40,7 @@ program can be used to divide space on the disk into partitions and set one .Em active . .Sh DESCRIPTION The -.Bx Free +.Fx program .Nm serves a similar purpose to the DOS program. The first form is used to @@ -171,7 +171,7 @@ The second partition overlaps the end of the first. .Bl -tag -width "cyl, sector and head" .It Em "sysid" is used to label the partition. -.Bx Free +.Fx reserves the magic number 165 decimal (A5 in hex). .It Em "start and size" @@ -244,7 +244,7 @@ While the .Fl i flag is used to "initialize" sector 0; it will setup the last BIOS partition to use the whole disk for -.Bx Free ; +.Fx ; and make it active. .Sh NOTES The automatic calculation of starting cylinder etc. uses @@ -257,7 +257,7 @@ that use geometry translation under the BIOS. .Pp If you hand craft your disk layout, please make sure that the -.Bx Free +.Fx partition starts on a cylinder boundary. A number of decisions made later may assume this. (This might not be necessary later.) @@ -324,7 +324,7 @@ It is an error if the following is not true: .Pp The number of cylinders should be less than or equal to 1024, but this is not enforced, although a warning will be output. Note that bootable -.Bx Free +.Fx partitions (the "/" filesystem) must lie completely within the first 1024 cylinders; if this is not true, booting may fail. Non-bootable partitions do not have this restriction. @@ -368,7 +368,7 @@ if one is present. The .Ar type is 165 for -.Bx Free +.Fx partitions. Specifying a partition type of zero is the same as clearing the partition and marking it as unused; however, dummy values (such as "0") must still be specified for @@ -386,7 +386,7 @@ p 4 0 0 0 .Ed .Pp Example: to set partition 1 to a -.Bx Free +.Fx partition, starting at sector 1 for 2503871 sectors (note: these numbers will be rounded upwards and downwards to correspond to head and cylinder boundaries): @@ -429,7 +429,7 @@ is used where it should actually be in order to conform with the terms used elsewhere. .Pp You cannot use this command to completely dedicate a disk to -.Bx Free . +.Fx . The .Xr disklabel 8 command must be used for this. diff --git a/sbin/i386/nextboot/nextboot.8 b/sbin/i386/nextboot/nextboot.8 index bd7348158d60..5796c3689ff3 100644 --- a/sbin/i386/nextboot/nextboot.8 +++ b/sbin/i386/nextboot/nextboot.8 @@ -15,7 +15,7 @@ .Ar filename .Sh DESCRIPTION The -.Bx Free +.Fx program .Nm controls the actions of the boot blocks at the time of the next boot. diff --git a/sbin/ldconfig/ldconfig.8 b/sbin/ldconfig/ldconfig.8 index 775f5d48c3ad..ae778428fffe 100644 --- a/sbin/ldconfig/ldconfig.8 +++ b/sbin/ldconfig/ldconfig.8 @@ -188,7 +188,8 @@ or A .Nm utility first appeared in SunOS 4.0, it appeared in its current form -in FreeBSD 1.1. +in +.Fx 1.1 . .Sh BUGS Some security checks (for example, verifying root ownership of added directories) are not performed when diff --git a/sbin/mount_hpfs/mount_hpfs.8 b/sbin/mount_hpfs/mount_hpfs.8 index f45272e0e60d..3537dd1533cb 100644 --- a/sbin/mount_hpfs/mount_hpfs.8 +++ b/sbin/mount_hpfs/mount_hpfs.8 @@ -92,7 +92,8 @@ It is strongly recomended to mount readonly! .Sh HISTORY The .Nm -first appered in FreeBSD 3.0 +first appered in +.Fx 3.0 . .Sh AUTHOR HPFS kernel implementation, .Nm diff --git a/sbin/mount_union/mount_union.8 b/sbin/mount_union/mount_union.8 index 08a48044cdce..d23d01cea6be 100644 --- a/sbin/mount_union/mount_union.8 +++ b/sbin/mount_union/mount_union.8 @@ -209,4 +209,5 @@ The .Nm command first appeared in .Bx 4.4 . -It first worked in FreeBSD-(fill this in). +It first worked in +.Fx Ns -(fill this in) . diff --git a/sbin/mount_unionfs/mount_unionfs.8 b/sbin/mount_unionfs/mount_unionfs.8 index 08a48044cdce..d23d01cea6be 100644 --- a/sbin/mount_unionfs/mount_unionfs.8 +++ b/sbin/mount_unionfs/mount_unionfs.8 @@ -209,4 +209,5 @@ The .Nm command first appeared in .Bx 4.4 . -It first worked in FreeBSD-(fill this in). +It first worked in +.Fx Ns -(fill this in) . diff --git a/sbin/nextboot/nextboot.8 b/sbin/nextboot/nextboot.8 index bd7348158d60..5796c3689ff3 100644 --- a/sbin/nextboot/nextboot.8 +++ b/sbin/nextboot/nextboot.8 @@ -15,7 +15,7 @@ .Ar filename .Sh DESCRIPTION The -.Bx Free +.Fx program .Nm controls the actions of the boot blocks at the time of the next boot. diff --git a/sbin/pc98/fdisk/fdisk.8 b/sbin/pc98/fdisk/fdisk.8 index fcc4eb5eee18..0f48fa6ebe0f 100644 --- a/sbin/pc98/fdisk/fdisk.8 +++ b/sbin/pc98/fdisk/fdisk.8 @@ -41,7 +41,7 @@ program can be used to divide space on the disk into partitions and set one .Em active . .Sh DESCRIPTION The -.Bx Free +.Fx program .Nm serves a similar purpose to the DOS program. The first form is used to @@ -197,7 +197,7 @@ The second partition overlaps the end of the first. .Bl -tag -width "cyl, sector and head" .It Em "sysmid" is used to label the partition. -.Bx Free +.Fx reserves the magic number 148 decimal (94 in hex). .It Em "start and size" @@ -272,7 +272,7 @@ While the .Fl i flag is used to "initialize" sector 0; it will setup the last BIOS partition to use the whole disk for -.Bx Free ; +.Fx ; and make it active. .Sh NOTES The automatic calculation of starting cylinder etc. uses @@ -285,7 +285,7 @@ that use geometry translation under the BIOS. .Pp If you hand craft your disk layout, please make sure that the -.Bx Free +.Fx partition starts on a cylinder boundary. A number of decisions made later may assume this. (This might not be necessary later.) @@ -352,7 +352,7 @@ It is an error if the following is not true: .Pp The number of cylinders should be less than or equal to 1024, but this is not enforced, although a warning will be output. Note that bootable -.Bx Free +.Fx partitions (the "/" filesystem) must lie completely within the first 1024 cylinders; if this is not true, booting may fail. Non-bootable partitions do not have this restriction. @@ -396,7 +396,7 @@ if one is present. The .Ar type is 165 for -.Bx Free +.Fx partitions. Specifying a partition type of zero is the same as clearing the partition and marking it as unused; however, dummy values (such as "0") must still be specified for @@ -414,7 +414,7 @@ p 4 0 0 0 .Ed .Pp Example: to set partition 1 to a -.Bx Free +.Fx partition, starting at sector 1 for 2503871 sectors (note: these numbers will be rounded upwards and downwards to correspond to head and cylinder boundaries): @@ -455,7 +455,7 @@ is used where it should actually be in order to conform with the terms used elsewhere. .Pp You cannot use this command to completely dedicate a disk to -.Bx Free . +.Fx . The .Xr disklabel 8 command must be used for this. diff --git a/sbin/vinum/vinum.8 b/sbin/vinum/vinum.8 index 87d008d42857..09e5714bfbed 100644 --- a/sbin/vinum/vinum.8 +++ b/sbin/vinum/vinum.8 @@ -2306,14 +2306,18 @@ performance. In particular, most systems use far too small a stripe size. The following discussion applies to all RAID systems, not just to .Nm vinum . .Pp -The FreeBSD block I/O system issues requests of between .5kB and 60 kB; a +The +.Fx +block I/O system issues requests of between .5kB and 60 kB; a typical mix is somewhere round 8 kB. You can't stop any striping system from breaking a request into two physical requests, and if you do it wrong it can be broken into several. This will result in a significant drop in performance: the decrease in transfer time per disk is offset by the order of magnitude greater increase in latency. .Pp -With modern disk sizes and the FreeBSD I/O system, you can expect to have a +With modern disk sizes and the +.Fx +I/O system, you can expect to have a reasonably small number of fragmented requests with a stripe size between 256 kB and 512 kB; with correct RAID implementations there is no obvious reason not to increase the size to 2 or 4 MB on a large disk. -- cgit v1.2.3