command: remove -namespace from help options when not applicable

command/acl_bootstrap.go

@@ -20,7 +20,7 @@ Usage: nomad acl bootstrap [options]
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 `
 	return strings.TrimSpace(helpText)

command/acl_policy_apply.go

@@ -23,7 +23,7 @@ Usage: nomad acl policy apply [options] <name> <path>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 Apply Options:
 

command/acl_policy_delete.go

@@ -19,7 +19,7 @@ Usage: nomad acl policy delete <name>
 
 General Options:
 
-  ` + generalOptionsUsage()
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace)
 
 	return strings.TrimSpace(helpText)
 }

command/acl_policy_info.go

@@ -19,7 +19,7 @@ Usage: nomad acl policy info <name>
 
 General Options:
 
-  ` + generalOptionsUsage()
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace)
 
 	return strings.TrimSpace(helpText)
 }

command/acl_policy_list.go

@@ -20,7 +20,7 @@ Usage: nomad acl policy list
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 List Options:
 

command/acl_token_create.go

@@ -20,7 +20,7 @@ Usage: nomad acl token create [options]
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 Create Options:
 

command/acl_token_delete.go

@@ -19,7 +19,7 @@ Usage: nomad acl token delete <token_accessor_id>
 
 General Options:
 
-  ` + generalOptionsUsage()
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace)
 
 	return strings.TrimSpace(helpText)
 }

command/acl_token_info.go

@@ -19,7 +19,7 @@ Usage: nomad acl token info <token_accessor_id>
 
 General Options:
 
-  ` + generalOptionsUsage()
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace)
 
 	return strings.TrimSpace(helpText)
 }

command/acl_token_list.go

@@ -20,7 +20,7 @@ Usage: nomad acl token list
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 List Options:
 

command/acl_token_self.go

@@ -19,7 +19,7 @@ Usage: nomad acl token self
 
 General Options:
 
-  ` + generalOptionsUsage()
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace)
 
 	return strings.TrimSpace(helpText)
 }

command/acl_token_update.go

@@ -19,7 +19,7 @@ Usage: nomad acl token update <token_accessor_id>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 Update Options:
 

command/agent_info.go

@@ -20,7 +20,7 @@ Usage: nomad agent-info [options]
 
 General Options:
 
-  ` + generalOptionsUsage()
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace)
 	return strings.TrimSpace(helpText)
 }
 

command/agent_monitor.go

@@ -29,7 +29,7 @@ Usage: nomad monitor [options]
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 Monitor Specific Options:
 

command/alloc_exec.go

@@ -34,7 +34,7 @@ Usage: nomad alloc exec [options] <allocation> <command>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Exec Specific Options:
 

command/alloc_fs.go

@@ -42,7 +42,7 @@ Alias: nomad fs
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 FS Specific Options:
 

command/alloc_logs.go

@@ -28,7 +28,7 @@ Alias: nomad logs
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Logs Specific Options:
 

command/alloc_restart.go

@@ -23,7 +23,7 @@ Usage: nomad alloc restart [options] <allocation> <task>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Restart Specific Options:
 

command/alloc_signal.go

@@ -23,7 +23,7 @@ Usage: nomad alloc signal [options] <signal> <allocation> <task>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Signal Specific Options:
 

command/alloc_status.go

@@ -31,7 +31,7 @@ Usage: nomad alloc status [options] <allocation>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Alloc Status Options:
 

command/alloc_stop.go

@@ -24,7 +24,7 @@ Alias: nomad stop
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Stop Specific Options:
 

command/check.go

@@ -29,7 +29,7 @@ Usage: nomad check [options]
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 Agent Check Options:
 

command/deployment_fail.go

@@ -23,7 +23,7 @@ Usage: nomad deployment fail [options] <deployment id>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Fail Options:
 

command/deployment_list.go

@@ -20,7 +20,7 @@ Usage: nomad deployment list [options]
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 List Options:
 

command/deployment_pause.go

@@ -21,7 +21,7 @@ Usage: nomad deployment pause [options] <deployment id>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Pause Options:
 

command/deployment_promote.go

@@ -28,7 +28,7 @@ Usage: nomad deployment promote [options] <deployment id>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Promote Options:
 

command/deployment_resume.go

@@ -21,7 +21,7 @@ Usage: nomad deployment resume [options] <deployment id>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Resume Options:
 

command/deployment_status.go

@@ -24,7 +24,7 @@ Usage: nomad deployment status [options] <deployment id>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Status Options:
 

command/deployment_unblock.go

@@ -21,7 +21,7 @@ Usage: nomad deployment unblock [options] <deployment id>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Unblock Options:
 

command/eval_status.go

@@ -25,7 +25,7 @@ Usage: nomad eval status [options] <evaluation>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Eval Status Options:
 

command/event_sink_deregister.go

@@ -16,7 +16,7 @@ Usage: nomad event sink deregister <event sink id>
 
 General Options:
 
-  ` + generalOptionsUsage()
+  ` + generalOptionsUsage(usageOptsDefault)
 
 	return helpText
 }

command/event_sink_list.go

@@ -20,7 +20,7 @@ Usage: nomad event sink list
 
 General Options:
 
-  ` + generalOptionsUsage()
+  ` + generalOptionsUsage(usageOptsDefault)
 
 	return helpText
 }

command/event_sink_register.go

@@ -25,7 +25,7 @@ Usage: nomad event sink register <path>
 
 General Options:
 
-  ` + generalOptionsUsage()
+  ` + generalOptionsUsage(usageOptsDefault)
 
 	return helpText
 }

command/job_deployments.go

@@ -21,7 +21,7 @@ Usage: nomad job deployments [options] <job>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Deployments Options:
 
@@ -38,7 +38,7 @@ Deployments Options:
     Display full information.
 
   -all
-    Display all deployments matching the job ID, including those 
+    Display all deployments matching the job ID, including those
     from an older instance of the job.
 `
 	return strings.TrimSpace(helpText)

command/job_dispatch.go

@@ -30,7 +30,7 @@ Usage: nomad job dispatch [options] <parameterized job> [input source]
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Dispatch Options:
 

command/job_eval.go

@@ -24,7 +24,7 @@ Usage: nomad job eval [options] <job_id>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Eval Options:
 

command/job_history.go

@@ -28,7 +28,7 @@ Usage: nomad job history [options] <job>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 History Options:
 

command/job_inspect.go

@@ -22,7 +22,7 @@ Alias: nomad inspect
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Inspect Options:
 

command/job_periodic_force.go

@@ -22,7 +22,7 @@ Usage: nomad job periodic force <job id>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Periodic Force Options:
 

command/job_plan.go

@@ -65,7 +65,7 @@ Alias: nomad plan
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Plan Options:
 

command/job_promote.go

@@ -29,7 +29,7 @@ Usage: nomad job promote [options] <job id>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Promote Options:
 

command/job_revert.go

@@ -23,7 +23,7 @@ Usage: nomad job revert [options] <job> <version>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Revert Options:
 
@@ -36,8 +36,8 @@ Revert Options:
    The Consul token used to verify that the caller has access to the Service
    Identity policies associated in the targeted version of the job.
 
-  -vault-token 
-   The Vault token used to verify that the caller has access to the Vault 
+  -vault-token
+   The Vault token used to verify that the caller has access to the Vault
    policies in the targeted version of the job.
 
   -verbose

command/job_run.go

@@ -63,7 +63,7 @@ Alias: nomad run
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Run Options:
 

command/job_scale.go

@@ -34,7 +34,7 @@ Usage: nomad job scale [options] <job> [<group>] <count>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Scale Options:
 

command/job_scaling_events.go

@@ -29,7 +29,7 @@ Usage: nomad job scaling-events [options] <args>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Scaling-Events Options:
 

command/job_status.go

@@ -35,7 +35,7 @@ Usage: nomad status [options] <job>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Status Options:
 

command/job_stop.go

@@ -26,7 +26,7 @@ Alias: nomad stop
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Stop Options:
 

command/license_get.go

@@ -15,7 +15,7 @@ Usage: nomad license get [options]
 Gets a new license in Servers and Clients
 General Options:
 
-  ` + generalOptionsUsage()
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace)
 
 	return helpText
 }

command/license_put.go

@@ -25,7 +25,7 @@ Puts a new license in Servers and Clients
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 Install a new license from a file:
 

command/meta.go

@@ -161,8 +161,16 @@ func (m *Meta) Colorize() *colorstring.Colorize {
 	}
 }
 
+type usageOptsFlags uint8
+
+const (
+	usageOptsDefault     usageOptsFlags = 0
+	usageOptsNoNamespace                = 1 << iota
+)
+
 // generalOptionsUsage returns the help string for the global options.
-func generalOptionsUsage() string {
+func generalOptionsUsage(usageOpts usageOptsFlags) string {
+
 	helpText := `
   -address=<addr>
     The address of the Nomad server.
@@ -173,14 +181,21 @@ func generalOptionsUsage() string {
     The region of the Nomad servers to forward commands to.
     Overrides the NOMAD_REGION environment variable if set.
     Defaults to the Agent's local region.
+`
 
+	namespaceText := `
   -namespace=<namespace>
     The target namespace for queries and actions bound to a namespace.
     Overrides the NOMAD_NAMESPACE environment variable if set.
     If set to '*', job and alloc subcommands query all namespaces authorized
     to user.
     Defaults to the "default" namespace.
+`
 
+	// note: that although very few commands use color explicitly, all of them
+	// return red-colored text on error so we don't want to make this
+	// configurable
+	remainingText := `
   -no-color
     Disables colored command output. Alternatively, NOMAD_CLI_NO_COLOR may be
     set.
@@ -218,6 +233,12 @@ func generalOptionsUsage() string {
     The SecretID of an ACL token to use to authenticate API requests with.
     Overrides the NOMAD_TOKEN environment variable if set.
 `
+
+	if usageOpts&usageOptsNoNamespace == 0 {
+		helpText = helpText + namespaceText
+	}
+
+	helpText = helpText + remainingText
 	return strings.TrimSpace(helpText)
 }
 

command/metrics.go

@@ -19,7 +19,7 @@ Usage: nomad operator metrics [options]
 Get Nomad metrics
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 Metrics Specific Options
 

command/namespace_apply.go

@@ -22,7 +22,7 @@ Usage: nomad namespace apply [options] <namespace>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 Apply Options:
 

command/namespace_delete.go

@@ -19,7 +19,7 @@ Usage: nomad namespace delete [options] <namespace>
 
 General Options:
 
-  ` + generalOptionsUsage()
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace)
 
 	return strings.TrimSpace(helpText)
 }

command/namespace_inspect.go

@@ -19,7 +19,7 @@ Usage: nomad namespace inspect [options] <namespace>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 Inspect Options:
 

command/namespace_list.go

@@ -21,7 +21,7 @@ Usage: nomad namespace list [options]
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 List Options:
 

command/namespace_status.go

@@ -20,7 +20,7 @@ Usage: nomad namespace status [options] <namespace>
 
 General Options:
 
-  ` + generalOptionsUsage()
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace)
 
 	return strings.TrimSpace(helpText)
 }

command/node_config.go

@@ -24,7 +24,7 @@ Usage: nomad node config [options]
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 Client Config Options:
 

command/node_drain.go

@@ -31,7 +31,7 @@ Usage: nomad node drain [options] <node>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 Node Drain Options:
 

command/node_eligibility.go

@@ -25,7 +25,7 @@ Usage: nomad node eligibility [options] <node>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 Node Eligibility Options:
 

command/node_status.go

@@ -51,7 +51,7 @@ Usage: nomad node status [options] <node>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 Node Status Options:
 

command/operator_autopilot_get.go

@@ -66,7 +66,7 @@ Usage: nomad operator autopilot get-config [options]
 
 General Options:
 
-  ` + generalOptionsUsage()
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace)
 
 	return strings.TrimSpace(helpText)
 }

command/operator_autopilot_set.go

@@ -112,7 +112,7 @@ Usage: nomad operator autopilot set-config [options]
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 Set Config Options:
 

command/operator_debug.go

@@ -57,7 +57,7 @@ Usage: nomad operator debug [options]
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 Debug Options:
 

command/operator_keyring.go

@@ -33,7 +33,7 @@ Usage: nomad operator keyring [options]
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 Keyring Options:
 

command/operator_raft_list.go

@@ -21,7 +21,7 @@ Usage: nomad operator raft list-peers [options]
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 List Peers Options:
 

command/operator_raft_remove.go

@@ -27,7 +27,7 @@ Usage: nomad operator raft remove-peer [options]
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 Remove Peer Options:
 

command/operator_snapshot_restore.go

@@ -34,7 +34,7 @@ Usage: nomad operator snapshot restore [options] <file>
 
 General Options:
 
-  ` + generalOptionsUsage()
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace)
 	return strings.TrimSpace(helpText)
 }
 

command/operator_snapshot_save.go

@@ -41,7 +41,7 @@ Usage: nomad operator snapshot save [options] <file>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 Snapshot Save Options:
 

command/plugin_status.go

@@ -26,7 +26,7 @@ Usage nomad plugin status [options] <plugin>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 Status Options:
 

command/quota_apply.go

@@ -31,7 +31,7 @@ Usage: nomad quota apply [options] <input>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Apply Options:
 

command/quota_delete.go

@@ -19,7 +19,7 @@ Usage: nomad quota delete [options] <quota>
 
 General Options:
 
-  ` + generalOptionsUsage()
+  ` + generalOptionsUsage(usageOptsDefault)
 
 	return strings.TrimSpace(helpText)
 }

command/quota_inspect.go

@@ -26,7 +26,7 @@ Usage: nomad quota inspect [options] <quota>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Inspect Options:
 

command/quota_list.go

@@ -21,7 +21,7 @@ Usage: nomad quota list [options]
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 List Options:
 

command/quota_status.go

@@ -23,7 +23,7 @@ Usage: nomad quota status [options] <quota>
 
 General Options:
 
-  ` + generalOptionsUsage()
+  ` + generalOptionsUsage(usageOptsDefault)
 
 	return strings.TrimSpace(helpText)
 }

command/recommendation_apply.go

@@ -27,7 +27,7 @@ Usage: nomad recommendation apply [options] <recommendation_ids>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Recommendation Apply Options:
 

command/recommendation_dismiss.go

@@ -48,7 +48,7 @@ Usage: nomad recommendation dismiss [options] <recommendation_ids>
 
 General Options:
 
-  ` + generalOptionsUsage()
+  ` + generalOptionsUsage(usageOptsDefault)
 	return strings.TrimSpace(helpText)
 }
 

command/recommendation_info.go

@@ -26,7 +26,7 @@ Usage: nomad recommendation info [options] <recommendation_id>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Recommendation Info Options:
 

command/recommendation_list.go

@@ -27,7 +27,7 @@ Usage: nomad recommendation list [options]
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Recommendation List Options:
 

command/scaling_policy_info.go

@@ -25,7 +25,7 @@ Usage: nomad scaling policy info [options] <policy_id>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Policy Info Options:
 

command/scaling_policy_list.go

@@ -27,7 +27,7 @@ Usage: nomad scaling policy list [options]
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Policy Info Options:
 

command/sentinel_apply.go

@@ -24,7 +24,7 @@ Usage: nomad sentinel apply [options] <name> <file>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 Apply Options:
 

command/sentinel_delete.go

@@ -19,7 +19,7 @@ Usage: nomad sentinel delete [options] <name>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 `
 	return strings.TrimSpace(helpText)

command/sentinel_list.go

@@ -19,7 +19,7 @@ Usage: nomad sentinel list [options]
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 `
 	return strings.TrimSpace(helpText)

command/sentinel_read.go

@@ -19,7 +19,7 @@ Usage: nomad sentinel read [options] <name>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 Read Options:
 

command/server_force_leave.go

@@ -22,7 +22,7 @@ Usage: nomad server force-leave [options] <node>
 
 General Options:
 
-  ` + generalOptionsUsage()
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace)
 	return strings.TrimSpace(helpText)
 }
 

command/server_join.go

@@ -23,7 +23,7 @@ Usage: nomad server join [options] <addr> [<addr>...]
 
 General Options:
 
-  ` + generalOptionsUsage()
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace)
 	return strings.TrimSpace(helpText)
 }
 

command/server_members.go

@@ -25,7 +25,7 @@ Usage: nomad server members [options]
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
 
 Server Members Options:
 

command/status.go

@@ -26,7 +26,7 @@ Usage: nomad status [options] <identifier>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Status Options:
 

command/system_gc.go

@@ -19,7 +19,7 @@ Usage: nomad system gc [options]
 
 General Options:
 
-  ` + generalOptionsUsage()
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace)
 	return strings.TrimSpace(helpText)
 }
 

command/system_reconcile_summaries.go

@@ -19,7 +19,7 @@ Usage: nomad system reconcile summaries [options]
 
 General Options:
 
-  ` + generalOptionsUsage()
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace)
 	return strings.TrimSpace(helpText)
 }
 

command/ui.go

@@ -29,7 +29,7 @@ object. Supported identifiers are jobs, allocations and nodes.
 
 General Options:
 
-  ` + generalOptionsUsage()
+  ` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace)
 
 	return strings.TrimSpace(helpText)
 }

command/volume_deregister.go

@@ -20,7 +20,7 @@ Usage: nomad volume deregister [options] <id>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Volume Deregister Options:
 

command/volume_detach.go

@@ -20,7 +20,7 @@ Usage: nomad volume detach [options] <vol id> <node id>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 `
 	return strings.TrimSpace(helpText)

command/volume_register.go

@@ -27,7 +27,7 @@ Usage: nomad volume register [options] <input>
 
 General Options:
 
-  ` + generalOptionsUsage()
+  ` + generalOptionsUsage(usageOptsDefault)
 
 	return strings.TrimSpace(helpText)
 }

command/volume_status.go

@@ -26,7 +26,7 @@ Usage: nomad volume status [options] <id>
 
 General Options:
 
-  ` + generalOptionsUsage() + `
+  ` + generalOptionsUsage(usageOptsDefault) + `
 
 Status Options: