Merge branch 'spelling'

Conflicts:
	rc.sysinit

Had to manually fix up a conflict in some comments.

10 files changed, 89 insertions, 89 deletions

diff --git a/PKGBUILD b/PKGBUILD
index e7429cd..e2e4f3d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ pkgver=$(date +%Y%m%d)
 pkgrel=$(git log -1 --pretty=format:%h)
 pkgdesc="System initialization/bootup scripts"
 arch=('any')
-url="http://www.archlinux.org"
+url="https://www.archlinux.org"
 license=('GPL')
 groups=('base')
 conflicts=('initscripts')
@@ -26,5 +26,5 @@ build() {
 
 package() {
   cd ..
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir/" install
 }
diff --git a/functions b/functions
index 7fd5258..a0cea12 100644
--- a/functions
+++ b/functions
@@ -2,7 +2,7 @@
 # initscripts functions
 #
 
-# sanitize PATH (will be overridden later when /etc/profile is sourced, but is useful for UDev)
+# sanitize PATH (will be overridden later when /etc/profile is sourced but is useful for udev)
 export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
 localevars=(LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY
@@ -13,7 +13,7 @@ vconsolevars=(KEYMAP KEYMAP_TOGGLE FONT FONT_MAP FONT_UNIMAP)
 
 if [[ $1 == "start" ]]; then
 	if [[ $STARTING ]]; then
-		echo "A daemon is starting another daemon, this is unlikely to work as intended."
+		echo "A daemon is starting another daemon; this is unlikely to work as intended."
 	else
 		export STARTING=1
 	fi
@@ -69,7 +69,7 @@ unset TERM_COLORS
 # clear the TZ envvar, so daemons always respect /etc/localtime
 unset TZ
 
-# sanitize the locale settins
+# sanitize the locale settings
 unset "${localevars[@]}"
 
 parse_envfile() {
@@ -325,13 +325,13 @@ kill_all_wait() {
 }
 
 kill_all() {
-	stat_busy "Sending SIGTERM To Processes"
+	stat_busy "Sending SIGTERM to processes"
 		kill_all_wait 15 40
 		if (( $? == 0 )); then
 			stat_done
 		else
 			stat_fail
-			status "Sending SIGKILL To Processes" kill_all_wait 9 60
+			status "Sending SIGKILL to processes" kill_all_wait 9 60
 		fi
 }
 
@@ -349,23 +349,23 @@ load_modules() {
 	return $rc
 }
 
-# Start/trigger UDev, load MODULES and settle UDev
+# Start/trigger udev, load MODULES, and settle udev
 udevd_modprobe() {
 	# $1 = where we are being called from.
 	# This is used to determine which hooks to run.
-	status "Starting UDev Daemon" /usr/lib/systemd/systemd-udevd --daemon
+	status "Starting udev daemon" /usr/lib/systemd/systemd-udevd --daemon
 
 	run_hook "$1_udevlaunched"
 
-	stat_busy "Triggering UDev uevents"
+	stat_busy "Triggering udev uevents"
 		udevadm trigger --action=add --type=subsystems
 		udevadm trigger --action=add --type=devices
 	stat_done
 
 	# Load modules from the MODULES array and modules-load.d
-	status -v "Loading User-specified Modules" load_modules
+	status -v "Loading user-specified modules" load_modules
 
-	status "Waiting for UDev uevents to be processed" \
+	status "Waiting for udev uevents to be processed" \
 		udevadm settle
 
 	run_hook "$1_udevsettled"
@@ -402,14 +402,14 @@ do_unlock_legacy() {
 			local _overwriteokay=0
 			if [[ -b $2 && -r $2 ]]; then
 				# This is DANGEROUS! If there is any known file system,
-				# partition table, RAID or LVM volume on the device
+				# partition table, RAID, or LVM volume on the device,
 				# we don't overwrite it.
 				#
 				# 'blkid' returns 2 if no valid signature has been found.
-				# Only in this case we should allow overwriting the device.
+				# Only in this case should we allow overwriting the device.
 				#
 				# This sanity check _should_ be sufficient, but it might not.
-				# This may cause dataloss if it is not used carefully.
+				# This may cause data loss if it is not used carefully.
 				blkid -p "$2" &>/dev/null
 				(( $? == 2 )) && _overwriteokay=1
 			fi
@@ -535,7 +535,7 @@ set_timezone() {
 	[[ $tz ]] || return 1
 
 	if [[ ! -e $zonefile ]]; then
-		printf "error: \`%s' is not a valid timezone\n" "$tz"
+		printf "error: \`%s' is not a valid time zone\n" "$tz"
 		return 1
 	fi
 
@@ -583,8 +583,8 @@ fsck_reboot() {
 		echo "*                                                          *"
 		echo "*  Please repair manually and reboot. Note that the root   *"
 		echo "*  file system is currently mounted read-only. To remount  *"
-		echo "*  it read-write type: mount -o remount,rw /               *"
-		echo "*  When you exit the maintenance shell the system will     *"
+		echo "*  it read-write, type: mount -o remount,rw /              *"
+		echo "*  When you exit the maintenance shell, the system will    *"
 		echo "*  reboot automatically.                                   *"
 		echo "*                                                          *"
 		echo "************************************************************"
@@ -607,12 +607,12 @@ umount_all() {
 
 	findmnt -mrunRo TARGET,FSTYPE,OPTIONS / | {
 		while read -r target fstype options; do
-			# match only targetted fstypes
+			# match only targeted fstypes
 			if [[ $1 && $1 != "$fstype" ]]; then
 				continue
 			fi
 
-			# don't unmount API filesystems
+			# do not unmount API filesystems
 			if [[ $target = /@(proc|sys|run|dev|dev/pts) ]]; then
 				continue
 			fi
@@ -634,7 +634,7 @@ umount_all() {
 }
 
 remove_leftover() {
-	status -v 'Removing Leftover Files' systemd-tmpfiles --create --remove --clean
+	status -v 'Removing leftover files' systemd-tmpfiles --create --remove --clean
 }
 
 bootlogd_stop() {
diff --git a/netfs b/netfs
index bd459ef..0733eab 100755
--- a/netfs
+++ b/netfs
@@ -6,7 +6,7 @@
 
 case "$1" in
 	start)
-		stat_busy "Mounting Network Filesystems"
+		stat_busy "Mounting network filesystems"
 		mount -a -t "$NETFS"
 		rc=$?
 		mount -a -O _netdev
@@ -15,7 +15,7 @@ case "$1" in
 		stat_done
 		;;
 	stop)
-		stat_busy "Unmounting Network Filesystems"
+		stat_busy "Unmounting network filesystems"
 		umount -a -f -O _netdev
 		rc=$?
 		umount -a -f -t "$NETFS"
diff --git a/network b/network
index 322082c..494a11f 100755
--- a/network
+++ b/network
@@ -235,15 +235,15 @@ case "$1" in
 		# deprecation check
 		need_legacy && deprecated
 		if ! ck_daemon network; then
-			echo "Network is already running.  Try 'network restart'"
+			echo "Network is already running. Try 'network restart'"
 			exit
 		fi
-		stat_busy "Starting Network"
+		stat_busy "Starting network"
 		error=0
 		if need_legacy; then
 			# bring up bridge interfaces
 			bridge_up
-			# bring up ethernet interfaces
+			# bring up Ethernet interfaces
 			for ifline in ${INTERFACES[@]}; do
 				if [[ $ifline = ${ifline#!} ]]; then
 					ifup $ifline || error=1
@@ -271,11 +271,11 @@ case "$1" in
 		# deprecation check
 		need_legacy && deprecated
 		if [[ $NETWORK_PERSIST =~ yes|YES && $RUNLEVEL == [06] ]]; then
-			status "Skipping Network Shutdown" true
+			status "Skipping network shutdown" true
 			exit 0
 		fi
 
-		stat_busy "Stopping Network"
+		stat_busy "Stopping network"
 		rm_daemon network
 		error=0
 		if need_legacy; then
diff --git a/rc.conf.5.txt b/rc.conf.5.txt
index 347aba7..debb789 100644
--- a/rc.conf.5.txt
+++ b/rc.conf.5.txt
@@ -16,21 +16,21 @@ DESCRIPTION
 -----------
 The /etc/rc.conf file is the system configuration file for Arch-specific
 settings. The format is bash. It contains several commonly-edited settings such
-as timezone; keymap; kernel modules; daemons to load at start-up; etc. It is
+as time zone, keymap, kernel modules, daemons to load at start-up, etc. It is
 split up in a few sections to categorize configuration settings: localization,
-hardware, networking and daemons.
+hardware, networking, and daemons.
 
 LOCALIZATION[[L]]
 -----------------
 *TIMEZONE=*
 
-Specifies the timezone. The setting takes effect on boot by ensuring that /etc/localtime is a symlink
-to the correct zoneinfo file. Possible timezones are the relative path to a zoneinfo file starting
-from the directory /usr/share/zoneinfo. For example, a German timezone would be Europe/Berlin,
+Specifies the time zone. The setting takes effect on boot by ensuring that /etc/localtime is a symlink
+to the correct zoneinfo file. Possible time zones are the relative path to a zoneinfo file starting
+from the directory /usr/share/zoneinfo. For example, a German time zone would be Europe/Berlin,
 which refers to the file /usr/share/zoneinfo/Europe/Berlin.
 
-Note: if empty, /etc/localtime is not changed. This is useful if /etc/localtime is maintained manually
-or by a third-party tool; or if there is no reason to change it from what was set during install.
+Note: If empty, /etc/localtime is not changed. This is useful if /etc/localtime is maintained manually
+or by a third-party tool, or if there is no reason to change it from what was set during install.
 
 Default: empty
 
@@ -43,9 +43,9 @@ Options:
 	- empty: fall back to the value in /var/lib/hwclock/adjtime, which defaults to UTC. This is recommended
 	  as other users of hwclock might change the adjtime file and hence cause rc.conf and adjtime to be out of sync.
 	- "UTC": most robust, allows operating systems to abstract local time and ease DST.
-	- "localtime": apply timezone (and DST) in hardwareclock: discouraged.
-	  Choose this if you dualboot with an OS which cannot handle UTC BIOS times correctly, like Windows (note
-	  that recent Windows'es can use UTC, which is preferable).
+	- "localtime": apply time zone (and DST) in hardwareclock: discouraged.
+	  Choose this if you dual-boot with an OS which cannot handle UTC BIOS times correctly, like Windows (note
+	  that recent Windows versions can use UTC, which is preferable).
 	- any other value will result in the hardware clock being left untouched (useful for virtualization)
 
 Default: empty
@@ -87,14 +87,14 @@ Default: empty
 
 *DAEMON_LOCALE=*
 
-	- If set to 'yes', use $LOCALE as the locale during daemon startup and during the boot process.
+	- If set to 'yes', use $LOCALE as the locale during daemon start-up and during the boot process.
 	- If set to 'no', the C locale is used.
 
 Default: "yes"
 
 *USECOLOR=*
 
-Use ANSI color sequences in startup messages
+Use ANSI color sequences in start-up messages
 
 Default: "yes"
 
@@ -102,26 +102,26 @@ HARDWARE[[H]]
 -------------
 *MODULES=*
 
-Modules to load at boot-up.  To blacklist modules, see "man modprobe.d". See also
-"man modules-load.d".
+Modules to load at boot-up.  To blacklist modules, see 'man 5 modprobe.d'. See also
+'man 5 modules-load.d'.
 
 Default: ().
 
 *USEDMRAID=*
 
-Scan for FakeRAID (dmraid) Volumes at startup.
+Scan for FakeRAID (dmraid) volumes at start-up.
 
 Default: "no"
 
 *USEBTRFS=*
 
-Scan for BTRFS volumes at startup.
+Scan for Btrfs volumes at start-up.
 
 Default: "no"
 
 *USELVM=*
 
-Scan for LVM volume groups at startup, required if you use LVM.
+Scan for LVM volume groups at start-up. This is required if you use LVM.
 
 Default: "no"
 
@@ -138,7 +138,7 @@ The following settings help you setting up a wired network.
 
 *interface=*
 
-Name of device. Use 'ip addr' or 'ls /sys/class/net/' to see all available interfaces.
+Name of device. Use `ip addr` or `ls /sys/class/net/` to see all available interfaces.
 
 Default: empty
 
@@ -191,7 +191,7 @@ Required for manual configuration, ignored for DHCP.
 	netmask=
 	gateway=
 
-The following options might be needed for advanced use-cases.
+The following options might be needed for advanced use cases.
 
 *NETWORK_PERSIST=*
 
@@ -201,7 +201,7 @@ Default: "no"
 
 *NETWORKS=*
 
-This functionality is deprecated, please refer to the 'netcfg' documentation.
+This functionality is deprecated; please refer to 'man 8 netcfg'.
 
 DAEMONS[[D]]
 ------------
@@ -213,10 +213,10 @@ Daemons to start at boot-up (in this order)
 	- prefix a daemon with a @ to start it up in the background
 
 If you are sure nothing else touches your hardware clock (such as ntpd or
-a dual-boot), you might want to enable 'hwclock'. Note that this will only
+by dual-booting), you might want to enable 'hwclock'. Note that this will only
 make a difference if the hwclock program has been calibrated correctly.
 
-If you use a network filesystem you should enable 'netfs'.
+If you use a network filesystem, you should enable 'netfs'.
 
 Default: (syslog-ng network crond)
 
@@ -227,4 +227,4 @@ hostname(5), vconsole.conf(5), locale.conf(5), hwclock(8)
 
 AUTHORS
 -------
-Written by Dieter Plaetinck, Tom Gundersen and others.
+Written by Dieter Plaetinck, Tom Gundersen, and others.
diff --git a/rc.d.8.txt b/rc.d.8.txt
index 0f35884..df226d3 100644
--- a/rc.d.8.txt
+++ b/rc.d.8.txt
@@ -25,7 +25,7 @@ The actions supported by a rc scripts may be different from script to script, bu
 commonly supported actions include:
 
 *start*::
-	Starts the script if it's not already running.
+	Starts the script if it is not already running.
 
 *stop*::
 	Stops a running script.
diff --git a/rc.local b/rc.local
index 4950cba..21254f1 100755
--- a/rc.local
+++ b/rc.local
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# /etc/rc.local: Local multi-user startup script.
+# /etc/rc.local: Local multi-user start-up script.
 #
 
 
diff --git a/rc.shutdown b/rc.shutdown
index d10b2da..2d79379 100755
--- a/rc.shutdown
+++ b/rc.shutdown
@@ -10,7 +10,7 @@
 stty onlcr
 
 echo " "
-printhl "Initiating Shutdown..."
+printhl "Initiating shutdown..."
 echo " "
 
 run_hook shutdown_start
@@ -19,19 +19,19 @@ run_hook shutdown_start
 
 stop_all_daemons
 
-status 'Saving Random Seed' /usr/lib/systemd/systemd-random-seed save
+status 'Saving random seed' /usr/lib/systemd/systemd-random-seed save
 
-[[ $TIMEZONE ]] && status "Configuring Time Zone" set_timezone "$TIMEZONE"
+[[ $TIMEZONE ]] && status "Configuring time zone" set_timezone "$TIMEZONE"
 
 # Write to wtmp file before unmounting
 halt -w
 
-# stop monitoring of lvm2 groups before unmounting filesystems
+# stop monitoring of LVM2 groups before unmounting filesystems
 [[ $USELVM = [Yy][Ee][Ss] && -x $(type -P lvm) ]] &&
 	status "Deactivating monitoring of LVM2 groups" vgchange --monitor n
 
 # any future uevents can and should be ignored
-status "Shutting down UDev" udevadm control --exit
+status "Shutting down udev" udevadm control --exit
 
 run_hook shutdown_prekillall
 
@@ -41,15 +41,15 @@ run_hook shutdown_postkillall
 
 run_hook shutdown_preumount
 
-# unmount any non-api partitions that are backed by swap, we don't want to
+# unmount any non-API partitions that are backed by swap; we don't want to
 # move their contents into memory (waste of time and might caues OOM).
-status "Unmounting Swap-backed Filesystems" umount_all "tmpfs"
+status "Unmounting swap-backed filesystems" umount_all "tmpfs"
 
 # almost everything is dead now, so the swap should hopefully be relatively
 # empty, and quick to switch off
-status "Deactivating Swap" swapoff -a
+status "Deactivating swap" swapoff -a
 
-status "Unmounting Non-API Filesystems" umount_all
+status "Unmounting non-API filesystems" umount_all
 
 run_hook shutdown_postumount
 
@@ -90,14 +90,14 @@ if [[ -x /run/initramfs/shutdown ]]; then
 		fi
 	fi
 
-	# make /run/initrafs a mount
+	# make /run/initramfs a mount
 	mount --bind /run/initramfs /run/initramfs
 
 	# in case someone has shared our mountpoints, unshare them
 	mount --make-private /run/initramfs
 	mount --make-private /
 
-	# bind all api mounts
+	# bind all API mounts
 	mkdir -p /run/initramfs/{sys,proc,dev,run,oldroot}
 	mount --bind /sys /run/initramfs/sys
 	mount --bind /proc /run/initramfs/proc
@@ -108,7 +108,7 @@ if [[ -x /run/initramfs/shutdown ]]; then
 	cd /run/initramfs
 	pivot_root . oldroot
 
-	#reexec init
+	# reexec init
 	/oldroot/sbin/init u
 
 	# run /shutdown in the new root
@@ -116,7 +116,7 @@ if [[ -x /run/initramfs/shutdown ]]; then
 
 else
 
-	status "Remounting Root Filesystem Read-only" \
+	status "Remounting root filesystem read-only" \
 		mount -o remount,ro /
 
 	# Power off or reboot
diff --git a/rc.single b/rc.single
index aec026c..3697ac3 100755
--- a/rc.single
+++ b/rc.single
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# /etc/rc.single: Single-user startup script.
+# /etc/rc.single: Single-user start-up script.
 #
 
 . /etc/rc.conf
@@ -18,7 +18,7 @@ if [[ $PREVLEVEL != N ]]; then
 
 	run_hook single_postkillall
 
-	# Start/trigger UDev, load MODULES and settle UDev
+	# Start/trigger udev, load MODULES, and settle udev
 	udevd_modprobe single
 	
 	# Removing leftover files
diff --git a/rc.sysinit b/rc.sysinit
index 13b2b22..0514343 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -14,10 +14,10 @@ fi
 
 echo " "
 printhl "Arch Linux\n"
-printhl "${C_H2}http://www.archlinux.org"
+printhl "${C_H2}https://www.archlinux.org"
 printsep
 
-# mount the api filesystems
+# mount the API filesystems
 # /proc, /sys, /run, /dev, /run/lock, /dev/pts, /dev/shm
 mountpoint -q /proc    || mount -t proc proc /proc -o nosuid,noexec,nodev
 mountpoint -q /sys     || mount -t sysfs sys /sys -o nosuid,noexec,nodev
@@ -34,7 +34,7 @@ if [[ ! -e /run/initramfs/root-fsck ]]; then
 	# remount root ro to allow for fsck later on, we remount now to
 	# make sure nothing can open files rw on root which would block a remount
 	findmnt / --options ro &>/dev/null ||
-		status "Mounting Root Read-Only" mount -o remount,ro /
+		status "Mounting root read-only" mount -o remount,ro /
 fi
 
 run_hook sysinit_start
@@ -48,12 +48,12 @@ case $HARDWARECLOCK in
 esac
 
 if [[ $HWCLOCK_PARAMS ]]; then
-	stat_busy "Adjusting system time and setting kernel timezone"
+	stat_busy "Adjusting system time and setting kernel time zone"
 
-	# Adjust the system time for timezone offset if rtc is not in UTC, as
+	# Adjust the system time for time zone offset if rtc is not in UTC, as
 	# filesystem checks can depend on system time. This also sets the kernel
 	# time zone, used by e.g. vfat.
-	# If TIMEZONE is not set in rc.conf, the timezone stored in /etc/localtime
+	# If TIMEZONE is not set in rc.conf, the time zone stored in /etc/localtime
 	# is used. If HARDWARECLOCK is not set in rc.conf, the value in
 	# /etc/adjfile is used.
 
@@ -64,11 +64,11 @@ if [[ $HWCLOCK_PARAMS ]]; then
 	unset TZ
 fi
 
-# Start/trigger UDev, load MODULES and settle UDev
+# Start/trigger udev, load MODULES, and settle udev
 udevd_modprobe sysinit
 
 # this must be done after udev has loaded the KMS modules
-status 'Configuring Virtual Consoles' /usr/lib/systemd/systemd-vconsole-setup
+status 'Configuring virtual consoles' /usr/lib/systemd/systemd-vconsole-setup
 
 # bring up the loopback interface
 [[ -d /sys/class/net/lo ]] &&
@@ -78,11 +78,11 @@ status 'Configuring Virtual Consoles' /usr/lib/systemd/systemd-vconsole-setup
 [[ $USEDMRAID = [Yy][Ee][Ss] && -x $(type -P dmraid) ]] &&
 	status "Activating FakeRAID arrays" dmraid -i -ay
 
-# BTRFS devices detection
+# Btrfs devices detection
 [[ $USEBTRFS = [Yy][Ee][Ss] && -x $(type -P btrfs) ]] &&
-	status "Activating BTRFS volumes" btrfs device scan
+	status "Activating Btrfs volumes" btrfs device scan
 
-# Activate LVM2 groups if any
+# Activate LVM2 groups, if any
 activate_vgs
 
 # Set up non-root encrypted partition mappings
@@ -97,7 +97,7 @@ fi
 # Check filesystems
 run_hook sysinit_prefsck
 if [[ -x $(type -P fsck) ]]; then
-	stat_busy "Checking Filesystems"
+	stat_busy "Checking filesystems"
 		fsck_all >|"${FSCK_OUT:-/dev/stdout}" 2>|"${FSCK_ERR:-/dev/stdout}"
 	declare -r fsckret=$?
 	(( fsckret <= 1 )) && stat_done || stat_fail
@@ -109,25 +109,25 @@ run_hook sysinit_postfsck
 # Single-user login and/or automatic reboot if needed
 fsck_reboot $fsckret
 
-status "Remounting Root and API filesystems" \
+status "Remounting root and API filesystems" \
 	/usr/lib/systemd/systemd-remount-fs
 
-# now mount all the local filesystems
+# Now mount all the local filesystems
 run_hook sysinit_premount
-status "Mounting Local Filesystems" \
+status "Mounting local filesystems" \
 	mount_all
 run_hook sysinit_postmount
 
-# enable monitoring of lvm2 groups, now that the filesystems are mounted rw
+# Enable monitoring of LVM2 groups, now that the filesystems are mounted rw
 [[ $USELVM = [Yy][Ee][Ss] && -x $(type -P lvm) && -d /sys/block ]] &&
 	status "Activating monitoring of LVM2 groups" \
 		vgchange --monitor y >/dev/null
 
-status "Activating Swap" swapon -a
+status "Activating swap" swapon -a
 
-[[ $TIMEZONE ]] && status "Configuring Time Zone" set_timezone "$TIMEZONE"
+[[ $TIMEZONE ]] && status "Configuring time zone" set_timezone "$TIMEZONE"
 
-status 'Initializing Random Seed' /usr/lib/systemd/systemd-random-seed load
+status 'Initializing random seed' /usr/lib/systemd/systemd-random-seed load
 
 # Remove leftover files
 remove_leftover
@@ -136,11 +136,11 @@ if [[ -s /etc/hostname ]]; then
 	HOSTNAME=$(< /etc/hostname)
 fi
 if [[ $HOSTNAME ]]; then
-	stat_busy "Setting Hostname: $HOSTNAME"
+	stat_busy "Setting hostname: $HOSTNAME"
 	echo "$HOSTNAME" >| /proc/sys/kernel/hostname && stat_done || stat_fail
 fi
 
-stat_busy "Saving dmesg Log"
+stat_busy "Saving dmesg log"
 	if [[ -e /proc/sys/kernel/dmesg_restrict ]] &&
 		(( $(< /proc/sys/kernel/dmesg_restrict) == 1 )); then
 		install -Tm 0600 <( dmesg ) /var/log/dmesg.log