From c2f7b97924e2b5341cea667fbd1a2802e9cb8cd5 Mon Sep 17 00:00:00 2001
From: "Jason St. John" <jstjohn@purdue.edu>
Date: Fri, 6 Jul 2012 16:03:09 -0400
Subject: Correct spelling and grammar throughout

This patch addresses the issues with my previous patch submission here:
https://mailman.archlinux.org/pipermail/arch-projects/2012-June/002990.html

The notable changes between this patch and the previous one are below:
-- this patch does not rename set_timezone()
-- 'filesystems' and 'bash' are left as-is
-- everything is in one patch, not two
-- the 'makedepends' change is no longer relevant because the duplication
of it was already removed in a later commit

Regarding the capitalization of "Btrfs", it seems that upstream prefers
"Btrfs".[1][2]

Regarding 'https://' vs. 'http://', I left this change in the patch
because stating 'https://www.archlinux.org' in the start-up messages
doesn't force anyone to use HTTPS over HTTP. It simply shows that HTTPS
is available for use. If someone really doesn't want to use HTTPS, they
don't have to. Finally, Dan McGee stated that HTTPS will be used all the
time soon.[3]

[1] https://oss.oracle.com/projects/btrfs/
[2] https://btrfs.wiki.kernel.org/index.php/Main_Page
[3] https://bugs.archlinux.org/task/30486#comment96222

Signed-off-by: Jason St. John <jstjohn@purdue.edu>
---
 rc.shutdown | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'rc.shutdown')

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
-- 
cgit v1.2.3-54-g00ecf