'file system' for consistency with documentation (instead of 'filesystem'). trunk
authorwiz <wiz@NetBSD.org>
Tue, 22 Jul 2014 17:11:09 +0000
branchtrunk
changeset 228651 024fecb507d1
parent 228650 2596b1a6c61c
child 228652 318be78f7250
'file system' for consistency with documentation (instead of 'filesystem').
etc/daily
etc/defaults/rc.conf
etc/locate.conf
etc/rc.d/mountall
etc/rc.d/mountcritlocal
etc/rc.d/mountcritremote
etc/rc.d/random_seed
etc/rc.subr
etc/services
--- a/etc/daily	Tue Jul 22 15:42:59 2014 +0000
+++ b/etc/daily	Tue Jul 22 17:11:09 2014 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$NetBSD: daily,v 1.90 2013/09/08 08:19:40 prlw1 Exp $
+#	$NetBSD: daily,v 1.91 2014/07/22 17:11:09 wiz Exp $
 #	@(#)daily	8.2 (Berkeley) 1/25/94
 #
 
@@ -248,7 +248,7 @@
 
 if checkyesno run_fsck; then
 	echo ""
-	echo "Checking filesystems:"
+	echo "Checking file systems:"
 	fsck -n -f ${run_fsck_flags} | grep -v '^\*\* Phase'
 fi
 
--- a/etc/defaults/rc.conf	Tue Jul 22 15:42:59 2014 +0000
+++ b/etc/defaults/rc.conf	Tue Jul 22 17:11:09 2014 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: rc.conf,v 1.122 2013/01/13 18:47:57 prlw1 Exp $
+#	$NetBSD: rc.conf,v 1.123 2014/07/22 17:11:09 wiz Exp $
 #
 # /etc/defaults/rc.conf --
 #	default configuration of /etc/rc.conf
@@ -42,7 +42,7 @@
 rc_rcorder_flags=""
 
 # The directories searched for rc scripts.
-# These directories must be part of the root filesystem.
+# These directories must be part of the root file system.
 rc_directories=/etc/rc.d 
 
 # If this is set to NO, shutdown(8) will not run /etc/rc.shutdown.
@@ -140,7 +140,7 @@
 # NOTE: default coredump name now set in /etc/sysctl.conf
 
 #
-# File system check flags; default to preen mode, checking filesystems
+# File system check flags; default to preen mode, checking file systems
 # that are listed in /etc/fstab in parallel as the fsck pass number
 # permits. Fix minor faults automatically, and exit with non 0 only
 # when major errors occur.
--- a/etc/locate.conf	Tue Jul 22 15:42:59 2014 +0000
+++ b/etc/locate.conf	Tue Jul 22 17:11:09 2014 +0000
@@ -1,11 +1,11 @@
-#	$NetBSD: locate.conf,v 1.1 2004/02/06 15:24:25 itohy Exp $
+#	$NetBSD: locate.conf,v 1.2 2014/07/22 17:11:09 wiz Exp $
 #
 # This file is read by /usr/libexec/locate.updatedb when building locate(1)
 # database.
 #
 #		 argument    description			default
 # searchpath	 <paths>     search path			/
-# ignorefs	 <fs types>  ignore filesystems of the types	!local cd9660
+# ignorefs	 <fs types>  ignore file systems of the types	!local cd9660
 #			Setting <fs types> to "none"		fdesc kernfs
 #			disables it (search everything).	procfs
 #			Prepending ! negates the meaning
--- a/etc/rc.d/mountall	Tue Jul 22 15:42:59 2014 +0000
+++ b/etc/rc.d/mountall	Tue Jul 22 17:11:09 2014 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: mountall,v 1.8 2009/10/18 21:58:37 haad Exp $
+# $NetBSD: mountall,v 1.9 2014/07/22 17:11:09 wiz Exp $
 #
 
 # REQUIRE: mountcritremote named ypbind
@@ -14,7 +14,7 @@
 
 mountall_start()
 {
-	echo 'Mounting all filesystems...'
+	echo 'Mounting all file systems...'
 	if [ -f /etc/zfs/zpool.cache ]; then
 		# Get ZFS module loaded (and thereby, zvols created).
 		zfs list > /dev/null 2>&1
@@ -32,7 +32,7 @@
 
 mountall_stop()
 {
-	echo 'Unmounting all filesystems...'
+	echo 'Unmounting all file systems...'
 	if [ -f /etc/zfs/zpool.cache ]; then
 		# Unmount ZFS file systems.
 		zfs unmount -a
--- a/etc/rc.d/mountcritlocal	Tue Jul 22 15:42:59 2014 +0000
+++ b/etc/rc.d/mountcritlocal	Tue Jul 22 17:11:09 2014 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: mountcritlocal,v 1.13 2011/01/13 22:30:09 haad Exp $
+# $NetBSD: mountcritlocal,v 1.14 2014/07/22 17:11:09 wiz Exp $
 #
 
 # PROVIDE: mountcritlocal
@@ -14,7 +14,7 @@
 
 mountcritlocal_start()
 {
-	#	Mount critical filesystems that are `local'
+	#	Mount critical file systems that are `local'
 	#	(as specified in $critical_filesystems_local)
 	#	This usually includes /var.
 	#
--- a/etc/rc.d/mountcritremote	Tue Jul 22 15:42:59 2014 +0000
+++ b/etc/rc.d/mountcritremote	Tue Jul 22 17:11:09 2014 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: mountcritremote,v 1.8 2004/08/13 18:08:03 mycroft Exp $
+# $NetBSD: mountcritremote,v 1.9 2014/07/22 17:11:09 wiz Exp $
 #
 
 # PROVIDE: mountcritremote
@@ -14,7 +14,7 @@
 
 mountcritremote_start()
 {
-	#	Mount critical filesystems that may be `remote'.
+	#	Mount critical file systems that may be `remote'.
 	#	(as specified in $critical_filesystems_remote)
 	#	This usually includes /usr.
 	#
--- a/etc/rc.d/random_seed	Tue Jul 22 15:42:59 2014 +0000
+++ b/etc/rc.d/random_seed	Tue Jul 22 17:11:09 2014 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: random_seed,v 1.6 2012/12/29 22:15:07 christos Exp $
+# $NetBSD: random_seed,v 1.7 2014/07/22 17:11:09 wiz Exp $
 #
 
 # PROVIDE: random_seed
@@ -42,7 +42,7 @@
 fs_safe()
 {
 	#
-	# Enforce that the file's on a local filesystem.
+	# Enforce that the file's on a local file system.
 	# Include only the types we can actually write.
 	#
 	fstype="$(getfstype "$1")"
@@ -51,7 +51,7 @@
 		return 0
 		;;
 	*)
-		message "Bad filesystem type ${fstype}"
+		message "Bad file system type ${fstype}"
 		return 1
 		;;
 	esac
--- a/etc/rc.subr	Tue Jul 22 15:42:59 2014 +0000
+++ b/etc/rc.subr	Tue Jul 22 17:11:09 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rc.subr,v 1.92 2012/12/17 18:17:27 apb Exp $
+# $NetBSD: rc.subr,v 1.93 2014/07/22 17:11:09 wiz Exp $
 #
 # Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -112,7 +112,7 @@
 
 #
 # mount_critical_filesystems type
-#	Go through the list of critical filesystems as provided in
+#	Go through the list of critical file systems as provided in
 #	the rc.conf(5) variable $critical_filesystems_${type}, checking
 #	each one to see if it is mounted, and if it is not, mounting it.
 #	It's not an error if file systems prefixed with "OPTIONAL:"
@@ -1047,7 +1047,7 @@
 		echo "File system still has errors; re-run fsck manually!"
 		;;
 	4)	# Root modified
-		echo "Root filesystem was modified, rebooting ..."
+		echo "Root file system was modified, rebooting ..."
 		reboot -n
 		echo "Reboot failed; help!"
 		;;
--- a/etc/services	Tue Jul 22 15:42:59 2014 +0000
+++ b/etc/services	Tue Jul 22 17:11:09 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: services,v 1.97 2013/03/21 17:45:03 christos Exp $
+# $NetBSD: services,v 1.98 2014/07/22 17:11:09 wiz Exp $
 # See also: services(5), http://www.sethwklein.net/projects/iana-etc/
 #
 #  Last Updated
@@ -19742,7 +19742,7 @@
 uucpd		540/tcp
 uucpd		540/udp
 rdist		541/tcp	rdistd
-rfs_server	556/tcp	rfs		# Brunhoff remote filesystem
+rfs_server	556/tcp	rfs		# Brunhoff remote file system
 smtps		465/tcp			# smtp protocol over TLS/SSL
 smtps		465/udp			# smtp protocol over TLS/SSL
 kdc		750/tcp	kerberos4