Clarify CLI options (#4698)

Author: mattp-fly

internal/flag/flag.go

@@ -351,7 +351,7 @@ func Yes() Bool {
 	return Bool{
 		Name:        flagnames.Yes,
 		Shorthand:   "y",
-		Description: "Accept all confirmations",
+		Description: "Accept all confirmations (also --auto-confirm)",
 		Aliases:     []string{"auto-confirm"},
 	}
 }
@@ -444,7 +444,7 @@ const httpsFailover = "https-failover"
 func HttpsFailover() Bool {
 	return Bool{
 		Name:        httpsFailover,
-		Description: "Determines whether to failover to plain internet(https) communication with remote builders if wireguard fails",
+		Description: "Determines whether to failover to plain internet(https) communication with remote builders if wireguard fails (also --http-failover)",
 		Aliases:     []string{"http-failover"},
 		Default:     true,
 	}
@@ -644,7 +644,7 @@ func JSONOutput() Bool {
 
 func ProcessGroup(desc string) String {
 	if desc == "" {
-		desc = "The target process group"
+		desc = "The target process group (also --group)"
 	}
 
 	return String{

internal/flag/machines.go

@@ -121,17 +121,17 @@ var VMSizeFlags = Set{
 	},
 	Int{
 		Name:        "vm-cpus",
-		Description: "Number of CPUs",
+		Description: "Number of CPUs (also --cpus)",
 		Aliases:     []string{"cpus"},
 	},
 	String{
 		Name:        "vm-cpu-kind",
-		Description: "The kind of CPU to use ('shared' or 'performance')",
+		Description: "The kind of CPU to use ('shared' or 'performance') (also --vm-cpukind)",
 		Aliases:     []string{"vm-cpukind"},
 	},
 	String{
 		Name:        "vm-memory",
-		Description: "Memory (in megabytes) to attribute to the VM",
+		Description: "Memory (in megabytes) to attribute to the VM (also --memory)",
 		Aliases:     []string{"memory"},
 	},
 	String{
@@ -145,7 +145,7 @@ var VMSizeFlags = Set{
 	},
 	String{
 		Name:        "vm-gpu-kind",
-		Description: fmt.Sprintf("If set, the GPU model to attach (%v)", strings.Join(validGPUKinds, ", ")),
+		Description: fmt.Sprintf("If set, the GPU model to attach (%v) (also --vm-gpukind)", strings.Join(validGPUKinds, ", ")),
 		Aliases:     []string{"vm-gpukind"},
 	},
 	String{