From 6655d00c603acb93693f0caf4be9389405125526 Mon Sep 17 00:00:00 2001
From: Seth Jennings <sjenning@redhat.com>
Date: Mon, 7 Apr 2014 12:08:19 -0500
Subject: [PATCH] change 'apply/remove' to 'load/unload'

After removing the distinction between 'enabled' modules and 'applied'
modules in 022e42bc, we can change the 'apply' and 'remove' subcommands,
to more intuitive 'load' and 'unload' subcommands.

Signed-off-by: Seth Jennings <sjenning@redhat.com>
---
 kpatch/kpatch | 10 +++++-----
 man/kpatch.1  | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/kpatch/kpatch b/kpatch/kpatch
index 214fc5f..2dff45e 100755
--- a/kpatch/kpatch
+++ b/kpatch/kpatch
@@ -20,7 +20,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA,
 # 02110-1301, USA.
 
-# This is the kpatch user script that manages installing, applying, and
+# This is the kpatch user script that manages installing, loading, and
 # displaying information about kernel patch modules installed on the system.
 
 KERNELRELEASE="$(uname -r)"
@@ -34,9 +34,9 @@ usage () {
 	printf '   %-20s %s\n' "install <file>"       "install hotpatch module to the kpatch DB" >&2
 	printf '   %-20s %s\n' "uninstall <hotpatch>" "uninstall hotpatch module from the kpatch DB" >&2
 	echo >&2
-	printf '   %-20s %s\n' "apply --all"          "apply all installed hotpatch modules to the running kernel" >&2
-	printf '   %-20s %s\n' "apply <hotpatch>"     "apply installed hotpatch module to the running kernel" >&2
-	printf '   %-20s %s\n' "remove <hotpatch>"    "remove hotpatch module from the running kernel" >&2
+	printf '   %-20s %s\n' "load --all"          "load all installed hotpatch modules to the running kernel" >&2
+	printf '   %-20s %s\n' "load <hotpatch>"     "load installed hotpatch module to the running kernel" >&2
+	printf '   %-20s %s\n' "unload <hotpatch>"    "unload hotpatch module from the running kernel" >&2
 	echo >&2
 	echo >&2
 	printf '   %-20s %s\n' "info <hotpatch>"      "show information about an installed hotpatch module" >&2
@@ -106,7 +106,7 @@ echo_patch_name() {
 unset MODULE
 [[ "$#" -gt 2 ]] || [[ "$#" -lt 1 ]] && usage
 case "$1" in
-"apply")
+"load")
 	[[ "$#" -ne 2 ]] && usage
 	case "$2" in
 	"--all")
diff --git a/man/kpatch.1 b/man/kpatch.1
index e9f9fae..02c4e86 100644
--- a/man/kpatch.1
+++ b/man/kpatch.1
@@ -6,7 +6,7 @@ kpatch \- hot patch module management
 .SH SYNOPSIS
 kpatch <command> [<args>]
 .SH DESCRIPTION
-kpatch is a user script that manages installing, applying, and 
+kpatch is a user script that manages installing, loading, and 
 displaying information about kernel patch modules installed on
 the system. 
 .SH OPTIONS
@@ -17,14 +17,14 @@ install <file>
 uninstall <hotpatch>
        uninstall hotpatch module from the kpatch DB
 
-apply --all
-       apply all enabled hotpatch modules to the running kernel
+load --all
+       load all enabled hotpatch modules to the running kernel
 
-apply <hotpatch>     
-       apply installed hotpatch module to the running kernel
+load <hotpatch>     
+       load installed hotpatch module to the running kernel
 
-remove <hotpatch>
-       remove hotpatch module from the running kernel
+unload <hotpatch>
+       unload hotpatch module from the running kernel
 
 info <hotpatch>
        show information about an installed hotpatch module