s/filesystem/file system/g as discussed on -developers

7 files changed, 31 insertions, 31 deletions

diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile
index 77a7ada..1148d8f 100644
--- a/sbin/dump/Makefile
+++ b/sbin/dump/Makefile
@@ -7,7 +7,7 @@
 #	optr.c			operator interface
 #	dumprmt.c		handles remote tape via rmt(8)
 #	tape.c			handles the mag tape and opening/closing
-#	traverse.c		traverses the filesystem
+#	traverse.c		traverses the file system
 #	unctime.c		undo ctime
 #
 #	DEBUG			use local directory to find ddate and dumpdates
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index f51abca..ad9a447 100644
--- a/sbin/dump/dump.8
+++ b/sbin/dump/dump.8
@@ -39,7 +39,7 @@
 .Sh NAME
 .Nm dump ,
 .Nm rdump
-.Nd filesystem backup
+.Nd file system backup
 .Sh SYNOPSIS
 .Nm
 .Op Fl 0123456789acknSu
@@ -51,7 +51,7 @@
 .Op Fl h Ar level
 .Op Fl s Ar feet
 .Op Fl T Ar date
-.Ar filesystem
+.Ar file system
 .Nm
 .Fl W | Fl w
 .Pp
@@ -68,7 +68,7 @@ is not documented here.)
 The
 .Nm
 utility examines files
-on a filesystem
+on a file system
 and determines which files
 need to be backed up.
 These files
@@ -93,8 +93,8 @@ options.
 By default, the same output file name is used for each volume
 after prompting the operator to change media.
 .Pp
-The filesystem to be dumped is specified by the argument
-.Ar filesystem
+The file system to be dumped is specified by the argument
+.Ar file system
 as either its device-special file or its mount point
 (if that is in a standard entry in
 .Pa /etc/fstab ) .
@@ -105,7 +105,7 @@ The following options are supported by
 .It Fl 0\-9
 Dump levels.
 A level 0, full backup,
-guarantees the entire filesystem is copied
+guarantees the entire file system is copied
 (but see also the
 .Fl h
 option below).
@@ -239,12 +239,12 @@ the
 file
 is readable by people, consisting of one
 free format record per line:
-filesystem name,
+file system name,
 increment level
 and
 .Xr ctime 3
 format dump date.
-There may be only one entry per filesystem at each level.
+There may be only one entry per file system at each level.
 The
 .Pa dumpdates
 file
@@ -258,7 +258,7 @@ but the
 .Fl D
 option may be used to change it.
 .It Fl W
-Tell the operator what filesystems need to be dumped.
+Tell the operator what file systems need to be dumped.
 This information is gleaned from the files
 .Pa dumpdates
 and
@@ -267,19 +267,19 @@ The
 .Fl W
 option causes
 .Nm
-to print out, for each filesystem in
+to print out, for each file system in
 the
 .Pa dumpdates
 file
 the most recent dump date and level,
-and highlights those filesystems that should be dumped.
+and highlights those file systems that should be dumped.
 If the
 .Fl W
 option is set, all other options are ignored, and
 .Nm
 exits immediately.
 .It Fl w
-Is like W, but prints only those filesystems which need to be dumped.
+Is like W, but prints only those file systems which need to be dumped.
 .El
 .Pp
 Directories and regular files which have their
@@ -360,7 +360,7 @@ Always start with a level 0 backup, for example:
 This should be done at set intervals, say once a month or once every two months,
 and on a set of fresh tapes that is saved forever.
 .It
-After a level 0, dumps of active filesystems are taken on a daily basis,
+After a level 0, dumps of active file systems are taken on a daily basis,
 using a modified Tower of Hanoi algorithm,
 with this sequence of dump levels:
 .Bd -literal -offset indent
@@ -371,7 +371,7 @@ For the daily dumps, it should be possible to use a fixed number of tapes
 for each day, used on a weekly basis.
 Each week, a level 1 dump is taken, and
 the daily Hanoi sequence repeats beginning with 3.
-For weekly dumps, another fixed set of tapes per dumped filesystem is
+For weekly dumps, another fixed set of tapes per dumped file system is
 used, also on a cyclical basis.
 .El
 .Pp
@@ -394,7 +394,7 @@ see the
 .Fl D
 option)
 .It Pa /etc/fstab
-dump table: filesystems and frequency
+dump table: file systems and frequency
 .It Pa /etc/group
 to find group
 .Em operator
@@ -411,7 +411,7 @@ Dump exits with zero status on success.
 Startup errors are indicated with an exit code of 1;
 abnormal termination is indicated with an exit code of 3.
 .Sh BUGS
-Fewer than 32 read errors on the filesystem are ignored.
+Fewer than 32 read errors on the file system are ignored.
 .Pp
 Each reel requires a new process, so parent processes for
 reels already written just hang around until the entire tape
@@ -430,7 +430,7 @@ utility with the
 .Fl W
 or
 .Fl w
-options does not report filesystems that have never been recorded
+options does not report file systems that have never been recorded
 in the
 .Pa dumpdates
 file,
diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h
index d6807c6..e200347 100644
--- a/sbin/dump/dump.h
+++ b/sbin/dump/dump.h
@@ -81,7 +81,7 @@ int	tapeno;		/* current tape number */
 time_t	tstart_writing;	/* when started writing the first tape block */
 time_t	tend_writing;	/* after writing the last tape block */
 int	passno;		/* current dump pass number */
-struct	fs *sblock;	/* the filesystem super block */
+struct	fs *sblock;	/* the file system super block */
 char	sblock_buf[MAXBSIZE];
 long	dev_bsize;	/* block size of underlying disk device */
 int	dev_bshift;	/* log2(dev_bsize) */
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index b18fc7c..cc4f80d 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -215,7 +215,7 @@ main(int argc, char *argv[])
 	argv += optind;
 
 	if (argc < 1) {
-		(void)fprintf(stderr, "Must specify disk or filesystem\n");
+		(void)fprintf(stderr, "Must specify disk or file system\n");
 		exit(X_STARTUP);
 	}
 	disk = *argv++;
@@ -294,7 +294,7 @@ main(int argc, char *argv[])
 	 *	disk can be either the full special file name,
 	 *	the suffix of the special file name,
 	 *	the special name missing the leading '/',
-	 *	the filesystem name with or without the leading '/'.
+	 *	the file system name with or without the leading '/'.
 	 */
 	dt = fstabsearch(disk);
 	if (dt != NULL) {
@@ -303,7 +303,7 @@ main(int argc, char *argv[])
 		(void)strncpy(spcl.c_filesys, dt->fs_file, NAMELEN);
 	} else {
 		(void)strncpy(spcl.c_dev, disk, NAMELEN);
-		(void)strncpy(spcl.c_filesys, "an unlisted filesystem",
+		(void)strncpy(spcl.c_filesys, "an unlisted file system",
 		    NAMELEN);
 	}
 	spcl.c_dev[NAMELEN-1]='\0';
@@ -342,7 +342,7 @@ main(int argc, char *argv[])
 	if (fstat(diskfd, &sb) != 0)
 		err(X_STARTUP, "%s: stat", disk);
 	if (S_ISDIR(sb.st_mode))
-		errx(X_STARTUP, "%s: unknown filesystem", disk);
+		errx(X_STARTUP, "%s: unknown file system", disk);
 	sync();
 	sblock = (struct fs *)sblock_buf;
 	for (i = 0; sblock_try[i] != -1; i++) {
@@ -356,7 +356,7 @@ main(int argc, char *argv[])
 			break;
 	}
 	if (sblock_try[i] == -1)
-		quit("Cannot find filesystem superblock\n");
+		quit("Cannot find file system superblock\n");
 	dev_bsize = sblock->fs_fsize / fsbtodb(sblock, 1);
 	dev_bshift = ffs(dev_bsize) - 1;
 	if (dev_bsize != (1 << dev_bshift))
@@ -525,7 +525,7 @@ usage(void)
 #endif
 		"nSu] [-B records] [-b blocksize] [-D dumpdates]\n"
 		"            [-d density] [-f file ] [-h level] [-s feet] "
-		"[-T date] filesystem\n"
+		"[-T date] file system\n"
 		"       dump [-W | -w]\n");
 	exit(X_STARTUP);
 }
diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c
index 53b5741..a28d522 100644
--- a/sbin/dump/optr.c
+++ b/sbin/dump/optr.c
@@ -371,9 +371,9 @@ lastdump(int arg)	/* w ==> just what to do; W ==> most recent dumps */
 	qsort((char *) ddatev, nddates, sizeof(struct dumpdates *), datesort);
 
 	if (arg == 'w')
-		(void) printf("Dump these filesystems:\n");
+		(void) printf("Dump these file systems:\n");
 	else
-		(void) printf("Last dump(s) done (Dump '>' filesystems):\n");
+		(void) printf("Last dump(s) done (Dump '>' file systems):\n");
 	lastname = "??";
 	ITITERATE(i, dtwalk) {
 		if (strncmp(lastname, dtwalk->dd_name,
diff --git a/sbin/dump/tape.c b/sbin/dump/tape.c
index aa65b47..4a3b810 100644
--- a/sbin/dump/tape.c
+++ b/sbin/dump/tape.c
@@ -82,7 +82,7 @@ static	void rollforward(void);
  * Concurrent dump mods (Caltech) - disk block reading and tape writing
  * are exported to several slave processes.  While one slave writes the
  * tape, the others read disk blocks; they pass control of the tape in
- * a ring via signals. The parent process traverses the filesystem and
+ * a ring via signals. The parent process traverses the file system and
  * sends writeheader()'s and lists of daddr's to the slaves via pipes.
  * The following structure defines the instruction packets sent to slaves.
  */
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index 4cbce6e..5be1dca 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -131,9 +131,9 @@ blockest(union dinode *dp)
 /*
  * Dump pass 1.
  *
- * Walk the inode list for a filesystem to find all allocated inodes
+ * Walk the inode list for a file system to find all allocated inodes
  * that have been modified since the previous dump time. Also, find all
- * the directories in the filesystem.
+ * the directories in the file system.
  */
 int
 mapfiles(ino_t maxino, long *tapesize)
@@ -181,7 +181,7 @@ mapfiles(ino_t maxino, long *tapesize)
 /*
  * Dump pass 2.
  *
- * Scan each directory on the filesystem to see if it has any modified
+ * Scan each directory on the file system to see if it has any modified
  * files in it. If it does, and has not already been added to the dump
  * list (because it was itself modified), then add it. If a directory
  * has not been modified itself, contains no modified files and has no