summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2003-03-10 19:52:06 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2003-03-10 19:52:06 +0000
commitf60d9767df5e8ccee65a2e2978523a7ed4b3c8cf (patch)
tree7c254a9b4416e68bab81c6c2b408b355563ec6d4 /sbin
parent068163fee5820422c0e883c4a1b6aeb5e7a18622 (diff)
filesystem -> file system for a little consistency
ok jmc@ millert@
Diffstat (limited to 'sbin')
-rw-r--r--sbin/mount/mount.840
-rw-r--r--sbin/mount_ffs/mount_ffs.84
-rw-r--r--sbin/newfs/newfs.816
3 files changed, 28 insertions, 32 deletions
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index d9bb9f01c1c..4313f49d741 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mount.8,v 1.37 2002/11/14 02:57:27 deraadt Exp $
+.\" $OpenBSD: mount.8,v 1.38 2003/03/10 19:52:05 tedu Exp $
.\" $NetBSD: mount.8,v 1.11 1995/07/12 06:23:21 cgd Exp $
.\"
.\" Copyright (c) 1980, 1989, 1991, 1993
@@ -55,7 +55,7 @@
.Sh DESCRIPTION
The
.Nm
-command invokes a filesystem-specific program to prepare
+command invokes a file system specific program to prepare
and graft the
.Ar special
device or remote node (rhost:path) on to the file system
@@ -87,7 +87,7 @@ except in the special case of
.Pa / ,
of course
.Pc .
-Only the superuser may mount filesystems unless
+Only the superuser may mount file systems unless
.Va kern.usermount
is nonzero
.Po
@@ -120,7 +120,7 @@ report strange values for the mounted-from device for mounted file
systems.
.It Fl d
Causes everything to be done except for the invocation of
-the filesystem-specific program.
+the file system specific program.
This option is useful in conjunction with the
.Fl v
flag to
@@ -128,7 +128,7 @@ determine what the
.Nm
command is trying to do.
.It Fl f
-Either force mounting of dirty filesystems or, in the case of a
+Either force mounting of dirty file systems or, in the case of a
downgrade from read-write to read-only operation, the revocation of
opened files with write access.
.It Fl o Ar options
@@ -153,13 +153,13 @@ The most common use of this flag is to speed up
where it can give a factor of two speed increase.
.It softdep
(FFS only.)
-Mount the filesystem using soft dependencies.
+Mount the file system using soft dependencies.
Instead of metadata being written immediately, it is written in an ordered
-fashion to keep the on-disk state of the filesystem consistent.
+fashion to keep the on-disk state of the file system consistent.
This results in significant speedups for file create/delete operations.
This option will be ignored when using the
.Fl u
-flag and a filesystem is already mounted read/write.
+flag and a file system is already mounted read/write.
It requires
.Cm option FFS_SOFTUPDATES
to be enabled in the running kernel.
@@ -167,7 +167,7 @@ to be enabled in the running kernel.
The same as
.Fl f ;
forces the revocation of write access when trying to downgrade
-a filesystem mount status from read-write to read-only.
+a file system mount status from read-write to read-only.
.It noatime
Do not update atime on files in the system unless the mtime or ctime
is being changed as well.
@@ -200,14 +200,14 @@ The same as
indicate that the status of an already mounted file system should be changed.
.It union
Causes the namespace at the mount point to appear as the union
-of the mounted filesystem root and the existing directory.
-Lookups will be done in the mounted filesystem first.
+of the mounted file system root and the existing directory.
+Lookups will be done in the mounted file system first.
If those operations fail due to a non-existent file the underlying
directory is then accessed.
-All creates are done in the mounted filesystem.
+All creates are done in the mounted file system.
.El
.Pp
-Any additional options specific to a given filesystem type (see the
+Any additional options specific to a given file system type (see the
.Fl t
option) may be passed as a comma separated list; these options are
distinguished by a leading
@@ -246,11 +246,11 @@ The
.Fl t
option can be used
to indicate that the actions should only be taken on
-filesystems of the specified type.
+file systems of the specified type.
More than one type may be specified in a comma separated list.
-The list of filesystem types can be prefixed with
+The list of file system types can be prefixed with
.Dq no
-to specify the filesystem types for which action should
+to specify the file system types for which action should
.Em not
be taken.
For example, the
@@ -260,7 +260,7 @@ command:
# mount -a -t nonfs,mfs
.Ed
.Pp
-mounts all filesystems except those of type
+mounts all file systems except those of type
.Tn NFS
and
.Tn MFS .
@@ -271,7 +271,7 @@ will attempt to execute a program in
where
.Em XXX
is replaced by the type name.
-For example, nfs filesystems are mounted by the program
+For example, nfs file systems are mounted by the program
.Pa /sbin/mount_nfs .
.It Fl u
The
@@ -285,10 +285,10 @@ may be changed;
also a file system can be changed from read-only to read-write
or vice versa.
An attempt to change from read-write to read-only will fail if any
-files on the filesystem are currently open for writing unless the
+files on the file system are currently open for writing unless the
.Fl f
flag is also specified.
-The filesystem options are set to those specified in the command line.
+The file system options are set to those specified in the command line.
The options set in the
.Xr fstab 5
table are ignored.
diff --git a/sbin/mount_ffs/mount_ffs.8 b/sbin/mount_ffs/mount_ffs.8
index 9ded9d467aa..d025ddea8bb 100644
--- a/sbin/mount_ffs/mount_ffs.8
+++ b/sbin/mount_ffs/mount_ffs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mount_ffs.8,v 1.12 2002/06/26 21:32:02 fgsch Exp $
+.\" $OpenBSD: mount_ffs.8,v 1.13 2003/03/10 19:52:05 tedu Exp $
.\" $NetBSD: mount_ffs.8,v 1.2 1996/02/05 06:33:47 jtc Exp $
.\"
.\" Copyright (c) 1980, 1989, 1991, 1993
@@ -65,7 +65,7 @@ when using any of the following syntax:
.br
.Ed
.Pp
-This command is normally executed per filesystem by
+This command is normally executed per file system by
.Xr rc 8
at boot time using the
.Xr mount 8
diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index 23bf6a91928..8c1612d44e5 100644
--- a/sbin/newfs/newfs.8
+++ b/sbin/newfs/newfs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: newfs.8,v 1.30 2003/03/10 19:39:36 tedu Exp $
+.\" $OpenBSD: newfs.8,v 1.31 2003/03/10 19:52:05 tedu Exp $
.\" $NetBSD: newfs.8,v 1.12 1995/03/18 14:58:41 cgd Exp $
.\"
.\" Copyright (c) 1983, 1987, 1991, 1993, 1994
@@ -42,7 +42,6 @@
.Nd construct a new file system
.Sh SYNOPSIS
.Nm newfs
-.Bk -words
.Op Fl NO
.Op Fl S Ar sector-size
.Op Fl a Ar maxcontig
@@ -52,7 +51,7 @@
.Op Fl e Ar maxbpg
.Op Fl f Ar frag-size
.Op Fl g Ar avgfilesize
-.Op Fl h Ar avgfpdir
+.Op Fl h Ar files
.Op Fl i Ar bytes
.Op Fl k Ar skew
.Op Fl l Ar interleave
@@ -68,10 +67,8 @@
.Op Fl x Ar sectors
.Op Fl z Ar tracks
.Ar special
-.Ek
.Pp
.Nm mount_mfs
-.Bk -words
.Op Fl a Ar maxcontig
.Op Fl b Ar block-size
.Op Fl c Ar cylinders
@@ -83,7 +80,6 @@
.Op Fl o Ar options
.Op Fl s Ar size
.Ar special node
-.Ek
.Sh DESCRIPTION
Before running
.Nm
@@ -139,7 +135,7 @@ now have the functionality of
built-in so it is not necessary to run
.Xr fsirand 8
manually unless you wish to re-randomize the
-filesystem (or list the inode generation numbers).
+file system (or list the inode generation numbers).
.Pp
The following options define the general layout policies:
.Bl -tag -width Fl
@@ -149,8 +145,8 @@ without really creating the file system.
.It Fl O
Creates a
.Bx 4.3
-format filesystem.
-This options is primarily used to build root filesystems
+format file system.
+This option is primarily used to build root file systems
that can be understood by older boot ROMs.
.It Fl q
Operate in quiet mode.
@@ -264,7 +260,7 @@ The speed of the disk in revolutions per minute.
The number of tracks/cylinder available for data allocation by the file
system.
.It Fl t Ar fstype
-Set the filesystem type of which filesystem you wish to create.
+Set the file system type of which file system you wish to create.
.Nm
will be smart enough to run the alternate newfs_XXX program instead.
.It Fl u Ar sectors/track