etcdctl/ctlv3: minor clean ups

- Fix typo
- Improve command ordering (elect should be below lock)
- Update migrate command description

etcdctl/ctlv3/command/migrate_command.go

@@ -51,7 +51,7 @@ var (
 func NewMigrateCommand() *cobra.Command {
 	mc := &cobra.Command{
 		Use:   "migrate",
-		Short: "migrate",
+		Short: "migrates keys in a v2 store to a mvcc store",
 		Run:   migrateCommandFunc,
 	}
 

etcdctl/ctlv3/command/role_command.go

@@ -33,8 +33,8 @@ func NewRoleCommand() *cobra.Command {
 	ac.AddCommand(newRoleDeleteCommand())
 	ac.AddCommand(newRoleGetCommand())
 	ac.AddCommand(newRoleListCommand())
-	ac.AddCommand(newRoleRevokePermissionCommand())
 	ac.AddCommand(newRoleGrantPermissionCommand())
+	ac.AddCommand(newRoleRevokePermissionCommand())
 
 	return ac
 }

etcdctl/ctlv3/command/user_command.go

@@ -89,7 +89,7 @@ func newUserChangePasswordCommand() *cobra.Command {
 		Run:   userChangePasswordCommandFunc,
 	}
 
-	cmd.Flags().BoolVar(&passwordInteractive, "interactive", true, "read password from stdin instead of interactive terminal")
+	cmd.Flags().BoolVar(&passwordInteractive, "interactive", true, "if true, read password from stdin instead of interactive terminal")
 
 	return &cmd
 }
@@ -105,7 +105,7 @@ func newUserGrantRoleCommand() *cobra.Command {
 func newUserRevokeRoleCommand() *cobra.Command {
 	return &cobra.Command{
 		Use:   "revoke-role <user name> <role name>",
-		Short: "revoke a role from from a user",
+		Short: "revoke a role from a user",
 		Run:   userRevokeRoleCommandFunc,
 	}
 }

etcdctl/ctlv3/ctl.go

@@ -76,8 +76,8 @@ func init() {
 		command.NewMakeMirrorCommand(),
 		command.NewMigrateCommand(),
 		command.NewLockCommand(),
-		command.NewAuthCommand(),
 		command.NewElectCommand(),
+		command.NewAuthCommand(),
 		command.NewUserCommand(),
 		command.NewRoleCommand(),
 	)