diff --git a/etcdctl/ctlv3/command/migrate_command.go b/etcdctl/ctlv3/command/migrate_command.go index ed74b085f..a7a079a6e 100644 --- a/etcdctl/ctlv3/command/migrate_command.go +++ b/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, } diff --git a/etcdctl/ctlv3/command/role_command.go b/etcdctl/ctlv3/command/role_command.go index 3ae2f3d65..902fd0a76 100644 --- a/etcdctl/ctlv3/command/role_command.go +++ b/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 } diff --git a/etcdctl/ctlv3/command/user_command.go b/etcdctl/ctlv3/command/user_command.go index b1d41a4ab..5443db783 100644 --- a/etcdctl/ctlv3/command/user_command.go +++ b/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 ", - Short: "revoke a role from from a user", + Short: "revoke a role from a user", Run: userRevokeRoleCommandFunc, } } diff --git a/etcdctl/ctlv3/ctl.go b/etcdctl/ctlv3/ctl.go index 94e168040..19c660197 100644 --- a/etcdctl/ctlv3/ctl.go +++ b/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(), )