more file system > filesystem

6 files changed, 22 insertions, 21 deletions

diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index 6682ee3..0c7b363 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -197,7 +197,7 @@ main(int argc, char *argv[])
 		runcmdshell();
 		break;
 	/*
-	 * Incremental restoration of a file system.
+	 * Incremental restoration of a filesystem.
 	 */
 	case 'r':
 		setup();
@@ -234,7 +234,7 @@ main(int argc, char *argv[])
 		dumpsymtable(symtbl, (long)1);
 		break;
 	/*
-	 * Resume an incremental file system restoration.
+	 * Resume an incremental filesystem restoration.
 	 */
 	case 'R':
 		initsymtable(symtbl);
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index db1c5d2..21db268 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 file systems from backups made with dump"
+.Nd "restore files or filesystems from backups made with dump"
 .Sh SYNOPSIS
 .Nm
 .Fl i
@@ -87,7 +87,7 @@ The
 .Nm
 command performs the inverse function of
 .Xr dump 8 .
-A full backup of a file system may be restored and
+A full backup of a filesystem may be restored and
 subsequent incremental backups layered on top of it.
 Single files and
 directory subtrees may be restored from full or partial
@@ -190,12 +190,12 @@ a full restore
 flag below).
 This is useful if the restore has been interrupted.
 .It Fl r
-Restore (rebuild a file system).
-The target file system should be made pristine with
+Restore (rebuild a filesystem).
+The target filesystem should be made pristine with
 .Xr newfs 8 ,
 mounted and the user
 .Xr cd Ns 'd
-into the pristine file system
+into the pristine filesystem
 before starting the restoration of the initial level 0 backup.
 If the
 level 0 restores successfully, the
@@ -229,7 +229,7 @@ in conjunction with
 .Xr newfs 8
 and
 .Xr dump 8 ,
-may be used to modify file system parameters
+may be used to modify filesystem parameters
 such as size or block size.
 .It Fl t
 The names of the specified files are listed if they occur
@@ -278,7 +278,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 file system.  The
+old (pre-4.4) or new format filesystem.  The
 .Fl c
 flag disables this check, and only allows reading a dump in the old
 format.
@@ -381,19 +381,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 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.
+.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.
 .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 file system.
+and from using a dump tape created on an active filesystem.
 .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 file system.
+This can occur when using a dump created on an active filesystem.
 .Pp
 .It Incremental dump too low
 When doing incremental restore,
@@ -441,7 +441,7 @@ information passed between incremental restores.
 .Sh BUGS
 .Nm Restore
 can get confused when doing incremental restores from
-dumps that were made on active file systems.
+dumps that were made on active filesystems.
 .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 614fa01..46e208b 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 file system, and request its extraction.
+	 * Add it to the filesystem, 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 4b3affc..1e71330 100644
--- a/sbin/restore/restore.h
+++ b/sbin/restore/restore.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)restore.h	8.3 (Berkeley) 9/13/94
+ * $FreeBSD$
  */
 
 /*
@@ -55,7 +56,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 file system */
+extern ino_t	maxino;		/* highest numbered inode in this filesystem */
 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 */
@@ -67,7 +68,7 @@ extern int	oldinofmt;	/* reading tape with old format inodes */
 extern int	Bcvt;		/* need byte swapping on inodes and dirs */
 
 /*
- * Each file in the file system is described by one of these entries
+ * Each file in the filesystem 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 3dd55f8..a0282f8 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 file system being restored. They provide lookup by either
+ * of the filesystem 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 file system (maxino), scaled by
+ * the number of inodes in the filesystem (maxino), scaled by
  * HASHFACTOR. The variable "entry" points to the hash table;
  * the variable "entrytblsize" indicates its size (in entries).
  */
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index f5b5438..c40c7a9 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -214,7 +214,7 @@ setup(void)
 			fprintf(stderr, "Tape is not a dump tape\n");
 			done(1);
 		}
-		fprintf(stderr, "Converting to new file system format.\n");
+		fprintf(stderr, "Converting to new filesystem format.\n");
 	}
 	if (pipein) {
 		endoftapemark.s_spcl.c_magic = cvtflag ? OFS_MAGIC : NFS_MAGIC;