From ab6ef0e897797db5b867649682f75822606d8a27 Mon Sep 17 00:00:00 2001
From: phm07 <22707808+phm07@users.noreply.github.com>
Date: Mon, 25 Mar 2024 07:58:18 +0100
Subject: [PATCH] docs: improve command usage documentation (#709)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR makes command usage documentation consistent by enforcing
[docopt](http://docopt.org/) rules and also defining and documenting
other additional conventions.

Fixes #708

---------

Co-authored-by: Julian Tölle <julian.toelle@hetzner-cloud.de>
---
 CONTRIBUTING.md                                       | 10 ++++++++++
 internal/cmd/all/list.go                              |  2 +-
 internal/cmd/base/delete.go                           |  7 ++++++-
 internal/cmd/base/describe.go                         |  2 +-
 internal/cmd/base/labels.go                           |  4 ++--
 internal/cmd/base/list.go                             |  2 +-
 internal/cmd/base/set_rdns.go                         |  2 +-
 internal/cmd/base/update.go                           |  2 +-
 internal/cmd/certificate/create.go                    |  2 +-
 internal/cmd/completion/completion.go                 |  2 +-
 internal/cmd/context/active.go                        |  2 +-
 internal/cmd/context/context.go                       |  2 +-
 internal/cmd/context/create.go                        |  2 +-
 internal/cmd/context/delete.go                        |  2 +-
 internal/cmd/context/list.go                          |  2 +-
 internal/cmd/context/use.go                           |  2 +-
 internal/cmd/firewall/add_rule.go                     |  2 +-
 internal/cmd/firewall/apply_to_resource.go            |  2 +-
 internal/cmd/firewall/create.go                       |  2 +-
 internal/cmd/firewall/delete_rule.go                  |  2 +-
 internal/cmd/firewall/remove_from_resource.go         |  2 +-
 internal/cmd/firewall/replace_rules.go                |  2 +-
 internal/cmd/floatingip/assign.go                     |  2 +-
 internal/cmd/floatingip/create.go                     |  2 +-
 internal/cmd/floatingip/disable_protection.go         |  2 +-
 internal/cmd/floatingip/enable_protection.go          |  2 +-
 internal/cmd/floatingip/unassign.go                   |  2 +-
 internal/cmd/image/disable_protection.go              |  2 +-
 internal/cmd/image/enable_protection.go               |  2 +-
 internal/cmd/loadbalancer/add_service.go              |  2 +-
 internal/cmd/loadbalancer/add_target.go               |  2 +-
 internal/cmd/loadbalancer/attach_to_network.go        |  2 +-
 internal/cmd/loadbalancer/change_algorithm.go         |  2 +-
 internal/cmd/loadbalancer/change_type.go              |  2 +-
 internal/cmd/loadbalancer/create.go                   |  2 +-
 internal/cmd/loadbalancer/delete_service.go           |  2 +-
 internal/cmd/loadbalancer/detach_from_network.go      |  2 +-
 internal/cmd/loadbalancer/disable_protection.go       |  2 +-
 internal/cmd/loadbalancer/disable_public_interface.go |  2 +-
 internal/cmd/loadbalancer/enable_protection.go        |  2 +-
 internal/cmd/loadbalancer/enable_public_interface.go  |  2 +-
 internal/cmd/loadbalancer/metrics.go                  |  3 ++-
 internal/cmd/loadbalancer/remove_target.go            |  2 +-
 internal/cmd/loadbalancer/update_service.go           |  2 +-
 internal/cmd/network/add_route.go                     |  2 +-
 internal/cmd/network/add_subnet.go                    |  2 +-
 internal/cmd/network/change_ip_range.go               |  2 +-
 internal/cmd/network/create.go                        |  2 +-
 internal/cmd/network/disable_protection.go            |  2 +-
 internal/cmd/network/enable_protection.go             |  2 +-
 internal/cmd/network/expose_routes_to_vswitch.go      |  2 +-
 internal/cmd/network/remove_route.go                  |  2 +-
 internal/cmd/network/remove_subnet.go                 |  2 +-
 internal/cmd/placementgroup/create.go                 |  2 +-
 internal/cmd/primaryip/assign.go                      |  2 +-
 internal/cmd/primaryip/create.go                      |  2 +-
 internal/cmd/primaryip/disable_protection.go          |  2 +-
 internal/cmd/primaryip/enable_protection.go           |  2 +-
 internal/cmd/primaryip/unassign.go                    |  2 +-
 internal/cmd/server/add_to_placement_group.go         |  2 +-
 internal/cmd/server/attach_iso.go                     |  2 +-
 internal/cmd/server/attach_to_network.go              |  2 +-
 internal/cmd/server/change_alias_ips.go               |  2 +-
 internal/cmd/server/change_type.go                    |  2 +-
 internal/cmd/server/create.go                         |  2 +-
 internal/cmd/server/create_image.go                   |  2 +-
 internal/cmd/server/detach_from_network.go            |  2 +-
 internal/cmd/server/detach_iso.go                     |  2 +-
 internal/cmd/server/disable_backup.go                 |  2 +-
 internal/cmd/server/disable_protection.go             |  2 +-
 internal/cmd/server/disable_rescue.go                 |  2 +-
 internal/cmd/server/enable_backup.go                  |  2 +-
 internal/cmd/server/enable_protection.go              |  2 +-
 internal/cmd/server/enable_rescue.go                  |  2 +-
 internal/cmd/server/ip.go                             |  2 +-
 internal/cmd/server/metrics.go                        |  3 ++-
 internal/cmd/server/poweroff.go                       |  2 +-
 internal/cmd/server/poweron.go                        |  2 +-
 internal/cmd/server/reboot.go                         |  2 +-
 internal/cmd/server/rebuild.go                        |  2 +-
 internal/cmd/server/remove_from_placement_group.go    |  2 +-
 internal/cmd/server/request_console.go                |  2 +-
 internal/cmd/server/reset.go                          |  2 +-
 internal/cmd/server/reset_password.go                 |  2 +-
 internal/cmd/server/shutdown.go                       |  2 +-
 internal/cmd/server/ssh.go                            |  2 +-
 internal/cmd/sshkey/create.go                         |  2 +-
 internal/cmd/volume/attach.go                         |  2 +-
 internal/cmd/volume/create.go                         |  2 +-
 internal/cmd/volume/detach.go                         |  2 +-
 internal/cmd/volume/disable_protection.go             |  2 +-
 internal/cmd/volume/enable_protection.go              |  2 +-
 internal/cmd/volume/resize.go                         |  2 +-
 93 files changed, 110 insertions(+), 93 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 71a9bda5..93267bbf 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -35,6 +35,16 @@ goreleaser --snapshot --skip-publish --rm-dist
 
 ## Conventions
 
+### Command usage
+
+Command usage descriptions (namely `cobra.Command.Use`) should follow the [docopt](http://docopt.org/) syntax.
+
+Additionally:
+- Optional flags should be the first in the usage string.
+  - If there is more than one optional flag, you can use `[options]` to abbreviate.
+- Required flags should always be documented explicitly and before the positional arguments, but after the 
+  optional flags.
+
 ### Subcommand groups
 
 Cobra offers the functionality to group subcommands. The conventions on when and how to group commands are as follows:
diff --git a/internal/cmd/all/list.go b/internal/cmd/all/list.go
index 37a9ac12..efa56950 100644
--- a/internal/cmd/all/list.go
+++ b/internal/cmd/all/list.go
@@ -50,7 +50,7 @@ var ListCmd = base.Cmd{
 		}
 
 		cmd := &cobra.Command{
-			Use:   "list FLAGS",
+			Use:   "list [options]",
 			Short: "List all resources in the project",
 			Long: `List all resources in the project. This does not include static/public resources like locations, public ISOs, etc.
 
diff --git a/internal/cmd/base/delete.go b/internal/cmd/base/delete.go
index a1ef8342..1f215805 100644
--- a/internal/cmd/base/delete.go
+++ b/internal/cmd/base/delete.go
@@ -26,8 +26,13 @@ type DeleteCmd struct {
 
 // CobraCommand creates a command that can be registered with cobra.
 func (dc *DeleteCmd) CobraCommand(s state.State) *cobra.Command {
+	opts := ""
+	if dc.AdditionalFlags != nil {
+		opts = "[options] "
+	}
+
 	cmd := &cobra.Command{
-		Use:                   fmt.Sprintf("delete [FLAGS] %s", strings.ToUpper(dc.ResourceNameSingular)),
+		Use:                   fmt.Sprintf("delete %s<%s>", opts, strings.ToLower(dc.ResourceNameSingular)),
 		Short:                 dc.ShortDescription,
 		Args:                  cobra.ExactArgs(1),
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(dc.NameSuggestions(s.Client()))),
diff --git a/internal/cmd/base/describe.go b/internal/cmd/base/describe.go
index 2edb556d..0e3b7bcd 100644
--- a/internal/cmd/base/describe.go
+++ b/internal/cmd/base/describe.go
@@ -33,7 +33,7 @@ type DescribeCmd struct {
 // CobraCommand creates a command that can be registered with cobra.
 func (dc *DescribeCmd) CobraCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:                   fmt.Sprintf("describe [FLAGS] %s", strings.ToUpper(dc.ResourceNameSingular)),
+		Use:                   fmt.Sprintf("describe [options] <%s>", strings.ToLower(dc.ResourceNameSingular)),
 		Short:                 dc.ShortDescription,
 		Args:                  cobra.ExactArgs(1),
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(dc.NameSuggestions(s.Client()))),
diff --git a/internal/cmd/base/labels.go b/internal/cmd/base/labels.go
index 71897c0a..a3aa4dbd 100644
--- a/internal/cmd/base/labels.go
+++ b/internal/cmd/base/labels.go
@@ -27,7 +27,7 @@ type LabelCmds struct {
 // AddCobraCommand creates a command that can be registered with cobra.
 func (lc *LabelCmds) AddCobraCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:                   fmt.Sprintf("add-label [FLAGS] %s LABEL...", strings.ToUpper(lc.ResourceNameSingular)),
+		Use:                   fmt.Sprintf("add-label [--overwrite] <%s> <label>...", strings.ToLower(lc.ResourceNameSingular)),
 		Short:                 lc.ShortDescriptionAdd,
 		Args:                  cobra.MinimumNArgs(2),
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(lc.NameSuggestions(s.Client()))),
@@ -89,7 +89,7 @@ func validateAddLabel(_ *cobra.Command, args []string) error {
 // RemoveCobraCommand creates a command that can be registered with cobra.
 func (lc *LabelCmds) RemoveCobraCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   fmt.Sprintf("remove-label [FLAGS] %s LABEL...", strings.ToUpper(lc.ResourceNameSingular)),
+		Use:   fmt.Sprintf("remove-label <%s> (--all | <label>...)", strings.ToLower(lc.ResourceNameSingular)),
 		Short: lc.ShortDescriptionRemove,
 		Args:  cobra.MinimumNArgs(1),
 		ValidArgsFunction: cmpl.SuggestArgs(
diff --git a/internal/cmd/base/list.go b/internal/cmd/base/list.go
index a15dcff0..c6ccb5e8 100644
--- a/internal/cmd/base/list.go
+++ b/internal/cmd/base/list.go
@@ -29,7 +29,7 @@ func (lc *ListCmd) CobraCommand(s state.State) *cobra.Command {
 	outputColumns := lc.OutputTable(s.Client()).Columns()
 
 	cmd := &cobra.Command{
-		Use:   "list [FlAGS]",
+		Use:   "list [options]",
 		Short: fmt.Sprintf("List %s", lc.ResourceNamePlural),
 		Long: util.ListLongDescription(
 			fmt.Sprintf("Displays a list of %s.", lc.ResourceNamePlural),
diff --git a/internal/cmd/base/set_rdns.go b/internal/cmd/base/set_rdns.go
index d363ad7a..e189a127 100644
--- a/internal/cmd/base/set_rdns.go
+++ b/internal/cmd/base/set_rdns.go
@@ -28,7 +28,7 @@ type SetRdnsCmd struct {
 // CobraCommand creates a command that can be registered with cobra.
 func (rc *SetRdnsCmd) CobraCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:                   fmt.Sprintf("set-rdns [FLAGS] %s", strings.ToUpper(rc.ResourceNameSingular)),
+		Use:                   fmt.Sprintf("set-rdns [options] --hostname <hostname> <%s>", strings.ToLower(rc.ResourceNameSingular)),
 		Short:                 rc.ShortDescription,
 		Args:                  cobra.ExactArgs(1),
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(rc.NameSuggestions(s.Client()))),
diff --git a/internal/cmd/base/update.go b/internal/cmd/base/update.go
index 9ddf0c30..48458d64 100644
--- a/internal/cmd/base/update.go
+++ b/internal/cmd/base/update.go
@@ -28,7 +28,7 @@ type UpdateCmd struct {
 // CobraCommand creates a command that can be registered with cobra.
 func (uc *UpdateCmd) CobraCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:                   fmt.Sprintf("update [FLAGS] %s", strings.ToUpper(uc.ResourceNameSingular)),
+		Use:                   fmt.Sprintf("update [options] <%s>", strings.ToLower(uc.ResourceNameSingular)),
 		Short:                 uc.ShortDescription,
 		Args:                  cobra.ExactArgs(1),
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(uc.NameSuggestions(s.Client()))),
diff --git a/internal/cmd/certificate/create.go b/internal/cmd/certificate/create.go
index 53c3d072..c23f119f 100644
--- a/internal/cmd/certificate/create.go
+++ b/internal/cmd/certificate/create.go
@@ -17,7 +17,7 @@ import (
 var CreateCmd = base.CreateCmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:   "create [FLAGS]",
+			Use:   "create [options] --name <name> (--type managed --domain <domain> | --type uploaded --cert-file <file> --key-file <file>)",
 			Short: "Create or upload a Certificate",
 			Args:  cobra.ExactArgs(0),
 		}
diff --git a/internal/cmd/completion/completion.go b/internal/cmd/completion/completion.go
index b691efd9..2a1cf56b 100644
--- a/internal/cmd/completion/completion.go
+++ b/internal/cmd/completion/completion.go
@@ -33,7 +33,7 @@ import (
 
 func NewCommand(_ state.State) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "completion [FLAGS] SHELL",
+		Use:   "completion <shell>",
 		Short: "Output shell completion code for the specified shell",
 		Long: `To load completions:
 
diff --git a/internal/cmd/context/active.go b/internal/cmd/context/active.go
index fdedeccd..cacfe057 100644
--- a/internal/cmd/context/active.go
+++ b/internal/cmd/context/active.go
@@ -11,7 +11,7 @@ import (
 
 func newActiveCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:                   "active [FLAGS]",
+		Use:                   "active",
 		Short:                 "Show active context",
 		Args:                  cobra.NoArgs,
 		TraverseChildren:      true,
diff --git a/internal/cmd/context/context.go b/internal/cmd/context/context.go
index b7138297..ff49fd42 100644
--- a/internal/cmd/context/context.go
+++ b/internal/cmd/context/context.go
@@ -8,7 +8,7 @@ import (
 
 func NewCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:                   "context [FLAGS]",
+		Use:                   "context",
 		Short:                 "Manage contexts",
 		Args:                  cobra.NoArgs,
 		TraverseChildren:      true,
diff --git a/internal/cmd/context/create.go b/internal/cmd/context/create.go
index 805bdcec..c8d8d27e 100644
--- a/internal/cmd/context/create.go
+++ b/internal/cmd/context/create.go
@@ -17,7 +17,7 @@ import (
 
 func newCreateCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:                   "create [FLAGS] NAME",
+		Use:                   "create <name>",
 		Short:                 "Create a new context",
 		Args:                  cobra.ExactArgs(1),
 		TraverseChildren:      true,
diff --git a/internal/cmd/context/delete.go b/internal/cmd/context/delete.go
index f97471c8..a26f5193 100644
--- a/internal/cmd/context/delete.go
+++ b/internal/cmd/context/delete.go
@@ -13,7 +13,7 @@ import (
 
 func newDeleteCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:                   "delete [FLAGS] NAME",
+		Use:                   "delete <context>",
 		Short:                 "Delete a context",
 		Args:                  cobra.ExactArgs(1),
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidates(config.ContextNames(s.Config())...)),
diff --git a/internal/cmd/context/list.go b/internal/cmd/context/list.go
index 49ccd824..955a4f9f 100644
--- a/internal/cmd/context/list.go
+++ b/internal/cmd/context/list.go
@@ -24,7 +24,7 @@ func init() {
 
 func newListCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "list [FLAGS]",
+		Use:   "list [options]",
 		Short: "List contexts",
 		Long: util.ListLongDescription(
 			"Displays a list of contexts.",
diff --git a/internal/cmd/context/use.go b/internal/cmd/context/use.go
index 54d3cf30..a4e73ce5 100644
--- a/internal/cmd/context/use.go
+++ b/internal/cmd/context/use.go
@@ -13,7 +13,7 @@ import (
 
 func newUseCommand(s state.State) *cobra.Command {
 	cmd := &cobra.Command{
-		Use:                   "use [FLAGS] NAME",
+		Use:                   "use <context>",
 		Short:                 "Use a context",
 		Args:                  cobra.ExactArgs(1),
 		ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidates(config.ContextNames(s.Config())...)),
diff --git a/internal/cmd/firewall/add_rule.go b/internal/cmd/firewall/add_rule.go
index 9fb468a5..5f26737d 100644
--- a/internal/cmd/firewall/add_rule.go
+++ b/internal/cmd/firewall/add_rule.go
@@ -16,7 +16,7 @@ import (
 var AddRuleCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "add-rule FIREWALL FLAGS",
+			Use:                   "add-rule [options] (--direction in --source-ips <ips> | --direction out --destination-ips <ips>) --protocol <icmp|udp|tcp|esp|gre> <firewall>",
 			Short:                 "Add a single rule to a firewall",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Firewall().Names)),
diff --git a/internal/cmd/firewall/apply_to_resource.go b/internal/cmd/firewall/apply_to_resource.go
index 156d03bc..2909d9f7 100644
--- a/internal/cmd/firewall/apply_to_resource.go
+++ b/internal/cmd/firewall/apply_to_resource.go
@@ -15,7 +15,7 @@ import (
 var ApplyToResourceCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "apply-to-resource FIREWALL FLAGS",
+			Use:                   "apply-to-resource (--type server --server <server> | --type label_selector --label-selector <label-selector>) <firewall>",
 			Short:                 "Applies a Firewall to a single resource",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Firewall().Names)),
diff --git a/internal/cmd/firewall/create.go b/internal/cmd/firewall/create.go
index 2feb9df5..4971a019 100644
--- a/internal/cmd/firewall/create.go
+++ b/internal/cmd/firewall/create.go
@@ -20,7 +20,7 @@ import (
 var CreateCmd = base.CreateCmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:   "create FLAGS",
+			Use:   "create [options] --name <name>",
 			Short: "Create a Firewall",
 			Args:  cobra.NoArgs,
 		}
diff --git a/internal/cmd/firewall/delete_rule.go b/internal/cmd/firewall/delete_rule.go
index 52df4fa0..371a506e 100644
--- a/internal/cmd/firewall/delete_rule.go
+++ b/internal/cmd/firewall/delete_rule.go
@@ -17,7 +17,7 @@ import (
 var DeleteRuleCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "delete-rule FIREWALL FLAGS",
+			Use:                   "delete-rule [options] (--direction in --source-ips <ips> | --direction out --destination-ips <ips>) --protocol <icmp|esp|gre|udp|tcp> <firewall>",
 			Short:                 "Delete a single rule to a firewall",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Firewall().Names)),
diff --git a/internal/cmd/firewall/remove_from_resource.go b/internal/cmd/firewall/remove_from_resource.go
index c2ab8e98..b8c59a15 100644
--- a/internal/cmd/firewall/remove_from_resource.go
+++ b/internal/cmd/firewall/remove_from_resource.go
@@ -15,7 +15,7 @@ import (
 var RemoveFromResourceCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "remove-from-resource FIREWALL FLAGS",
+			Use:                   "remove-from-resource (--type server --server <server> | --type label_selector --label-selector <label-selector>) <firewall>",
 			Short:                 "Removes a Firewall from a single resource",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Firewall().Names)),
diff --git a/internal/cmd/firewall/replace_rules.go b/internal/cmd/firewall/replace_rules.go
index 4e6eaa7a..c633fae5 100644
--- a/internal/cmd/firewall/replace_rules.go
+++ b/internal/cmd/firewall/replace_rules.go
@@ -20,7 +20,7 @@ import (
 var ReplaceRulesCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "replace-rules FIREWALL FLAGS",
+			Use:                   "replace-rules --rules-file <file> <firewall>",
 			Short:                 "Replaces all rules from a Firewall from a file",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Firewall().Names)),
diff --git a/internal/cmd/floatingip/assign.go b/internal/cmd/floatingip/assign.go
index 40865898..693ff309 100644
--- a/internal/cmd/floatingip/assign.go
+++ b/internal/cmd/floatingip/assign.go
@@ -14,7 +14,7 @@ import (
 var AssignCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:   "assign [FLAGS] FLOATINGIP SERVER",
+			Use:   "assign <floating-ip> <server>",
 			Short: "Assign a Floating IP to a server",
 			Args:  cobra.ExactArgs(2),
 			ValidArgsFunction: cmpl.SuggestArgs(
diff --git a/internal/cmd/floatingip/create.go b/internal/cmd/floatingip/create.go
index 33765b73..464fe117 100644
--- a/internal/cmd/floatingip/create.go
+++ b/internal/cmd/floatingip/create.go
@@ -17,7 +17,7 @@ import (
 var CreateCmd = base.CreateCmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "create FLAGS",
+			Use:                   "create [options] --type <ipv4|ipv6> (--home-location <location> | --server <server>)",
 			Short:                 "Create a Floating IP",
 			Args:                  cobra.NoArgs,
 			TraverseChildren:      true,
diff --git a/internal/cmd/floatingip/disable_protection.go b/internal/cmd/floatingip/disable_protection.go
index 3c7cb60f..e1904cb6 100644
--- a/internal/cmd/floatingip/disable_protection.go
+++ b/internal/cmd/floatingip/disable_protection.go
@@ -14,7 +14,7 @@ import (
 var DisableProtectionCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:   "disable-protection [FLAGS] FLOATINGIP PROTECTIONLEVEL [PROTECTIONLEVEL...]",
+			Use:   "disable-protection <floating-ip> <protection-level>...",
 			Short: "Disable resource protection for a Floating IP",
 			Args:  cobra.MinimumNArgs(2),
 			ValidArgsFunction: cmpl.SuggestArgs(
diff --git a/internal/cmd/floatingip/enable_protection.go b/internal/cmd/floatingip/enable_protection.go
index e236c2ca..7dd12abc 100644
--- a/internal/cmd/floatingip/enable_protection.go
+++ b/internal/cmd/floatingip/enable_protection.go
@@ -60,7 +60,7 @@ func changeProtection(s state.State, cmd *cobra.Command,
 var EnableProtectionCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:   "enable-protection [FLAGS] FLOATINGIP PROTECTIONLEVEL [PROTECTIONLEVEL...]",
+			Use:   "enable-protection <floating-ip> <protection-level>...",
 			Short: "Enable resource protection for a Floating IP",
 			Args:  cobra.MinimumNArgs(2),
 			ValidArgsFunction: cmpl.SuggestArgs(
diff --git a/internal/cmd/floatingip/unassign.go b/internal/cmd/floatingip/unassign.go
index d59837f8..8746e5d7 100644
--- a/internal/cmd/floatingip/unassign.go
+++ b/internal/cmd/floatingip/unassign.go
@@ -14,7 +14,7 @@ import (
 var UnassignCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:                   "unassign [FLAGS] FLOATINGIP",
+			Use:                   "unassign <floating-ip>",
 			Short:                 "Unassign a Floating IP",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.FloatingIP().Names)),
diff --git a/internal/cmd/image/disable_protection.go b/internal/cmd/image/disable_protection.go
index 00073c0a..9ae5631b 100644
--- a/internal/cmd/image/disable_protection.go
+++ b/internal/cmd/image/disable_protection.go
@@ -16,7 +16,7 @@ import (
 var DisableProtectionCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:   "disable-protection [FLAGS] IMAGE PROTECTIONLEVEL [PROTECTIONLEVEL...]",
+			Use:   "disable-protection <image> <protection-level>...",
 			Short: "Disable resource protection for an image",
 			Args:  cobra.MinimumNArgs(2),
 			ValidArgsFunction: cmpl.SuggestArgs(
diff --git a/internal/cmd/image/enable_protection.go b/internal/cmd/image/enable_protection.go
index 3bac739e..064f8bb1 100644
--- a/internal/cmd/image/enable_protection.go
+++ b/internal/cmd/image/enable_protection.go
@@ -63,7 +63,7 @@ var EnableProtectionCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 
 		return &cobra.Command{
-			Use:   "enable-protection [FLAGS] IMAGE PROTECTIONLEVEL [PROTECTIONLEVEL...]",
+			Use:   "enable-protection <image> <protection-level>...",
 			Short: "Enable resource protection for an image",
 			Args:  cobra.MinimumNArgs(2),
 			ValidArgsFunction: cmpl.SuggestArgs(
diff --git a/internal/cmd/loadbalancer/add_service.go b/internal/cmd/loadbalancer/add_service.go
index 125e9904..bc0e0b8f 100644
--- a/internal/cmd/loadbalancer/add_service.go
+++ b/internal/cmd/loadbalancer/add_service.go
@@ -15,7 +15,7 @@ import (
 var AddServiceCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "add-service LOADBALANCER FLAGS",
+			Use:                   "add-service [options] (--protocol http | --protocol tcp --listen-port <1-65535> --destination-port <1-65535> | --protocol https --http-certificates <ids>) <load-balancer>",
 			Short:                 "Add a service to a Load Balancer",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
diff --git a/internal/cmd/loadbalancer/add_target.go b/internal/cmd/loadbalancer/add_target.go
index 781668c5..f7106274 100644
--- a/internal/cmd/loadbalancer/add_target.go
+++ b/internal/cmd/loadbalancer/add_target.go
@@ -17,7 +17,7 @@ import (
 var AddTargetCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "add-target LOADBALANCER FLAGS",
+			Use:                   "add-target [options] (--server <server> | --label-selector <label-selector> | --ip <ip>) <load-balancer>",
 			Short:                 "Add a target to a Load Balancer",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
diff --git a/internal/cmd/loadbalancer/attach_to_network.go b/internal/cmd/loadbalancer/attach_to_network.go
index 63432446..8027e407 100644
--- a/internal/cmd/loadbalancer/attach_to_network.go
+++ b/internal/cmd/loadbalancer/attach_to_network.go
@@ -15,7 +15,7 @@ import (
 var AttachToNetworkCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "attach-to-network [FLAGS] LOADBALANCER",
+			Use:                   "attach-to-network [--ip <ip>] --network <network> <load-balancer>",
 			Short:                 "Attach a Load Balancer to a Network",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
diff --git a/internal/cmd/loadbalancer/change_algorithm.go b/internal/cmd/loadbalancer/change_algorithm.go
index 75507729..d5b82041 100644
--- a/internal/cmd/loadbalancer/change_algorithm.go
+++ b/internal/cmd/loadbalancer/change_algorithm.go
@@ -15,7 +15,7 @@ import (
 var ChangeAlgorithmCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "change-algorithm LOADBALANCER FLAGS",
+			Use:                   "change-algorithm --algorithm-type <round_robin|least_connections> <load-balancer>",
 			Short:                 "Changes the algorithm of a Load Balancer",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
diff --git a/internal/cmd/loadbalancer/change_type.go b/internal/cmd/loadbalancer/change_type.go
index 0a589ce5..d402a028 100644
--- a/internal/cmd/loadbalancer/change_type.go
+++ b/internal/cmd/loadbalancer/change_type.go
@@ -15,7 +15,7 @@ import (
 var ChangeTypeCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:   "change-type [FLAGS] LOADBALANCER LOADBALANCERTYPE",
+			Use:   "change-type <load-balancer> <load-balancer-type>",
 			Short: "Change type of a Load Balancer",
 			Args:  cobra.ExactArgs(2),
 			ValidArgsFunction: cmpl.SuggestArgs(
diff --git a/internal/cmd/loadbalancer/create.go b/internal/cmd/loadbalancer/create.go
index 59d338b6..f688c8c2 100644
--- a/internal/cmd/loadbalancer/create.go
+++ b/internal/cmd/loadbalancer/create.go
@@ -14,7 +14,7 @@ import (
 var CreateCmd = base.CreateCmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "create [FLAGS]",
+			Use:                   "create [options] --name <name> --type <type>",
 			Short:                 "Create a Load Balancer",
 			Args:                  cobra.NoArgs,
 			TraverseChildren:      true,
diff --git a/internal/cmd/loadbalancer/delete_service.go b/internal/cmd/loadbalancer/delete_service.go
index 4300c33e..8aff8679 100644
--- a/internal/cmd/loadbalancer/delete_service.go
+++ b/internal/cmd/loadbalancer/delete_service.go
@@ -14,7 +14,7 @@ import (
 var DeleteServiceCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "delete-service [FLAGS] LOADBALANCER",
+			Use:                   "delete-service --listen-port <1-65535> <load-balancer>",
 			Short:                 "Deletes a service from a Load Balancer",
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
 			Args:                  cobra.RangeArgs(1, 2),
diff --git a/internal/cmd/loadbalancer/detach_from_network.go b/internal/cmd/loadbalancer/detach_from_network.go
index 18d405ab..0815e000 100644
--- a/internal/cmd/loadbalancer/detach_from_network.go
+++ b/internal/cmd/loadbalancer/detach_from_network.go
@@ -15,7 +15,7 @@ import (
 var DetachFromNetworkCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "detach-from-network [FLAGS] LOADBALANCER",
+			Use:                   "detach-from-network --network <network> <load-balancer>",
 			Short:                 "Detach a Load Balancer from a Network",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
diff --git a/internal/cmd/loadbalancer/disable_protection.go b/internal/cmd/loadbalancer/disable_protection.go
index c22c17d7..17607297 100644
--- a/internal/cmd/loadbalancer/disable_protection.go
+++ b/internal/cmd/loadbalancer/disable_protection.go
@@ -14,7 +14,7 @@ import (
 var DisableProtectionCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:   "disable-protection [FLAGS] LOADBALANCER PROTECTIONLEVEL [PROTECTIONLEVEL...]",
+			Use:   "disable-protection <load-balancer> <protection-level>...",
 			Short: "Disable resource protection for a Load Balancer",
 			Args:  cobra.MinimumNArgs(2),
 			ValidArgsFunction: cmpl.SuggestArgs(
diff --git a/internal/cmd/loadbalancer/disable_public_interface.go b/internal/cmd/loadbalancer/disable_public_interface.go
index ac69db54..c2098173 100644
--- a/internal/cmd/loadbalancer/disable_public_interface.go
+++ b/internal/cmd/loadbalancer/disable_public_interface.go
@@ -14,7 +14,7 @@ import (
 var DisablePublicInterfaceCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:                   "disable-public-interface [FLAGS] LOADBALANCER",
+			Use:                   "disable-public-interface <load-balancer>",
 			Short:                 "Disable the public interface of a Load Balancer",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
diff --git a/internal/cmd/loadbalancer/enable_protection.go b/internal/cmd/loadbalancer/enable_protection.go
index 470e504e..806334ff 100644
--- a/internal/cmd/loadbalancer/enable_protection.go
+++ b/internal/cmd/loadbalancer/enable_protection.go
@@ -60,7 +60,7 @@ func changeProtection(s state.State, cmd *cobra.Command,
 var EnableProtectionCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:   "enable-protection [FLAGS] LOADBALANCER PROTECTIONLEVEL [PROTECTIONLEVEL...]",
+			Use:   "enable-protection <load-balancer> <protection-level>...",
 			Short: "Enable resource protection for a Load Balancer",
 			Args:  cobra.MinimumNArgs(2),
 			ValidArgsFunction: cmpl.SuggestArgs(
diff --git a/internal/cmd/loadbalancer/enable_public_interface.go b/internal/cmd/loadbalancer/enable_public_interface.go
index dc09f6a8..7edb03a7 100644
--- a/internal/cmd/loadbalancer/enable_public_interface.go
+++ b/internal/cmd/loadbalancer/enable_public_interface.go
@@ -14,7 +14,7 @@ import (
 var EnablePublicInterfaceCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:                   "enable-public-interface [FLAGS] LOADBALANCER",
+			Use:                   "enable-public-interface <load-balancer>",
 			Short:                 "Enable the public interface of a Load Balancer",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
diff --git a/internal/cmd/loadbalancer/metrics.go b/internal/cmd/loadbalancer/metrics.go
index 4ca0c378..af071be3 100644
--- a/internal/cmd/loadbalancer/metrics.go
+++ b/internal/cmd/loadbalancer/metrics.go
@@ -6,6 +6,7 @@ import (
 	"slices"
 	"sort"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/guptarohit/asciigraph"
@@ -30,7 +31,7 @@ var metricTypeStrings = []string{
 var MetricsCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "metrics [FLAGS] LOADBALANCER",
+			Use:                   fmt.Sprintf("metrics [options] (--type <%s>)... <load-balancer>", strings.Join(metricTypeStrings, "|")),
 			Short:                 "[ALPHA] Metrics from a Load Balancer",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
diff --git a/internal/cmd/loadbalancer/remove_target.go b/internal/cmd/loadbalancer/remove_target.go
index 4c13d83f..db349b59 100644
--- a/internal/cmd/loadbalancer/remove_target.go
+++ b/internal/cmd/loadbalancer/remove_target.go
@@ -17,7 +17,7 @@ import (
 var RemoveTargetCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "remove-target LOADBALANCER FLAGS",
+			Use:                   "remove-target [options] <load-balancer>",
 			Short:                 "Remove a target from a Load Balancer",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
diff --git a/internal/cmd/loadbalancer/update_service.go b/internal/cmd/loadbalancer/update_service.go
index 6b3a57d6..f51c6000 100644
--- a/internal/cmd/loadbalancer/update_service.go
+++ b/internal/cmd/loadbalancer/update_service.go
@@ -16,7 +16,7 @@ import (
 var UpdateServiceCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "update-service LOADBALANCER FLAGS",
+			Use:                   "update-service [options] --listen-port <1-65535> <load-balancer>",
 			Short:                 "Updates a service from a Load Balancer",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.LoadBalancer().Names)),
diff --git a/internal/cmd/network/add_route.go b/internal/cmd/network/add_route.go
index 599a9f41..ef7cae14 100644
--- a/internal/cmd/network/add_route.go
+++ b/internal/cmd/network/add_route.go
@@ -16,7 +16,7 @@ import (
 var AddRouteCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "add-route NETWORK FLAGS",
+			Use:                   "add-route --destination <destination> --gateway <ip> <network>",
 			Short:                 "Add a route to a network",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
diff --git a/internal/cmd/network/add_subnet.go b/internal/cmd/network/add_subnet.go
index 0ebab456..307516c5 100644
--- a/internal/cmd/network/add_subnet.go
+++ b/internal/cmd/network/add_subnet.go
@@ -16,7 +16,7 @@ import (
 var AddSubnetCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "add-subnet NETWORK FLAGS",
+			Use:                   "add-subnet [options] --type <cloud|server|vswitch> --network-zone <zone> <network>",
 			Short:                 "Add a subnet to a network",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
diff --git a/internal/cmd/network/change_ip_range.go b/internal/cmd/network/change_ip_range.go
index 186cf2a1..0200729d 100644
--- a/internal/cmd/network/change_ip_range.go
+++ b/internal/cmd/network/change_ip_range.go
@@ -16,7 +16,7 @@ import (
 var ChangeIPRangeCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "change-ip-range [FLAGS] NETWORK",
+			Use:                   "change-ip-range --ip-range <ip-range> <network>",
 			Short:                 "Change the IP range of a network",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
diff --git a/internal/cmd/network/create.go b/internal/cmd/network/create.go
index b99ae525..8b9d097a 100644
--- a/internal/cmd/network/create.go
+++ b/internal/cmd/network/create.go
@@ -16,7 +16,7 @@ import (
 var CreateCmd = base.CreateCmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:   "create [FLAGS]",
+			Use:   "create [options] --name <name> --ip-range <ip-range>",
 			Short: "Create a network",
 			Args:  cobra.NoArgs,
 		}
diff --git a/internal/cmd/network/disable_protection.go b/internal/cmd/network/disable_protection.go
index 7ad0ef26..17cecc20 100644
--- a/internal/cmd/network/disable_protection.go
+++ b/internal/cmd/network/disable_protection.go
@@ -14,7 +14,7 @@ import (
 var DisableProtectionCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:   "disable-protection [FLAGS] NETWORK PROTECTIONLEVEL [PROTECTIONLEVEL...]",
+			Use:   "disable-protection <network> <protection-level>...",
 			Short: "Disable resource protection for a network",
 			Args:  cobra.MinimumNArgs(2),
 			ValidArgsFunction: cmpl.SuggestArgs(
diff --git a/internal/cmd/network/enable_protection.go b/internal/cmd/network/enable_protection.go
index ec5d3640..0e1de52e 100644
--- a/internal/cmd/network/enable_protection.go
+++ b/internal/cmd/network/enable_protection.go
@@ -60,7 +60,7 @@ func changeProtection(s state.State, cmd *cobra.Command,
 var EnableProtectionCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:   "enable-protection [FLAGS] NETWORK PROTECTIONLEVEL [PROTECTIONLEVEL...]",
+			Use:   "enable-protection <network> <protection-level>...",
 			Short: "Enable resource protection for a network",
 			Args:  cobra.MinimumNArgs(2),
 			ValidArgsFunction: cmpl.SuggestArgs(
diff --git a/internal/cmd/network/expose_routes_to_vswitch.go b/internal/cmd/network/expose_routes_to_vswitch.go
index 413ec357..98ceccaf 100644
--- a/internal/cmd/network/expose_routes_to_vswitch.go
+++ b/internal/cmd/network/expose_routes_to_vswitch.go
@@ -15,7 +15,7 @@ import (
 var ExposeRoutesToVSwitchCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "expose-routes-to-vswitch [flags] network",
+			Use:                   "expose-routes-to-vswitch [--disable] <network>",
 			Short:                 "Expose routes to connected vSwitch",
 			Long:                  "Enabling this will expose routes to the connected vSwitch. Set the --disable flag to remove the exposed routes.",
 			Args:                  cobra.ExactArgs(1),
diff --git a/internal/cmd/network/remove_route.go b/internal/cmd/network/remove_route.go
index 7c17d2e5..3fcde1b2 100644
--- a/internal/cmd/network/remove_route.go
+++ b/internal/cmd/network/remove_route.go
@@ -16,7 +16,7 @@ import (
 var RemoveRouteCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "remove-route NETWORK FLAGS",
+			Use:                   "remove-route --destination <destination> --gateway <ip> <network>",
 			Short:                 "Remove a route from a network",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
diff --git a/internal/cmd/network/remove_subnet.go b/internal/cmd/network/remove_subnet.go
index b081e89a..411d5bff 100644
--- a/internal/cmd/network/remove_subnet.go
+++ b/internal/cmd/network/remove_subnet.go
@@ -16,7 +16,7 @@ import (
 var RemoveSubnetCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "remove-subnet NETWORK FLAGS",
+			Use:                   "remove-subnet --ip-range <ip-range> <network>",
 			Short:                 "Remove a subnet from a network",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
diff --git a/internal/cmd/placementgroup/create.go b/internal/cmd/placementgroup/create.go
index dea1e2f2..d6622365 100644
--- a/internal/cmd/placementgroup/create.go
+++ b/internal/cmd/placementgroup/create.go
@@ -13,7 +13,7 @@ import (
 var CreateCmd = base.CreateCmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:   "create FLAGS",
+			Use:   "create [options] --name <name> --type <type>",
 			Short: "Create a placement group",
 		}
 		cmd.Flags().String("name", "", "Name")
diff --git a/internal/cmd/primaryip/assign.go b/internal/cmd/primaryip/assign.go
index 35e674f8..0b46c431 100644
--- a/internal/cmd/primaryip/assign.go
+++ b/internal/cmd/primaryip/assign.go
@@ -15,7 +15,7 @@ import (
 var AssignCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:   "assign [FLAGS] PRIMARYIP",
+			Use:   "assign --server <server> <primary-ip>",
 			Short: "Assign a Primary IP to an assignee (usually a server)",
 			Args:  cobra.ExactArgs(1),
 			ValidArgsFunction: cmpl.SuggestArgs(
diff --git a/internal/cmd/primaryip/create.go b/internal/cmd/primaryip/create.go
index 4813173b..b0ba6418 100644
--- a/internal/cmd/primaryip/create.go
+++ b/internal/cmd/primaryip/create.go
@@ -14,7 +14,7 @@ import (
 var CreateCmd = base.CreateCmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "create FLAGS",
+			Use:                   "create [options] --type <ipv4|ipv6> --name <name>",
 			Short:                 "Create a Primary IP",
 			Args:                  cobra.NoArgs,
 			TraverseChildren:      true,
diff --git a/internal/cmd/primaryip/disable_protection.go b/internal/cmd/primaryip/disable_protection.go
index 272ae885..bcd14c05 100644
--- a/internal/cmd/primaryip/disable_protection.go
+++ b/internal/cmd/primaryip/disable_protection.go
@@ -14,7 +14,7 @@ import (
 var DisableProtectionCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:   "disable-protection PRIMARYIP [PROTECTIONLEVEL...]",
+			Use:   "disable-protection <primary-ip> [<protection-level>...]", // optional because of backwards compatibility
 			Short: "Disable Protection for a Primary IP",
 			Args:  cobra.MinimumNArgs(1),
 			ValidArgsFunction: cmpl.SuggestArgs(
diff --git a/internal/cmd/primaryip/enable_protection.go b/internal/cmd/primaryip/enable_protection.go
index 4e146feb..21e10b63 100644
--- a/internal/cmd/primaryip/enable_protection.go
+++ b/internal/cmd/primaryip/enable_protection.go
@@ -58,7 +58,7 @@ func changeProtection(s state.State, cmd *cobra.Command,
 var EnableProtectionCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:   "enable-protection PRIMARYIP [PROTECTIONLEVEL...]",
+			Use:   "enable-protection <primary-ip> [<protection-level>...]", // optional because of backwards compatibility
 			Short: "Enable Protection for a Primary IP",
 			Args:  cobra.MinimumNArgs(1),
 			ValidArgsFunction: cmpl.SuggestArgs(
diff --git a/internal/cmd/primaryip/unassign.go b/internal/cmd/primaryip/unassign.go
index 95d3a0ff..c3ededdd 100644
--- a/internal/cmd/primaryip/unassign.go
+++ b/internal/cmd/primaryip/unassign.go
@@ -14,7 +14,7 @@ import (
 var UnAssignCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:   "unassign [FLAGS] PRIMARYIP",
+			Use:   "unassign <primary-ip>",
 			Short: "Unassign a Primary IP from an assignee (usually a server)",
 			Args:  cobra.ExactArgs(1),
 			ValidArgsFunction: cmpl.SuggestArgs(
diff --git a/internal/cmd/server/add_to_placement_group.go b/internal/cmd/server/add_to_placement_group.go
index fbd54303..44ec1809 100644
--- a/internal/cmd/server/add_to_placement_group.go
+++ b/internal/cmd/server/add_to_placement_group.go
@@ -14,7 +14,7 @@ import (
 var AddToPlacementGroupCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:               "add-to-placement-group [FLAGS] SERVER",
+			Use:               "add-to-placement-group --placement-group <placement-group> <server>",
 			Short:             "Add a server to a placement group",
 			Args:              cobra.ExactArgs(1),
 			ValidArgsFunction: cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
diff --git a/internal/cmd/server/attach_iso.go b/internal/cmd/server/attach_iso.go
index 624cac5c..239e1331 100644
--- a/internal/cmd/server/attach_iso.go
+++ b/internal/cmd/server/attach_iso.go
@@ -15,7 +15,7 @@ import (
 var AttachISOCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:              "attach-iso [FLAGS] SERVER ISO",
+			Use:              "attach-iso <server> <iso>",
 			Short:            "Attach an ISO to a server",
 			Args:             cobra.ExactArgs(2),
 			TraverseChildren: true,
diff --git a/internal/cmd/server/attach_to_network.go b/internal/cmd/server/attach_to_network.go
index 15ec347d..09d6a03a 100644
--- a/internal/cmd/server/attach_to_network.go
+++ b/internal/cmd/server/attach_to_network.go
@@ -16,7 +16,7 @@ import (
 var AttachToNetworkCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "attach-to-network [FLAGS] SERVER",
+			Use:                   "attach-to-network [options] --network <network> <server>",
 			Short:                 "Attach a server to a network",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
diff --git a/internal/cmd/server/change_alias_ips.go b/internal/cmd/server/change_alias_ips.go
index 75565e0a..a8e81e08 100644
--- a/internal/cmd/server/change_alias_ips.go
+++ b/internal/cmd/server/change_alias_ips.go
@@ -16,7 +16,7 @@ import (
 var ChangeAliasIPsCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "change-alias-ips [FLAGS] SERVER",
+			Use:                   "change-alias-ips [options] --network <network> <server>",
 			Short:                 "Change a server's alias IPs in a network",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
diff --git a/internal/cmd/server/change_type.go b/internal/cmd/server/change_type.go
index ebe6c52d..145503df 100644
--- a/internal/cmd/server/change_type.go
+++ b/internal/cmd/server/change_type.go
@@ -15,7 +15,7 @@ import (
 var ChangeTypeCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:   "change-type [FLAGS] SERVER SERVERTYPE",
+			Use:   "change-type [--keep-disk] <server> <server-type>",
 			Short: "Change type of a server",
 			Args:  cobra.ExactArgs(2),
 			ValidArgsFunction: cmpl.SuggestArgs(
diff --git a/internal/cmd/server/create.go b/internal/cmd/server/create.go
index 3573314d..b61a18c6 100644
--- a/internal/cmd/server/create.go
+++ b/internal/cmd/server/create.go
@@ -36,7 +36,7 @@ type createResultSchema struct {
 var CreateCmd = base.CreateCmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:   "create FLAGS",
+			Use:   "create [options] --name <name> --type <server-type> --image <image>",
 			Short: "Create a server",
 		}
 
diff --git a/internal/cmd/server/create_image.go b/internal/cmd/server/create_image.go
index cf4f8402..ed54877c 100644
--- a/internal/cmd/server/create_image.go
+++ b/internal/cmd/server/create_image.go
@@ -15,7 +15,7 @@ import (
 var CreateImageCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:   "create-image [FLAGS] SERVER",
+			Use:   "create-image [options] --type <snapshot|backup> <server>",
 			Short: "Create an image from a server",
 			Args:  cobra.ExactArgs(1),
 		}
diff --git a/internal/cmd/server/detach_from_network.go b/internal/cmd/server/detach_from_network.go
index 8d24e570..6e69b02d 100644
--- a/internal/cmd/server/detach_from_network.go
+++ b/internal/cmd/server/detach_from_network.go
@@ -15,7 +15,7 @@ import (
 var DetachFromNetworkCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "detach-from-network [FLAGS] SERVER",
+			Use:                   "detach-from-network --network <network> <server>",
 			Short:                 "Detach a server from a network",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
diff --git a/internal/cmd/server/detach_iso.go b/internal/cmd/server/detach_iso.go
index ae780cb7..0c2ca945 100644
--- a/internal/cmd/server/detach_iso.go
+++ b/internal/cmd/server/detach_iso.go
@@ -14,7 +14,7 @@ import (
 var DetachISOCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:                   "detach-iso [FLAGS] SERVER",
+			Use:                   "detach-iso <server>",
 			Short:                 "Detach an ISO from a server",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
diff --git a/internal/cmd/server/disable_backup.go b/internal/cmd/server/disable_backup.go
index 416436c4..c4aaf5f0 100644
--- a/internal/cmd/server/disable_backup.go
+++ b/internal/cmd/server/disable_backup.go
@@ -14,7 +14,7 @@ import (
 var DisableBackupCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:                   "disable-backup [FLAGS] SERVER",
+			Use:                   "disable-backup <server>",
 			Short:                 "Disable backup for a server",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
diff --git a/internal/cmd/server/disable_protection.go b/internal/cmd/server/disable_protection.go
index bbf8d633..72221b49 100644
--- a/internal/cmd/server/disable_protection.go
+++ b/internal/cmd/server/disable_protection.go
@@ -14,7 +14,7 @@ import (
 var DisableProtectionCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:   "disable-protection [FLAGS] SERVER PROTECTIONLEVEL [PROTECTIONLEVEL...]",
+			Use:   "disable-protection <server> <protection-level>...",
 			Short: "Disable resource protection for a server",
 			Args:  cobra.MinimumNArgs(2),
 			ValidArgsFunction: cmpl.SuggestArgs(
diff --git a/internal/cmd/server/disable_rescue.go b/internal/cmd/server/disable_rescue.go
index 826a9d73..a2861593 100644
--- a/internal/cmd/server/disable_rescue.go
+++ b/internal/cmd/server/disable_rescue.go
@@ -14,7 +14,7 @@ import (
 var DisableRescueCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:                   "disable-rescue [FLAGS] SERVER",
+			Use:                   "disable-rescue <server>",
 			Short:                 "Disable rescue for a server",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
diff --git a/internal/cmd/server/enable_backup.go b/internal/cmd/server/enable_backup.go
index 9dd96720..97eba93f 100644
--- a/internal/cmd/server/enable_backup.go
+++ b/internal/cmd/server/enable_backup.go
@@ -14,7 +14,7 @@ import (
 var EnableBackupCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "enable-backup [FLAGS] SERVER",
+			Use:                   "enable-backup <server>",
 			Short:                 "Enable backup for a server",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
diff --git a/internal/cmd/server/enable_protection.go b/internal/cmd/server/enable_protection.go
index fbd4474a..464420c7 100644
--- a/internal/cmd/server/enable_protection.go
+++ b/internal/cmd/server/enable_protection.go
@@ -62,7 +62,7 @@ func changeProtection(s state.State, cmd *cobra.Command,
 var EnableProtectionCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:   "enable-protection [FLAGS] SERVER PROTECTIONLEVEL [PROTECTIONLEVEL...]",
+			Use:   "enable-protection <server> <protection-level>...",
 			Short: "Enable resource protection for a server",
 			Args:  cobra.MinimumNArgs(2),
 			ValidArgsFunction: cmpl.SuggestArgs(
diff --git a/internal/cmd/server/enable_rescue.go b/internal/cmd/server/enable_rescue.go
index 3ae72c69..e2124755 100644
--- a/internal/cmd/server/enable_rescue.go
+++ b/internal/cmd/server/enable_rescue.go
@@ -15,7 +15,7 @@ import (
 var EnableRescueCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "enable-rescue [FLAGS] SERVER",
+			Use:                   "enable-rescue [options] <server>",
 			Short:                 "Enable rescue for a server",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
diff --git a/internal/cmd/server/ip.go b/internal/cmd/server/ip.go
index 824a6929..3f08c13f 100644
--- a/internal/cmd/server/ip.go
+++ b/internal/cmd/server/ip.go
@@ -14,7 +14,7 @@ import (
 var IPCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "ip SERVER FLAGS",
+			Use:                   "ip [--ipv6] <server>",
 			Short:                 "Print a server's IP address",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
diff --git a/internal/cmd/server/metrics.go b/internal/cmd/server/metrics.go
index 240f647b..0a390c76 100644
--- a/internal/cmd/server/metrics.go
+++ b/internal/cmd/server/metrics.go
@@ -6,6 +6,7 @@ import (
 	"slices"
 	"sort"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/guptarohit/asciigraph"
@@ -29,7 +30,7 @@ var metricTypeStrings = []string{
 var MetricsCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "metrics [FLAGS] SERVER",
+			Use:                   fmt.Sprintf("metrics [options] (--type <%s>)... <server>", strings.Join(metricTypeStrings, "|")),
 			Short:                 "[ALPHA] Metrics from a Server",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
diff --git a/internal/cmd/server/poweroff.go b/internal/cmd/server/poweroff.go
index 706889c1..fd100934 100644
--- a/internal/cmd/server/poweroff.go
+++ b/internal/cmd/server/poweroff.go
@@ -14,7 +14,7 @@ import (
 var PoweroffCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:                   "poweroff [FLAGS] SERVER",
+			Use:                   "poweroff <server>",
 			Short:                 "Poweroff a server",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
diff --git a/internal/cmd/server/poweron.go b/internal/cmd/server/poweron.go
index f3626893..17720867 100644
--- a/internal/cmd/server/poweron.go
+++ b/internal/cmd/server/poweron.go
@@ -14,7 +14,7 @@ import (
 var PoweronCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:                   "poweron [FLAGS] SERVER",
+			Use:                   "poweron <server>",
 			Short:                 "Poweron a server",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
diff --git a/internal/cmd/server/reboot.go b/internal/cmd/server/reboot.go
index 864fc843..37eb1918 100644
--- a/internal/cmd/server/reboot.go
+++ b/internal/cmd/server/reboot.go
@@ -14,7 +14,7 @@ import (
 var RebootCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:                   "reboot [FLAGS] SERVER",
+			Use:                   "reboot <server>",
 			Short:                 "Reboot a server",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
diff --git a/internal/cmd/server/rebuild.go b/internal/cmd/server/rebuild.go
index d0da69b1..d74fc71d 100644
--- a/internal/cmd/server/rebuild.go
+++ b/internal/cmd/server/rebuild.go
@@ -16,7 +16,7 @@ import (
 var RebuildCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "rebuild [FLAGS] SERVER",
+			Use:                   "rebuild [--allow-deprecated-image] --image <image> <server>",
 			Short:                 "Rebuild a server",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
diff --git a/internal/cmd/server/remove_from_placement_group.go b/internal/cmd/server/remove_from_placement_group.go
index 38f175c1..49c63a09 100644
--- a/internal/cmd/server/remove_from_placement_group.go
+++ b/internal/cmd/server/remove_from_placement_group.go
@@ -14,7 +14,7 @@ import (
 var RemoveFromPlacementGroupCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:               "remove-from-placement-group SERVER",
+			Use:               "remove-from-placement-group <server>",
 			Short:             "Removes a server from a placement group",
 			Args:              cobra.ExactArgs(1),
 			ValidArgsFunction: cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
diff --git a/internal/cmd/server/request_console.go b/internal/cmd/server/request_console.go
index 26fdb41f..44db5869 100644
--- a/internal/cmd/server/request_console.go
+++ b/internal/cmd/server/request_console.go
@@ -16,7 +16,7 @@ import (
 var RequestConsoleCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "request-console [FLAGS] SERVER",
+			Use:                   "request-console [options] <server>",
 			Short:                 "Request a WebSocket VNC console for a server",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
diff --git a/internal/cmd/server/reset.go b/internal/cmd/server/reset.go
index f8760fec..34c7dc78 100644
--- a/internal/cmd/server/reset.go
+++ b/internal/cmd/server/reset.go
@@ -14,7 +14,7 @@ import (
 var ResetCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:                   "reset [FLAGS] SERVER",
+			Use:                   "reset [options] <server>",
 			Short:                 "Reset a server",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
diff --git a/internal/cmd/server/reset_password.go b/internal/cmd/server/reset_password.go
index ec45e337..f216fb5f 100644
--- a/internal/cmd/server/reset_password.go
+++ b/internal/cmd/server/reset_password.go
@@ -14,7 +14,7 @@ import (
 var ResetPasswordCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:                   "reset-password [FLAGS] SERVER",
+			Use:                   "reset-password <server>",
 			Short:                 "Reset the root password of a server",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
diff --git a/internal/cmd/server/shutdown.go b/internal/cmd/server/shutdown.go
index 67a81c5a..8d696885 100644
--- a/internal/cmd/server/shutdown.go
+++ b/internal/cmd/server/shutdown.go
@@ -23,7 +23,7 @@ var ShutdownCmd = base.Cmd{
 			"server to shut down before returning."
 
 		cmd := &cobra.Command{
-			Use:                   "shutdown [FLAGS] SERVER",
+			Use:                   "shutdown [options] <server>",
 			Short:                 "Shutdown a server",
 			Long:                  description,
 			Args:                  cobra.ExactArgs(1),
diff --git a/internal/cmd/server/ssh.go b/internal/cmd/server/ssh.go
index ee3ce6da..8cc046c1 100644
--- a/internal/cmd/server/ssh.go
+++ b/internal/cmd/server/ssh.go
@@ -18,7 +18,7 @@ import (
 var SSHCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "ssh [FLAGS] SERVER [COMMAND...]",
+			Use:                   "ssh [options] <server> [command]",
 			Short:                 "Spawn an SSH connection for the server",
 			Args:                  cobra.MinimumNArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Server().Names)),
diff --git a/internal/cmd/sshkey/create.go b/internal/cmd/sshkey/create.go
index ad85d310..154e97b7 100644
--- a/internal/cmd/sshkey/create.go
+++ b/internal/cmd/sshkey/create.go
@@ -16,7 +16,7 @@ import (
 var CreateCmd = base.CreateCmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:   "create FLAGS",
+			Use:   "create [options] --name <name> (--public-key <key> | --public-key-from-file <file>)",
 			Short: "Create a SSH key",
 			Args:  cobra.NoArgs,
 		}
diff --git a/internal/cmd/volume/attach.go b/internal/cmd/volume/attach.go
index b3d589c0..cd101e94 100644
--- a/internal/cmd/volume/attach.go
+++ b/internal/cmd/volume/attach.go
@@ -15,7 +15,7 @@ import (
 var AttachCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "attach [FLAGS] VOLUME",
+			Use:                   "attach [--automount] --server <server> <volume>",
 			Short:                 "Attach a volume to a server",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Volume().Names)),
diff --git a/internal/cmd/volume/create.go b/internal/cmd/volume/create.go
index 5d72be6b..1128c72e 100644
--- a/internal/cmd/volume/create.go
+++ b/internal/cmd/volume/create.go
@@ -17,7 +17,7 @@ import (
 var CreateCmd = base.CreateCmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "create FLAGS",
+			Use:                   "create [options] --name <name> --size <size>",
 			Short:                 "Create a volume",
 			Args:                  cobra.NoArgs,
 			TraverseChildren:      true,
diff --git a/internal/cmd/volume/detach.go b/internal/cmd/volume/detach.go
index dff81363..3e7eedcc 100644
--- a/internal/cmd/volume/detach.go
+++ b/internal/cmd/volume/detach.go
@@ -14,7 +14,7 @@ import (
 var DetachCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:                   "detach [FLAGS] VOLUME",
+			Use:                   "detach <volume>",
 			Short:                 "Detach a volume",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Volume().Names)),
diff --git a/internal/cmd/volume/disable_protection.go b/internal/cmd/volume/disable_protection.go
index 28ce5e68..cd160b04 100644
--- a/internal/cmd/volume/disable_protection.go
+++ b/internal/cmd/volume/disable_protection.go
@@ -14,7 +14,7 @@ import (
 var DisableProtectionCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:   "disable-protection [FLAGS] VOLUME PROTECTIONLEVEL [PROTECTIONLEVEL...]",
+			Use:   "disable-protection <volume> <protection-level>...",
 			Short: "Disable resource protection for a volume",
 			Args:  cobra.MinimumNArgs(2),
 			ValidArgsFunction: cmpl.SuggestArgs(
diff --git a/internal/cmd/volume/enable_protection.go b/internal/cmd/volume/enable_protection.go
index f0803114..70ecfd68 100644
--- a/internal/cmd/volume/enable_protection.go
+++ b/internal/cmd/volume/enable_protection.go
@@ -60,7 +60,7 @@ func changeProtection(s state.State, cmd *cobra.Command,
 var EnableProtectionCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		return &cobra.Command{
-			Use:   "enable-protection [FLAGS] VOLUME PROTECTIONLEVEL [PROTECTIONLEVEL...]",
+			Use:   "enable-protection <volume> <protection-level>...",
 			Short: "Enable resource protection for a volume",
 			Args:  cobra.MinimumNArgs(2),
 			ValidArgsFunction: cmpl.SuggestArgs(
diff --git a/internal/cmd/volume/resize.go b/internal/cmd/volume/resize.go
index 869d3fc1..709eb4ed 100644
--- a/internal/cmd/volume/resize.go
+++ b/internal/cmd/volume/resize.go
@@ -14,7 +14,7 @@ import (
 var ResizeCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 		cmd := &cobra.Command{
-			Use:                   "resize [FLAGS] VOLUME",
+			Use:                   "resize --size <size> <volume>",
 			Short:                 "Resize a volume",
 			Args:                  cobra.ExactArgs(1),
 			ValidArgsFunction:     cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Volume().Names)),