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

5 files changed, 21 insertions, 21 deletions

diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index ef3df7a..2d316c0 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -194,7 +194,7 @@ main(int argc, char *argv[])
 		runcmdshell();
 		break;
 	/*
-	 * Incremental restoration of a filesystem.
+	 * Incremental restoration of a file system.
 	 */
 	case 'r':
 		setup();
@@ -231,7 +231,7 @@ main(int argc, char *argv[])
 		dumpsymtable(symtbl, (long)1);
 		break;
 	/*
-	 * Resume an incremental filesystem restoration.
+	 * Resume an incremental file system restoration.
 	 */
 	case 'R':
 		initsymtable(symtbl);
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index d551f28..56d6756 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -38,7 +38,7 @@
 .Sh NAME
 .Nm restore ,
 .Nm rrestore
-.Nd "restore files or filesystems from backups made with dump"
+.Nd "restore files or file systems from backups made with dump"
 .Sh SYNOPSIS
 .Nm
 .Fl i
@@ -87,7 +87,7 @@ The
 .Nm
 utility performs the inverse function of
 .Xr dump 8 .
-A full backup of a filesystem may be restored and
+A full backup of a file system may be restored and
 subsequent incremental backups layered on top of it.
 Single files and
 directory subtrees may be restored from full or partial
@@ -180,7 +180,7 @@ It also causes
 to print out information about each file as it is extracted.
 .It Ic what
 Display dump header information, which includes: date,
-level, label, and the filesystem and host dump was made
+level, label, and the file system and host dump was made
 from.
 .El
 .It Fl R
@@ -191,12 +191,12 @@ a full restore
 flag below).
 This is useful if the restore has been interrupted.
 .It Fl r
-Restore (rebuild a filesystem).
-The target filesystem should be made pristine with
+Restore (rebuild a file system).
+The target file system should be made pristine with
 .Xr newfs 8 ,
 mounted and the user
 .Xr cd Ns 'd
-into the pristine filesystem
+into the pristine file system
 before starting the restoration of the initial level 0 backup.
 If the
 level 0 restores successfully, the
@@ -232,7 +232,7 @@ in conjunction with
 .Xr newfs 8
 and
 .Xr dump 8 ,
-may be used to modify filesystem parameters
+may be used to modify file system parameters
 such as size or block size.
 .It Fl t
 The names of the specified files are listed if they occur
@@ -281,7 +281,7 @@ tries to determine the media block size dynamically.
 Normally,
 .Nm
 will try to determine dynamically whether the dump was made from an
-old (pre-4.4) or new format filesystem.  The
+old (pre-4.4) or new format file system.  The
 .Fl c
 flag disables this check, and only allows reading a dump in the old
 format.
@@ -385,19 +385,19 @@ Most checks are self-explanatory or can ``never happen''.
 Common errors are given below.
 .Pp
 .Bl -tag -width Ds -compact
-.It Converting to new filesystem format.
-A dump tape created from the old filesystem has been loaded.
-It is automatically converted to the new filesystem format.
+.It Converting to new file system format.
+A dump tape created from the old file system has been loaded.
+It is automatically converted to the new file system format.
 .Pp
 .It <filename>: not found on tape
 The specified file name was listed in the tape directory,
 but was not found on the tape.
 This is caused by tape read errors while looking for the file,
-and from using a dump tape created on an active filesystem.
+and from using a dump tape created on an active file system.
 .Pp
 .It expected next file <inumber>, got <inumber>
 A file that was not listed in the directory showed up.
-This can occur when using a dump created on an active filesystem.
+This can occur when using a dump created on an active file system.
 .Pp
 .It Incremental dump too low
 When doing incremental restore,
@@ -446,7 +446,7 @@ information passed between incremental restores.
 The
 .Nm
 utility can get confused when doing incremental restores from
-dumps that were made on active filesystems.
+dumps that were made on active file systems.
 .Pp
 A level zero dump must be done after a full restore.
 Because restore runs in user code,
diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c
index 0a3647d..08b932f 100644
--- a/sbin/restore/restore.c
+++ b/sbin/restore/restore.c
@@ -325,7 +325,7 @@ nodeupdates(char *name, ino_t ino, int type)
 
 	/*
 	 * A previously non-existent file.
-	 * Add it to the filesystem, and request its extraction.
+	 * Add it to the file system, and request its extraction.
 	 * If it is a directory, create it immediately.
 	 * (Since the name is unused there can be no conflict)
 	 */
diff --git a/sbin/restore/restore.h b/sbin/restore/restore.h
index 6aff827..8d7206d 100644
--- a/sbin/restore/restore.h
+++ b/sbin/restore/restore.h
@@ -55,7 +55,7 @@ extern int	yflag;		/* always try to recover from tape errors */
  */
 extern char	*dumpmap; 	/* map of inodes on this dump tape */
 extern char	*usedinomap; 	/* map of inodes that are in use on this fs */
-extern ino_t	maxino;		/* highest numbered inode in this filesystem */
+extern ino_t	maxino;		/* highest numbered inode in this file system */
 extern long	dumpnum;	/* location of the dump on this tape */
 extern long	volno;		/* current volume being read */
 extern long	ntrec;		/* number of TP_BSIZE records per tape block */
@@ -66,7 +66,7 @@ extern FILE	*terminal;	/* file descriptor for the terminal input */
 extern int	Bcvt;		/* need byte swapping on inodes and dirs */
 
 /*
- * Each file in the filesystem is described by one of these entries
+ * Each file in the file system is described by one of these entries
  */
 struct entry {
 	char	*e_name;		/* the current name of this entry */
diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c
index a0282f8..3dd55f8 100644
--- a/sbin/restore/symtab.c
+++ b/sbin/restore/symtab.c
@@ -41,7 +41,7 @@ static const char rcsid[] =
 
 /*
  * These routines maintain the symbol table which tracks the state
- * of the filesystem being restored. They provide lookup by either
+ * of the file system being restored. They provide lookup by either
  * name or inode number. They also provide for creation, deletion,
  * and renaming of entries. Because of the dynamic nature of pathnames,
  * names should not be saved, but always constructed just before they
@@ -66,7 +66,7 @@ static const char rcsid[] =
 /*
  * The following variables define the inode symbol table.
  * The primary hash table is dynamically allocated based on
- * the number of inodes in the filesystem (maxino), scaled by
+ * the number of inodes in the file system (maxino), scaled by
  * HASHFACTOR. The variable "entry" points to the hash table;
  * the variable "entrytblsize" indicates its size (in entries).
  */