From 136be46680c6e4a18cc827da991d4f9a0de29cba Mon Sep 17 00:00:00 2001 From: trhodes Date: Wed, 21 Aug 2002 18:11:48 +0000 Subject: s/filesystem/file system/g as discussed on -developers --- sbin/disklabel/disklabel.5 | 32 ++++++++++++++++---------------- sbin/disklabel/disklabel.8 | 20 ++++++++++---------- sbin/disklabel/disklabel.c | 4 ++-- 3 files changed, 28 insertions(+), 28 deletions(-) (limited to 'sbin/disklabel') diff --git a/sbin/disklabel/disklabel.5 b/sbin/disklabel/disklabel.5 index 4b44c0e..2f30a92 100644 --- a/sbin/disklabel/disklabel.5 +++ b/sbin/disklabel/disklabel.5 @@ -54,13 +54,13 @@ and may be changed later with the program. This information is used by the system disk driver and by the bootstrap program to determine how to program the drive -and where to find the filesystems on the disk partitions. -Additional information is used by the filesystem in order -to use the disk most efficiently and to locate important filesystem information. +and where to find the file systems on the disk partitions. +Additional information is used by the file system in order +to use the disk most efficiently and to locate important file system information. The description of each partition contains an identifier for the partition -type (standard filesystem, swap area, etc.). -The filesystem updates the in-core copy of the label if it contains -incomplete information about the filesystem. +type (standard file system, swap area, etc.). +The file system updates the in-core copy of the label if it contains +incomplete information about the file system. .Pp The label is located in sector number .Dv LABELSECTOR @@ -122,7 +122,7 @@ is /* * Each disk has a label which includes information about the hardware - * disk geometry, filesystem partitions, and drive specific information. + * disk geometry, file system partitions, and drive specific information. * The label is in block 0 or 1, possibly offset from the beginning * to leave room for a bootstrap, etc. */ @@ -216,16 +216,16 @@ struct disklabel { u_int32_t d_magic2; /* the magic number (again) */ u_int16_t d_checksum; /* xor of data incl. partitions */ - /* filesystem and partition information: */ + /* file system and partition information: */ u_int16_t d_npartitions; /* number of partitions in following */ u_int32_t d_bbsize; /* size of boot area at sn0, bytes */ u_int32_t d_sbsize; /* max size of fs superblock, bytes */ struct partition { /* the partition table */ u_int32_t p_size; /* number of sectors in partition */ u_int32_t p_offset; /* starting sector */ - u_int32_t p_fsize; /* filesystem basic fragment size */ - u_int8_t p_fstype; /* filesystem type, see below */ - u_int8_t p_frag; /* filesystem fragments per block */ + u_int32_t p_fsize; /* file system basic fragment size */ + u_int8_t p_fstype; /* file system type, see below */ + u_int8_t p_frag; /* file system fragments per block */ union { u_int16_t cpg; /* UFS: FS cylinders per group */ u_int16_t sgs; /* LFS: FS segment shift */ @@ -288,7 +288,7 @@ static char *dktypenames[] = { /* * Filesystem type and version. - * Used to interpret other filesystem-specific + * Used to interpret other file system-specific * per-partition information. */ #define FS_UNUSED 0 /* unused */ @@ -298,11 +298,11 @@ static char *dktypenames[] = { #define FS_SYSV 4 /* System V */ #define FS_V71K 5 /* V7 with 1K blocks (4.1, 2.9) */ #define FS_V8 6 /* Eighth Edition, 4K blocks */ -#define FS_BSDFFS 7 /* 4.2BSD fast filesystem */ -#define FS_MSDOS 8 /* MSDOS filesystem */ -#define FS_BSDLFS 9 /* 4.4BSD log-structured filesystem */ +#define FS_BSDFFS 7 /* 4.2BSD fast file system */ +#define FS_MSDOS 8 /* MSDOS file system */ +#define FS_BSDLFS 9 /* 4.4BSD log-structured file system */ #define FS_OTHER 10 /* in use, but unknown/unsupported */ -#define FS_HPFS 11 /* OS/2 high-performance filesystem */ +#define FS_HPFS 11 /* OS/2 high-performance file system */ #define FS_ISO9660 12 /* ISO 9660, normally CD-ROM */ #define FS_BOOT 13 /* partition contains bootstrap */ #define FS_VINUM 14 /* Vinum drive */ diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8 index faae777..32ed01c 100644 --- a/sbin/disklabel/disklabel.8 +++ b/sbin/disklabel/disklabel.8 @@ -473,11 +473,11 @@ they can be defined later using .It Finally use .Xr newfs 8 -to create a filesystem on the new partition. +to create a file system on the new partition. A typical partitioning scheme would be to have an .Dq a partition -of approximately 128MB to hold the root filesystem, a +of approximately 128MB to hold the root file system, a .Dq b partition for swap, a @@ -633,7 +633,7 @@ will be interpreted as an offset of 0. .It fstype describes the purpose of the partition. The example shows all currently used partition types. -For UFS filesystems and ccd partitions, use type +For UFS file systems and ccd partitions, use type .Cm 4.2BSD . For Vinum drives, use type .Cm vinum . @@ -661,17 +661,17 @@ for more details. .It fsize For .Cm 4.2BSD -and LFS filesystems only, the fragment size. Defaults to 1024 for +and LFS file systems only, the fragment size. Defaults to 1024 for partitions smaller than 1 GB, 4096 for partitions 1GB or larger. .It bsize For .Cm 4.2BSD -and LFS filesystems only, the block size. Defaults to 8192 for +and LFS file systems only, the block size. Defaults to 8192 for partitions smaller than 1 GB, 16384 for partitions 1GB or larger. .It bps/cpg For .Cm 4.2BSD -filesystems, the number of cylinders in a cylinder group. For LFS file +file systems, the number of cylinders in a cylinder group. For LFS file systems, the segment shift value. Defaults to 16 for partitions smaller than 1 GB, 64 for partitions 1GB or larger. .El @@ -734,7 +734,7 @@ NOT install the new label either in-core or on-disk. Try to auto-detect the required information from .Pa da0s1 , and write a new label to the disk. Use another disklabel -e command to edit the -partitioning and filesystem information. +partitioning and file system information. .Pp .Dl disklabel -R da0s1 savedlabel .Pp @@ -851,8 +851,8 @@ the partition. .Pp On some machines the bootstrap code may not fit entirely in the area -allocated for it by some filesystems. -As a result, it may not be possible to have filesystems on some partitions +allocated for it by some file systems. +As a result, it may not be possible to have file systems on some partitions of a .Dq bootable disk. @@ -863,7 +863,7 @@ If the installed boot code would overlap a partition of type FS_UNUSED it is marked as type FS_BOOT. The .Xr newfs 8 -utility will disallow creation of filesystems on FS_BOOT partitions. +utility will disallow creation of file systems on FS_BOOT partitions. Conversely, if a partition has a type other than FS_UNUSED or FS_BOOT, .Nm will not install bootstrap code that overlaps it. diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index f5c35d2..4a364ac 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -1240,7 +1240,7 @@ getasciipartspec(char *tp, struct disklabel *lp, int part, int lineno) v = FSMAXTYPES; if ((unsigned)v >= FSMAXTYPES) { fprintf(stderr, - "line %d: Warning, unknown filesystem type %s\n", + "line %d: Warning, unknown file system type %s\n", lineno, cp); v = FS_UNUSED; } @@ -1614,7 +1614,7 @@ getvirginlabel(void) /* * If we are installing a boot program that doesn't fit in d_bbsize * we need to mark those partitions that the boot overflows into. - * This allows newfs to prevent creation of a filesystem where it might + * This allows newfs to prevent creation of a file system where it might * clobber bootstrap code. */ void -- cgit v1.1