Renamed CLI commands.

The following commands have been renamed for consistency:
* client-cert-remove     -> client-cert->del
* group-member-remove    -> group-member-del
* user-cert-remove       -> user-cert-del
* user-membership-remove -> user-membership-del

5 files changed, 7 insertions, 7 deletions

diff --git a/base/java-tools/man/man1/pki.1 b/base/java-tools/man/man1/pki.1
index c70315178..1f692e83d 100644
--- a/base/java-tools/man/man1/pki.1
+++ b/base/java-tools/man/man1/pki.1
@@ -132,7 +132,7 @@ The list of profiles can be viewed using the CLI command:
 
 The XML template file for a profile type can be created by calling the ca-cert-request-profile-show CLI command. For example:
 
-\fBpki ca-cert-request-profile-show <profileID> --output <file to store the XML template>\fP , 
+\fBpki ca-cert-request-profile-show <profileID> --output <file to store the XML template>\fP
 
 will store the XML template of the request in the specified output file.
 
@@ -173,11 +173,11 @@ To delete a group:
 
 To add a user to a group:
 
-.B pki <admin authentication> group-add-member <group ID> <Member ID>
+.B pki <admin authentication> group-member-add <group ID> <Member ID>
 
 To delete a user from a group:
 
-.B pki <admin authentication> group-remove-member <group ID> <Member ID>
+.B pki <admin authentication> group-member-del <group ID> <Member ID>
 
 .\".SS Key Management Commands
 .\"\fBpki\fP can be used with a KRA to find specific keys and key requests.  This will be documented in more detail at a later time.
diff --git a/base/java-tools/src/com/netscape/cmstools/client/ClientCertRemoveCLI.java b/base/java-tools/src/com/netscape/cmstools/client/ClientCertRemoveCLI.java
index 7549647be..89ff6de5b 100644
--- a/base/java-tools/src/com/netscape/cmstools/client/ClientCertRemoveCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/client/ClientCertRemoveCLI.java
@@ -31,7 +31,7 @@ public class ClientCertRemoveCLI extends CLI {
     public ClientCLI clientCLI;
 
     public ClientCertRemoveCLI(ClientCLI clientCLI) {
-        super("cert-remove", "Remove certificate from client security database", clientCLI);
+        super("cert-del", "Remove certificate from client security database", clientCLI);
         this.clientCLI = clientCLI;
     }
 
diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupMemberRemoveCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberRemoveCLI.java
index f340e7f64..3165aa08d 100644
--- a/base/java-tools/src/com/netscape/cmstools/group/GroupMemberRemoveCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberRemoveCLI.java
@@ -29,7 +29,7 @@ public class GroupMemberRemoveCLI extends CLI {
     public GroupMemberCLI groupMemberCLI;
 
     public GroupMemberRemoveCLI(GroupMemberCLI groupMemberCLI) {
-        super("remove", "Remove group member", groupMemberCLI);
+        super("del", "Remove group member", groupMemberCLI);
         this.groupMemberCLI = groupMemberCLI;
     }
 
diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserCertRemoveCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserCertRemoveCLI.java
index c68988fee..ed88163a7 100644
--- a/base/java-tools/src/com/netscape/cmstools/user/UserCertRemoveCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/user/UserCertRemoveCLI.java
@@ -32,7 +32,7 @@ public class UserCertRemoveCLI extends CLI {
     public UserCertCLI userCertCLI;
 
     public UserCertRemoveCLI(UserCertCLI userCertCLI) {
-        super("remove", "Remove user certificate", userCertCLI);
+        super("del", "Remove user certificate", userCertCLI);
         this.userCertCLI = userCertCLI;
     }
 
diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserMembershipRemoveCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserMembershipRemoveCLI.java
index bb0ca714b..b5d0948d5 100644
--- a/base/java-tools/src/com/netscape/cmstools/user/UserMembershipRemoveCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/user/UserMembershipRemoveCLI.java
@@ -29,7 +29,7 @@ public class UserMembershipRemoveCLI extends CLI {
     public UserMembershipCLI userMembershipCLI;
 
     public UserMembershipRemoveCLI(UserMembershipCLI userMembershipCLI) {
-        super("remove", "Remove user membership", userMembershipCLI);
+        super("del", "Remove user membership", userMembershipCLI);
         this.userMembershipCLI = userMembershipCLI;
     }