Switch use of Flags to Options

Want to have man pages match commands, since we have lots of printed
man pages with using Options, we will change the command line to use
Options in --help.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

97 files changed, 110 insertions, 108 deletions

diff --git a/cmd/podman/auto-update.go b/cmd/podman/auto-update.go
index 677266c83..1a3d4875f 100644
--- a/cmd/podman/auto-update.go
+++ b/cmd/podman/auto-update.go
@@ -20,7 +20,7 @@ var (
   or similar units that create new containers in order to run the updated images.
   Note that this command is experimental. Please refer to the podman-auto-update(1) man page for details.`
 	autoUpdateCommand = &cobra.Command{
-		Use:   "auto-update [flags]",
+		Use:   "auto-update [options]",
 		Short: "Auto update containers according to their auto-update policy",
 		Long:  autoUpdateDescription,
 		RunE:  autoUpdate,
diff --git a/cmd/podman/containers/attach.go b/cmd/podman/containers/attach.go
index cfe7df441..0db7c22d0 100644
--- a/cmd/podman/containers/attach.go
+++ b/cmd/podman/containers/attach.go
@@ -14,7 +14,7 @@ import (
 var (
 	attachDescription = "The podman attach command allows you to attach to a running container using the container's ID or name, either to view its ongoing output or to control it interactively."
 	attachCommand     = &cobra.Command{
-		Use:   "attach [flags] CONTAINER",
+		Use:   "attach [options] CONTAINER",
 		Short: "Attach to a running container",
 		Long:  attachDescription,
 		RunE:  attach,
diff --git a/cmd/podman/containers/checkpoint.go b/cmd/podman/containers/checkpoint.go
index 284393dc0..2606f62c5 100644
--- a/cmd/podman/containers/checkpoint.go
+++ b/cmd/podman/containers/checkpoint.go
@@ -20,7 +20,7 @@ var (
    Checkpoints one or more running containers. The container name or ID can be used.
 `
 	checkpointCommand = &cobra.Command{
-		Use:   "checkpoint [flags] CONTAINER [CONTAINER...]",
+		Use:   "checkpoint [options] CONTAINER [CONTAINER...]",
 		Short: "Checkpoints one or more containers",
 		Long:  checkpointDescription,
 		RunE:  checkpoint,
diff --git a/cmd/podman/containers/cleanup.go b/cmd/podman/containers/cleanup.go
index 7913f5a10..54bc64a60 100644
--- a/cmd/podman/containers/cleanup.go
+++ b/cmd/podman/containers/cleanup.go
@@ -19,7 +19,7 @@ var (
    Cleans up mount points and network stacks on one or more containers from the host. The container name or ID can be used. This command is used internally when running containers, but can also be used if container cleanup has failed when a container exits.
 `
 	cleanupCommand = &cobra.Command{
-		Use:   "cleanup [flags] CONTAINER [CONTAINER...]",
+		Use:   "cleanup [options] CONTAINER [CONTAINER...]",
 		Short: "Cleanup network and mountpoints of one or more containers",
 		Long:  cleanupDescription,
 		RunE:  cleanup,
diff --git a/cmd/podman/containers/commit.go b/cmd/podman/containers/commit.go
index 31294c66d..1b33d221d 100644
--- a/cmd/podman/containers/commit.go
+++ b/cmd/podman/containers/commit.go
@@ -18,7 +18,7 @@ var (
 	commitDescription = `Create an image from a container's changes. Optionally tag the image created, set the author with the --author flag, set the commit message with the --message flag, and make changes to the instructions with the --change flag.`
 
 	commitCommand = &cobra.Command{
-		Use:   "commit [flags] CONTAINER [IMAGE]",
+		Use:   "commit [options] CONTAINER [IMAGE]",
 		Short: "Create new image based on the changed container",
 		Long:  commitDescription,
 		RunE:  commit,
diff --git a/cmd/podman/containers/cp.go b/cmd/podman/containers/cp.go
index 28a18e83e..5dfe43ded 100644
--- a/cmd/podman/containers/cp.go
+++ b/cmd/podman/containers/cp.go
@@ -16,7 +16,7 @@ var (
   You can copy from the container's file system to the local machine or the reverse, from the local filesystem to the container. If "-" is specified for either the SRC_PATH or DEST_PATH, you can also stream a tar archive from STDIN or to STDOUT. The CONTAINER can be a running or stopped container.  The SRC_PATH or DEST_PATH can be a file or directory.
 `
 	cpCommand = &cobra.Command{
-		Use:     "cp [flags] SRC_PATH DEST_PATH",
+		Use:     "cp [options] SRC_PATH DEST_PATH",
 		Short:   "Copy files/folders between a container and the local filesystem",
 		Long:    cpDescription,
 		Args:    cobra.ExactArgs(2),
diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go
index eb96e22b5..e3e1038f4 100644
--- a/cmd/podman/containers/create.go
+++ b/cmd/podman/containers/create.go
@@ -29,7 +29,7 @@ var (
 
   The container ID is then printed to stdout. You can then start it at any time with the podman start <container_id> command. The container will be created with the initial state 'created'.`
 	createCommand = &cobra.Command{
-		Use:   "create [flags] IMAGE [COMMAND [ARG...]]",
+		Use:   "create [options] IMAGE [COMMAND [ARG...]]",
 		Short: "Create but do not start a container",
 		Long:  createDescription,
 		RunE:  create,
diff --git a/cmd/podman/containers/diff.go b/cmd/podman/containers/diff.go
index a3ca6edf9..4ea7ff82e 100644
--- a/cmd/podman/containers/diff.go
+++ b/cmd/podman/containers/diff.go
@@ -13,7 +13,7 @@ import (
 var (
 	// podman container _diff_
 	diffCmd = &cobra.Command{
-		Use:   "diff [flags] CONTAINER",
+		Use:   "diff [options] CONTAINER",
 		Args:  validate.IDOrLatestArgs,
 		Short: "Inspect changes to the container's file systems",
 		Long:  `Displays changes to the container filesystem's'.  The container will be compared to its parent layer.`,
diff --git a/cmd/podman/containers/exec.go b/cmd/podman/containers/exec.go
index e301ca588..88851f619 100644
--- a/cmd/podman/containers/exec.go
+++ b/cmd/podman/containers/exec.go
@@ -20,7 +20,7 @@ var (
 	execDescription = `Execute the specified command inside a running container.
 `
 	execCommand = &cobra.Command{
-		Use:                   "exec [flags] CONTAINER [COMMAND [ARG...]]",
+		Use:                   "exec [options] CONTAINER [COMMAND [ARG...]]",
 		Short:                 "Run a process in a running container",
 		Long:                  execDescription,
 		RunE:                  exec,
diff --git a/cmd/podman/containers/exists.go b/cmd/podman/containers/exists.go
index 1d79b684d..70b8af159 100644
--- a/cmd/podman/containers/exists.go
+++ b/cmd/podman/containers/exists.go
@@ -12,7 +12,7 @@ var (
 	containerExistsDescription = `If the named container exists in local storage, podman container exists exits with 0, otherwise the exit code will be 1.`
 
 	existsCommand = &cobra.Command{
-		Use:   "exists [flags] CONTAINER",
+		Use:   "exists [options] CONTAINER",
 		Short: "Check if a container exists in local storage",
 		Long:  containerExistsDescription,
 		Example: `podman container exists --external containerID
diff --git a/cmd/podman/containers/export.go b/cmd/podman/containers/export.go
index 1a59b7fff..f5e02d134 100644
--- a/cmd/podman/containers/export.go
+++ b/cmd/podman/containers/export.go
@@ -18,7 +18,7 @@ var (
 		" and saves it on the local machine."
 
 	exportCommand = &cobra.Command{
-		Use:   "export [flags] CONTAINER",
+		Use:   "export [options] CONTAINER",
 		Short: "Export container's filesystem contents as a tar archive",
 		Long:  exportDescription,
 		RunE:  export,
diff --git a/cmd/podman/containers/init.go b/cmd/podman/containers/init.go
index 5a826bc59..983c0e4e8 100644
--- a/cmd/podman/containers/init.go
+++ b/cmd/podman/containers/init.go
@@ -15,7 +15,7 @@ var (
 	initDescription = `Initialize one or more containers, creating the OCI spec and mounts for inspection. Container names or IDs can be used.`
 
 	initCommand = &cobra.Command{
-		Use:   "init [flags] CONTAINER [CONTAINER...]",
+		Use:   "init [options] CONTAINER [CONTAINER...]",
 		Short: "Initialize one or more containers",
 		Long:  initDescription,
 		RunE:  initContainer,
diff --git a/cmd/podman/containers/inspect.go b/cmd/podman/containers/inspect.go
index 1c208b513..b4e1feccb 100644
--- a/cmd/podman/containers/inspect.go
+++ b/cmd/podman/containers/inspect.go
@@ -11,7 +11,7 @@ import (
 var (
 	// podman container _inspect_
 	inspectCmd = &cobra.Command{
-		Use:   "inspect [flags] CONTAINER [CONTAINER...]",
+		Use:   "inspect [options] CONTAINER [CONTAINER...]",
 		Short: "Display the configuration of a container",
 		Long:  `Displays the low-level information on a container identified by name or ID.`,
 		RunE:  inspectExec,
diff --git a/cmd/podman/containers/kill.go b/cmd/podman/containers/kill.go
index a4d536098..1bb071b6d 100644
--- a/cmd/podman/containers/kill.go
+++ b/cmd/podman/containers/kill.go
@@ -17,7 +17,7 @@ import (
 var (
 	killDescription = "The main process inside each container specified will be sent SIGKILL, or any signal specified with option --signal."
 	killCommand     = &cobra.Command{
-		Use:   "kill [flags] CONTAINER [CONTAINER...]",
+		Use:   "kill [options] CONTAINER [CONTAINER...]",
 		Short: "Kill one or more running containers with a specific signal",
 		Long:  killDescription,
 		RunE:  kill,
diff --git a/cmd/podman/containers/list.go b/cmd/podman/containers/list.go
index daf03a51b..78a15559f 100644
--- a/cmd/podman/containers/list.go
+++ b/cmd/podman/containers/list.go
@@ -10,7 +10,7 @@ import (
 var (
 	// podman container _list_
 	listCmd = &cobra.Command{
-		Use:     "list",
+		Use:     "list [options]",
 		Aliases: []string{"ls"},
 		Args:    validate.NoArgs,
 		Short:   "List containers",
diff --git a/cmd/podman/containers/logs.go b/cmd/podman/containers/logs.go
index acc2ab1aa..8ad2d7e16 100644
--- a/cmd/podman/containers/logs.go
+++ b/cmd/podman/containers/logs.go
@@ -27,7 +27,7 @@ var (
   This does not guarantee execution order when combined with podman run (i.e., your run may not have generated any logs at the time you execute podman logs).
 `
 	logsCommand = &cobra.Command{
-		Use:   "logs [flags] CONTAINER [CONTAINER...]",
+		Use:   "logs [options] CONTAINER [CONTAINER...]",
 		Short: "Fetch the logs of one or more containers",
 		Long:  logsDescription,
 		Args: func(cmd *cobra.Command, args []string) error {
diff --git a/cmd/podman/containers/mount.go b/cmd/podman/containers/mount.go
index c4dfb513f..adaf4bc91 100644
--- a/cmd/podman/containers/mount.go
+++ b/cmd/podman/containers/mount.go
@@ -25,7 +25,7 @@ var (
 `
 
 	mountCommand = &cobra.Command{
-		Use:   "mount [flags] [CONTAINER...]",
+		Use:   "mount [options] [CONTAINER...]",
 		Short: "Mount a working container's root filesystem",
 		Long:  mountDescription,
 		RunE:  mount,
diff --git a/cmd/podman/containers/pause.go b/cmd/podman/containers/pause.go
index c5171303d..89a76ab25 100644
--- a/cmd/podman/containers/pause.go
+++ b/cmd/podman/containers/pause.go
@@ -17,7 +17,7 @@ import (
 var (
 	pauseDescription = `Pauses one or more running containers.  The container name or ID can be used.`
 	pauseCommand     = &cobra.Command{
-		Use:   "pause [flags] CONTAINER [CONTAINER...]",
+		Use:   "pause [options] CONTAINER [CONTAINER...]",
 		Short: "Pause all the processes in one or more containers",
 		Long:  pauseDescription,
 		RunE:  pause,
diff --git a/cmd/podman/containers/port.go b/cmd/podman/containers/port.go
index 347f06bba..a895f24b1 100644
--- a/cmd/podman/containers/port.go
+++ b/cmd/podman/containers/port.go
@@ -18,7 +18,7 @@ var (
 	portDescription = `List port mappings for the CONTAINER, or lookup the public-facing port that is NAT-ed to the PRIVATE_PORT
 `
 	portCommand = &cobra.Command{
-		Use:   "port [flags] CONTAINER [PORT]",
+		Use:   "port [options] CONTAINER [PORT]",
 		Short: "List port mappings or a specific mapping for the container",
 		Long:  portDescription,
 		RunE:  port,
@@ -31,7 +31,7 @@ var (
 	}
 
 	containerPortCommand = &cobra.Command{
-		Use:   "port [flags] CONTAINER [PORT]",
+		Use:   "port [options] CONTAINER [PORT]",
 		Short: portCommand.Short,
 		Long:  portDescription,
 		RunE:  portCommand.RunE,
diff --git a/cmd/podman/containers/prune.go b/cmd/podman/containers/prune.go
index cfe6765ac..bfdace086 100644
--- a/cmd/podman/containers/prune.go
+++ b/cmd/podman/containers/prune.go
@@ -21,7 +21,7 @@ var (
 
 	Removes all non running containers`)
 	pruneCommand = &cobra.Command{
-		Use:     "prune [flags]",
+		Use:     "prune [options]",
 		Short:   "Remove all non running containers",
 		Long:    pruneDescription,
 		RunE:    prune,
diff --git a/cmd/podman/containers/ps.go b/cmd/podman/containers/ps.go
index 41d309f51..8c3e2e3b7 100644
--- a/cmd/podman/containers/ps.go
+++ b/cmd/podman/containers/ps.go
@@ -27,7 +27,7 @@ import (
 var (
 	psDescription = "Prints out information about the containers"
 	psCommand     = &cobra.Command{
-		Use:   "ps",
+		Use:   "ps [options]",
 		Args:  validate.NoArgs,
 		Short: "List containers",
 		Long:  psDescription,
diff --git a/cmd/podman/containers/restart.go b/cmd/podman/containers/restart.go
index 5f6f9c35c..1cc28c20d 100644
--- a/cmd/podman/containers/restart.go
+++ b/cmd/podman/containers/restart.go
@@ -20,7 +20,7 @@ var (
   A timeout before forcibly stopping can be set, but defaults to %d seconds.`, containerConfig.Engine.StopTimeout)
 
 	restartCommand = &cobra.Command{
-		Use:   "restart [flags] CONTAINER [CONTAINER...]",
+		Use:   "restart [options] CONTAINER [CONTAINER...]",
 		Short: "Restart one or more containers",
 		Long:  restartDescription,
 		RunE:  restart,
diff --git a/cmd/podman/containers/restore.go b/cmd/podman/containers/restore.go
index c996144e3..314bf7564 100644
--- a/cmd/podman/containers/restore.go
+++ b/cmd/podman/containers/restore.go
@@ -20,7 +20,7 @@ var (
    Restores a container from a checkpoint. The container name or ID can be used.
 `
 	restoreCommand = &cobra.Command{
-		Use:   "restore [flags] CONTAINER [CONTAINER...]",
+		Use:   "restore [options] CONTAINER [CONTAINER...]",
 		Short: "Restores one or more containers from a checkpoint",
 		Long:  restoreDescription,
 		RunE:  restore,
diff --git a/cmd/podman/containers/rm.go b/cmd/podman/containers/rm.go
index a7739b3ba..ccdd2ef05 100644
--- a/cmd/podman/containers/rm.go
+++ b/cmd/podman/containers/rm.go
@@ -21,7 +21,7 @@ var (
 
   Command does not remove images. Running or unusable containers will not be removed without the -f option.`
 	rmCommand = &cobra.Command{
-		Use:   "rm [flags] CONTAINER [CONTAINER...]",
+		Use:   "rm [options] CONTAINER [CONTAINER...]",
 		Short: "Remove one or more containers",
 		Long:  rmDescription,
 		RunE:  rm,
diff --git a/cmd/podman/containers/run.go b/cmd/podman/containers/run.go
index cca0e8d1c..f8c248b04 100644
--- a/cmd/podman/containers/run.go
+++ b/cmd/podman/containers/run.go
@@ -25,7 +25,7 @@ var (
 	runDescription = "Runs a command in a new container from the given image"
 	runCommand     = &cobra.Command{
 		Args:  cobra.MinimumNArgs(1),
-		Use:   "run [flags] IMAGE [COMMAND [ARG...]]",
+		Use:   "run [options] IMAGE [COMMAND [ARG...]]",
 		Short: "Run a command in a new container",
 		Long:  runDescription,
 		RunE:  run,
diff --git a/cmd/podman/containers/runlabel.go b/cmd/podman/containers/runlabel.go
index 5ee8c9d6c..b49af36ab 100644
--- a/cmd/podman/containers/runlabel.go
+++ b/cmd/podman/containers/runlabel.go
@@ -24,7 +24,7 @@ var (
 	runlabelOptions     = runlabelOptionsWrapper{}
 	runlabelDescription = "Executes a command as described by a container image label."
 	runlabelCommand     = &cobra.Command{
-		Use:   "runlabel [flags] LABEL IMAGE [ARG...]",
+		Use:   "runlabel [options] LABEL IMAGE [ARG...]",
 		Short: "Execute the command described by an image label",
 		Long:  runlabelDescription,
 		RunE:  runlabel,
diff --git a/cmd/podman/containers/start.go b/cmd/podman/containers/start.go
index 1e58498b6..21f31d360 100644
--- a/cmd/podman/containers/start.go
+++ b/cmd/podman/containers/start.go
@@ -17,7 +17,7 @@ import (
 var (
 	startDescription = `Starts one or more containers.  The container name or ID can be used.`
 	startCommand     = &cobra.Command{
-		Use:   "start [flags] CONTAINER [CONTAINER...]",
+		Use:   "start [options] CONTAINER [CONTAINER...]",
 		Short: "Start one or more containers",
 		Long:  startDescription,
 		RunE:  start,
diff --git a/cmd/podman/containers/stats.go b/cmd/podman/containers/stats.go
index c30ea52ec..02afb1929 100644
--- a/cmd/podman/containers/stats.go
+++ b/cmd/podman/containers/stats.go
@@ -26,7 +26,7 @@ import (
 var (
 	statsDescription = "Display percentage of CPU, memory, network I/O, block I/O and PIDs for one or more containers."
 	statsCommand     = &cobra.Command{
-		Use:   "stats [flags] [CONTAINER...]",
+		Use:   "stats [options] [CONTAINER...]",
 		Short: "Display a live stream of container resource usage statistics",
 		Long:  statsDescription,
 		RunE:  stats,
diff --git a/cmd/podman/containers/stop.go b/cmd/podman/containers/stop.go
index 1c0a5efe4..7c8c1b50e 100644
--- a/cmd/podman/containers/stop.go
+++ b/cmd/podman/containers/stop.go
@@ -17,7 +17,7 @@ var (
 
   A timeout to forcibly stop the container can also be set but defaults to %d seconds otherwise.`, containerConfig.Engine.StopTimeout)
 	stopCommand = &cobra.Command{
-		Use:   "stop [flags] CONTAINER [CONTAINER...]",
+		Use:   "stop [options] CONTAINER [CONTAINER...]",
 		Short: "Stop one or more containers",
 		Long:  stopDescription,
 		RunE:  stop,
diff --git a/cmd/podman/containers/top.go b/cmd/podman/containers/top.go
index f2632d57a..361d30516 100644
--- a/cmd/podman/containers/top.go
+++ b/cmd/podman/containers/top.go
@@ -26,7 +26,7 @@ var (
 	topOptions = entities.TopOptions{}
 
 	topCommand = &cobra.Command{
-		Use:   "top [flags] CONTAINER [FORMAT-DESCRIPTORS|ARGS...]",
+		Use:   "top [options] CONTAINER [FORMAT-DESCRIPTORS|ARGS...]",
 		Short: "Display the running processes of a container",
 		Long:  topDescription,
 		RunE:  top,
diff --git a/cmd/podman/containers/unmount.go b/cmd/podman/containers/unmount.go
index 424d4cedc..c3159cfed 100644
--- a/cmd/podman/containers/unmount.go
+++ b/cmd/podman/containers/unmount.go
@@ -19,7 +19,7 @@ var (
   An unmount can be forced with the --force flag.
 `
 	unmountCommand = &cobra.Command{
-		Use:     "unmount [flags] CONTAINER [CONTAINER...]",
+		Use:     "unmount [options] CONTAINER [CONTAINER...]",
 		Aliases: []string{"umount"},
 		Short:   "Unmounts working container's root filesystem",
 		Long:    description,
diff --git a/cmd/podman/containers/unpause.go b/cmd/podman/containers/unpause.go
index 43eaad72b..8927fc426 100644
--- a/cmd/podman/containers/unpause.go
+++ b/cmd/podman/containers/unpause.go
@@ -17,7 +17,7 @@ import (
 var (
 	unpauseDescription = `Unpauses one or more previously paused containers.  The container name or ID can be used.`
 	unpauseCommand     = &cobra.Command{
-		Use:   "unpause [flags] CONTAINER [CONTAINER...]",
+		Use:   "unpause [options] CONTAINER [CONTAINER...]",
 		Short: "Unpause the processes in one or more containers",
 		Long:  unpauseDescription,
 		RunE:  unpause,
diff --git a/cmd/podman/containers/wait.go b/cmd/podman/containers/wait.go
index 4bc3d20e2..0f9304558 100644
--- a/cmd/podman/containers/wait.go
+++ b/cmd/podman/containers/wait.go
@@ -19,7 +19,7 @@ var (
 	waitDescription = `Block until one or more containers stop and then print their exit codes.
 `
 	waitCommand = &cobra.Command{
-		Use:   "wait [flags] CONTAINER [CONTAINER...]",
+		Use:   "wait [options] CONTAINER [CONTAINER...]",
 		Short: "Block on one or more containers",
 		Long:  waitDescription,
 		RunE:  wait,
diff --git a/cmd/podman/diff.go b/cmd/podman/diff.go
index 9d2236abe..bad31a4a2 100644
--- a/cmd/podman/diff.go
+++ b/cmd/podman/diff.go
@@ -17,7 +17,7 @@ var (
 	// Command: podman _diff_ Object_ID
 	diffDescription = `Displays changes on a container or image's filesystem.  The container or image will be compared to its parent layer.`
 	diffCmd         = &cobra.Command{
-		Use:   "diff [flags] {CONTAINER_ID | IMAGE_ID}",
+		Use:   "diff [options] {CONTAINER_ID | IMAGE_ID}",
 		Args:  validate.IDOrLatestArgs,
 		Short: "Display the changes to the object's file system",
 		Long:  diffDescription,
diff --git a/cmd/podman/generate/kube.go b/cmd/podman/generate/kube.go
index 2f63ba590..4935fc60c 100644
--- a/cmd/podman/generate/kube.go
+++ b/cmd/podman/generate/kube.go
@@ -20,7 +20,7 @@ var (
 Whether the input is for a container or pod, Podman will always generate the specification as a pod.`
 
 	kubeCmd = &cobra.Command{
-		Use:   "kube [flags] CONTAINER | POD",
+		Use:   "kube [options] CONTAINER | POD",
 		Short: "Generate Kubernetes YAML from a container or pod.",
 		Long:  kubeDescription,
 		RunE:  kube,
diff --git a/cmd/podman/generate/systemd.go b/cmd/podman/generate/systemd.go
index 02e826549..903f61aee 100644
--- a/cmd/podman/generate/systemd.go
+++ b/cmd/podman/generate/systemd.go
@@ -24,7 +24,7 @@ var (
   The generated units can later be controlled via systemctl(1).`
 
 	systemdCmd = &cobra.Command{
-		Use:   "systemd [flags] CTR|POD",
+		Use:   "systemd [options] CTR|POD",
 		Short: "Generate systemd units.",
 		Long:  systemdDescription,
 		RunE:  systemd,
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go
index ac1b2c848..f8ea4754f 100644
--- a/cmd/podman/images/build.go
+++ b/cmd/podman/images/build.go
@@ -40,7 +40,7 @@ var (
 	// Command: podman _diff_ Object_ID
 	buildDescription = "Builds an OCI or Docker image using instructions from one or more Containerfiles and a specified build context directory."
 	buildCmd         = &cobra.Command{
-		Use:   "build [flags] [CONTEXT]",
+		Use:   "build [options] [CONTEXT]",
 		Short: "Build an image using instructions from Containerfiles",
 		Long:  buildDescription,
 		Args:  cobra.MaximumNArgs(1),
diff --git a/cmd/podman/images/diff.go b/cmd/podman/images/diff.go
index 05a05fa04..ed572ffdb 100644
--- a/cmd/podman/images/diff.go
+++ b/cmd/podman/images/diff.go
@@ -13,7 +13,7 @@ import (
 var (
 	// podman container _inspect_
 	diffCmd = &cobra.Command{
-		Use:   "diff [flags] IMAGE",
+		Use:   "diff [options] IMAGE",
 		Args:  cobra.ExactArgs(1),
 		Short: "Inspect changes to the image's file systems",
 		Long:  `Displays changes to the image's filesystem.  The image will be compared to its parent layer.`,
diff --git a/cmd/podman/images/history.go b/cmd/podman/images/history.go
index fa4b368c6..aac978137 100644
--- a/cmd/podman/images/history.go
+++ b/cmd/podman/images/history.go
@@ -27,7 +27,7 @@ var (
 
 	// podman _history_
 	historyCmd = &cobra.Command{
-		Use:     "history [flags] IMAGE",
+		Use:     "history [options] IMAGE",
 		Short:   "Show history of a specified image",
 		Long:    long,
 		Args:    cobra.ExactArgs(1),
diff --git a/cmd/podman/images/import.go b/cmd/podman/images/import.go
index 1c234e743..e3545da69 100644
--- a/cmd/podman/images/import.go
+++ b/cmd/podman/images/import.go
@@ -19,7 +19,7 @@ var (
   Note remote tar balls can be specified, via web address.
   Optionally tag the image. You can specify the instructions using the --change option.`
 	importCommand = &cobra.Command{
-		Use:   "import [flags] PATH [REFERENCE]",
+		Use:   "import [options] PATH [REFERENCE]",
 		Short: "Import a tarball to create a filesystem image",
 		Long:  importDescription,
 		RunE:  importCon,
diff --git a/cmd/podman/images/inspect.go b/cmd/podman/images/inspect.go
index 065dfaed2..8f005553d 100644
--- a/cmd/podman/images/inspect.go
+++ b/cmd/podman/images/inspect.go
@@ -10,7 +10,7 @@ import (
 var (
 	// Command: podman image _inspect_
 	inspectCmd = &cobra.Command{
-		Use:   "inspect [flags] IMAGE [IMAGE...]",
+		Use:   "inspect [options] IMAGE [IMAGE...]",
 		Short: "Display the configuration of an image",
 		Long:  `Displays the low-level information of an image identified by name or ID.`,
 		RunE:  inspectExec,
diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go
index 239da9d28..e8f1ca9b4 100644
--- a/cmd/podman/images/list.go
+++ b/cmd/podman/images/list.go
@@ -35,7 +35,7 @@ type listFlagType struct {
 var (
 	// Command: podman image _list_
 	listCmd = &cobra.Command{
-		Use:     "list [flags] [IMAGE]",
+		Use:     "list [options] [IMAGE]",
 		Aliases: []string{"ls"},
 		Args:    cobra.MaximumNArgs(1),
 		Short:   "List images in local storage",
diff --git a/cmd/podman/images/load.go b/cmd/podman/images/load.go
index cc8e71814..02f1b3b39 100644
--- a/cmd/podman/images/load.go
+++ b/cmd/podman/images/load.go
@@ -22,7 +22,7 @@ import (
 var (
 	loadDescription = "Loads an image from a locally stored archive (tar file) into container storage."
 	loadCommand     = &cobra.Command{
-		Use:   "load [flags] [NAME[:TAG]]",
+		Use:   "load [options] [NAME[:TAG]]",
 		Short: "Load an image from container archive",
 		Long:  loadDescription,
 		RunE:  load,
diff --git a/cmd/podman/images/mount.go b/cmd/podman/images/mount.go
index 0a972ea81..db34d11d6 100644
--- a/cmd/podman/images/mount.go
+++ b/cmd/podman/images/mount.go
@@ -24,7 +24,7 @@ var (
 `
 
 	mountCommand = &cobra.Command{
-		Use:   "mount [flags] [IMAGE...]",
+		Use:   "mount [options] [IMAGE...]",
 		Short: "Mount an image's root filesystem",
 		Long:  mountDescription,
 		RunE:  mount,
diff --git a/cmd/podman/images/prune.go b/cmd/podman/images/prune.go
index 8dc203ead..b6e6b9562 100644
--- a/cmd/podman/images/prune.go
+++ b/cmd/podman/images/prune.go
@@ -19,7 +19,7 @@ var (
 
   If an image is not being used by a container, it will be removed from the system.`
 	pruneCmd = &cobra.Command{
-		Use:     "prune",
+		Use:     "prune [options]",
 		Args:    validate.NoArgs,
 		Short:   "Remove unused images",
 		Long:    pruneDescription,
diff --git a/cmd/podman/images/pull.go b/cmd/podman/images/pull.go
index 595a2165e..35ef80f3c 100644
--- a/cmd/podman/images/pull.go
+++ b/cmd/podman/images/pull.go
@@ -30,7 +30,7 @@ var (
 
 	// Command: podman pull
 	pullCmd = &cobra.Command{
-		Use:   "pull [flags] IMAGE",
+		Use:   "pull [options] IMAGE",
 		Args:  cobra.ExactArgs(1),
 		Short: "Pull an image from a registry",
 		Long:  pullDescription,
diff --git a/cmd/podman/images/push.go b/cmd/podman/images/push.go
index 24192eccd..718bd4e8c 100644
--- a/cmd/podman/images/push.go
+++ b/cmd/podman/images/push.go
@@ -29,7 +29,7 @@ var (
 
 	// Command: podman push
 	pushCmd = &cobra.Command{
-		Use:   "push [flags] SOURCE [DESTINATION]",
+		Use:   "push [options] SOURCE [DESTINATION]",
 		Short: "Push an image to a specified destination",
 		Long:  pushDescription,
 		RunE:  imagePush,
diff --git a/cmd/podman/images/rm.go b/cmd/podman/images/rm.go
index f6e52a49e..9dddef48f 100644
--- a/cmd/podman/images/rm.go
+++ b/cmd/podman/images/rm.go
@@ -14,7 +14,7 @@ import (
 var (
 	rmDescription = "Removes one or more previously pulled or locally created images."
 	rmCmd         = &cobra.Command{
-		Use:   "rm [flags] IMAGE [IMAGE...]",
+		Use:   "rm [options] IMAGE [IMAGE...]",
 		Short: "Removes one or more images from local storage",
 		Long:  rmDescription,
 		RunE:  rm,
diff --git a/cmd/podman/images/save.go b/cmd/podman/images/save.go
index b164a2534..db1fa7159 100644
--- a/cmd/podman/images/save.go
+++ b/cmd/podman/images/save.go
@@ -25,7 +25,7 @@ var (
 	saveDescription = `Save an image to docker-archive or oci-archive on the local machine. Default is docker-archive.`
 
 	saveCommand = &cobra.Command{
-		Use:   "save [flags] IMAGE [IMAGE...]",
+		Use:   "save [options] IMAGE [IMAGE...]",
 		Short: "Save image(s) to an archive",
 		Long:  saveDescription,
 		RunE:  save,
diff --git a/cmd/podman/images/search.go b/cmd/podman/images/search.go
index 8edd776ce..a30dfe9c9 100644
--- a/cmd/podman/images/search.go
+++ b/cmd/podman/images/search.go
@@ -32,7 +32,7 @@ var (
 
 	// Command: podman search
 	searchCmd = &cobra.Command{
-		Use:   "search [flags] TERM",
+		Use:   "search [options] TERM",
 		Short: "Search registry for image",
 		Long:  searchDescription,
 		RunE:  imageSearch,
diff --git a/cmd/podman/images/sign.go b/cmd/podman/images/sign.go
index e331a64df..f6c1f9856 100644
--- a/cmd/podman/images/sign.go
+++ b/cmd/podman/images/sign.go
@@ -12,7 +12,7 @@ import (
 var (
 	signDescription = "Create a signature file that can be used later to verify the image."
 	signCommand     = &cobra.Command{
-		Use:   "sign [flags] IMAGE [IMAGE...]",
+		Use:   "sign [options] IMAGE [IMAGE...]",
 		Short: "Sign an image",
 		Long:  signDescription,
 		RunE:  sign,
diff --git a/cmd/podman/images/tree.go b/cmd/podman/images/tree.go
index 0b79c2a4b..237a2ab91 100644
--- a/cmd/podman/images/tree.go
+++ b/cmd/podman/images/tree.go
@@ -11,7 +11,7 @@ import (
 var (
 	treeDescription = "Prints layer hierarchy of an image in a tree format"
 	treeCmd         = &cobra.Command{
-		Use:     "tree [flags] IMAGE",
+		Use:     "tree [options] IMAGE",
 		Args:    cobra.ExactArgs(1),
 		Short:   treeDescription,
 		Long:    treeDescription,
diff --git a/cmd/podman/images/trust_set.go b/cmd/podman/images/trust_set.go
index 878ffeea6..2e4b4fe17 100644
--- a/cmd/podman/images/trust_set.go
+++ b/cmd/podman/images/trust_set.go
@@ -12,7 +12,7 @@ import (
 var (
 	setTrustDescription = "Set default trust policy or add a new trust policy for a registry"
 	setTrustCommand     = &cobra.Command{
-		Use:     "set [flags] REGISTRY",
+		Use:     "set [options] REGISTRY",
 		Short:   "Set default trust policy or a new trust policy for a registry",
 		Long:    setTrustDescription,
 		Example: "",
diff --git a/cmd/podman/images/trust_show.go b/cmd/podman/images/trust_show.go
index d1f85d34d..ba3b4e7fb 100644
--- a/cmd/podman/images/trust_show.go
+++ b/cmd/podman/images/trust_show.go
@@ -14,7 +14,7 @@ import (
 var (
 	showTrustDescription = "Display trust policy for the system"
 	showTrustCommand     = &cobra.Command{
-		Use:     "show [flags] [REGISTRY]",
+		Use:     "show [options] [REGISTRY]",
 		Short:   "Display trust policy for the system",
 		Long:    showTrustDescription,
 		RunE:    showTrust,
diff --git a/cmd/podman/images/unmount.go b/cmd/podman/images/unmount.go
index f7f6cf8e5..50dc972e8 100644
--- a/cmd/podman/images/unmount.go
+++ b/cmd/podman/images/unmount.go
@@ -19,7 +19,7 @@ var (
   An unmount can be forced with the --force flag.
 `
 	unmountCommand = &cobra.Command{
-		Use:     "unmount [flags] IMAGE [IMAGE...]",
+		Use:     "unmount [options] IMAGE [IMAGE...]",
 		Aliases: []string{"umount"},
 		Short:   "Unmount an image's root filesystem",
 		Long:    description,
diff --git a/cmd/podman/inspect.go b/cmd/podman/inspect.go
index 85050a497..f1d673a21 100644
--- a/cmd/podman/inspect.go
+++ b/cmd/podman/inspect.go
@@ -19,7 +19,7 @@ var (
 
 	// Command: podman _inspect_ Object_ID
 	inspectCmd = &cobra.Command{
-		Use:              "inspect [flags] {CONTAINER_ID | IMAGE_ID} [...]",
+		Use:              "inspect [options] {CONTAINER_ID | IMAGE_ID} [...]",
 		Short:            "Display the configuration of object denoted by ID",
 		RunE:             inspectExec,
 		Long:             inspectDescription,
diff --git a/cmd/podman/login.go b/cmd/podman/login.go
index 1556b0dcf..a789cef33 100644
--- a/cmd/podman/login.go
+++ b/cmd/podman/login.go
@@ -20,7 +20,7 @@ type loginOptionsWrapper struct {
 var (
 	loginOptions = loginOptionsWrapper{}
 	loginCommand = &cobra.Command{
-		Use:   "login [flags] [REGISTRY]",
+		Use:   "login [options] [REGISTRY]",
 		Short: "Login to a container registry",
 		Long:  "Login to a container registry on a specified server.",
 		RunE:  login,
diff --git a/cmd/podman/logout.go b/cmd/podman/logout.go
index 1c6fdfb2a..7b5615d30 100644
--- a/cmd/podman/logout.go
+++ b/cmd/podman/logout.go
@@ -14,7 +14,7 @@ import (
 var (
 	logoutOptions = auth.LogoutOptions{}
 	logoutCommand = &cobra.Command{
-		Use:   "logout [flags] [REGISTRY]",
+		Use:   "logout [options] [REGISTRY]",
 		Short: "Logout of a container registry",
 		Long:  "Remove the cached username and password for the registry.",
 		RunE:  logout,
diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index 007a8716c..9747769c7 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -66,6 +66,7 @@ func main() {
 				// - rootCmd uses cobra default template not ours
 				c.Command.SetHelpTemplate(helpTemplate)
 				c.Command.SetUsageTemplate(usageTemplate)
+				c.Command.DisableFlagsInUseLine = true
 			}
 		}
 	}
diff --git a/cmd/podman/manifest/add.go b/cmd/podman/manifest/add.go
index 544d99c11..4b85f4c2a 100644
--- a/cmd/podman/manifest/add.go
+++ b/cmd/podman/manifest/add.go
@@ -25,7 +25,7 @@ type manifestAddOptsWrapper struct {
 var (
 	manifestAddOpts = manifestAddOptsWrapper{}
 	addCmd          = &cobra.Command{
-		Use:   "add [flags] LIST LIST",
+		Use:   "add [options] LIST LIST",
 		Short: "Add images to a manifest list or image index",
 		Long:  "Adds an image to a manifest list or image index.",
 		RunE:  add,
diff --git a/cmd/podman/manifest/annotate.go b/cmd/podman/manifest/annotate.go
index 1b720aa39..861e94034 100644
--- a/cmd/podman/manifest/annotate.go
+++ b/cmd/podman/manifest/annotate.go
@@ -13,7 +13,7 @@ import (
 var (
 	manifestAnnotateOpts = entities.ManifestAnnotateOptions{}
 	annotateCmd          = &cobra.Command{
-		Use:     "annotate [flags] LIST IMAGE",
+		Use:     "annotate [options] LIST IMAGE",
 		Short:   "Add or update information about an entry in a manifest list or image index",
 		Long:    "Adds or updates information about an entry in a manifest list or image index.",
 		RunE:    annotate,
diff --git a/cmd/podman/manifest/create.go b/cmd/podman/manifest/create.go
index b5352d24f..956946f9d 100644
--- a/cmd/podman/manifest/create.go
+++ b/cmd/podman/manifest/create.go
@@ -13,7 +13,7 @@ import (
 var (
 	manifestCreateOpts = entities.ManifestCreateOptions{}
 	createCmd          = &cobra.Command{
-		Use:   "create [flags] LIST [IMAGE]",
+		Use:   "create [options] LIST [IMAGE]",
 		Short: "Create manifest list or image index",
 		Long:  "Creates manifest lists or image indexes.",
 		RunE:  create,
diff --git a/cmd/podman/manifest/push.go b/cmd/podman/manifest/push.go
index fd3d51f37..91881c1b3 100644
--- a/cmd/podman/manifest/push.go
+++ b/cmd/podman/manifest/push.go
@@ -22,7 +22,7 @@ type manifestPushOptsWrapper struct {
 var (
 	manifestPushOpts = manifestPushOptsWrapper{}
 	pushCmd          = &cobra.Command{
-		Use:     "push [flags] SOURCE DESTINATION",
+		Use:     "push [options] SOURCE DESTINATION",
 		Short:   "Push a manifest list or image index to a registry",
 		Long:    "Pushes manifest lists and image indexes to registries.",
 		RunE:    push,
diff --git a/cmd/podman/networks/create.go b/cmd/podman/networks/create.go
index 17f39bd8b..634b01ced 100644
--- a/cmd/podman/networks/create.go
+++ b/cmd/podman/networks/create.go
@@ -14,7 +14,7 @@ import (
 var (
 	networkCreateDescription = `create CNI networks for containers and pods`
 	networkCreateCommand     = &cobra.Command{
-		Use:     "create [flags] [NETWORK]",
+		Use:     "create [options] [NETWORK]",
 		Short:   "network create",
 		Long:    networkCreateDescription,
 		RunE:    networkCreate,
diff --git a/cmd/podman/networks/inspect.go b/cmd/podman/networks/inspect.go
index c36125948..b5f141ac8 100644
--- a/cmd/podman/networks/inspect.go
+++ b/cmd/podman/networks/inspect.go
@@ -17,7 +17,7 @@ import (
 var (
 	networkinspectDescription = `Inspect network`
 	networkinspectCommand     = &cobra.Command{
-		Use:     "inspect [flags] NETWORK [NETWORK...]",
+		Use:     "inspect [options] NETWORK [NETWORK...]",
 		Short:   "network inspect",
 		Long:    networkinspectDescription,
 		RunE:    networkInspect,
diff --git a/cmd/podman/networks/list.go b/cmd/podman/networks/list.go
index c53f50c9f..25b7f292f 100644
--- a/cmd/podman/networks/list.go
+++ b/cmd/podman/networks/list.go
@@ -19,7 +19,7 @@ import (
 var (
 	networklistDescription = `List networks`
 	networklistCommand     = &cobra.Command{
-		Use:     "ls",
+		Use:     "ls [options]",
 		Args:    validate.NoArgs,
 		Short:   "network list",
 		Long:    networklistDescription,
diff --git a/cmd/podman/networks/rm.go b/cmd/podman/networks/rm.go
index 86aad43cb..3d7db941a 100644
--- a/cmd/podman/networks/rm.go
+++ b/cmd/podman/networks/rm.go
@@ -16,7 +16,7 @@ import (
 var (
 	networkrmDescription = `Remove networks`
 	networkrmCommand     = &cobra.Command{
-		Use:     "rm [flags] NETWORK [NETWORK...]",
+		Use:     "rm [options] NETWORK [NETWORK...]",
 		Short:   "network rm",
 		Long:    networkrmDescription,
 		RunE:    networkRm,
diff --git a/cmd/podman/play/kube.go b/cmd/podman/play/kube.go
index 1235f75a8..6072ea80c 100644
--- a/cmd/podman/play/kube.go
+++ b/cmd/podman/play/kube.go
@@ -32,7 +32,7 @@ var (
   It creates the pod and containers described in the YAML.  The containers within the pod are then started and the ID of the new Pod is output.`
 
 	kubeCmd = &cobra.Command{
-		Use:   "kube [flags] KUBEFILE",
+		Use:   "kube [options] KUBEFILE",
 		Short: "Play a pod based on Kubernetes YAML.",
 		Long:  kubeDescription,
 		RunE:  kube,
diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go
index ac6d83edd..efa84dcb4 100644
--- a/cmd/podman/pods/create.go
+++ b/cmd/podman/pods/create.go
@@ -27,7 +27,7 @@ var (
   You can then start it at any time with the  podman pod start <pod_id> command. The pod will be created with the initial state 'created'.`
 
 	createCommand = &cobra.Command{
-		Use:   "create",
+		Use:   "create [options]",
 		Args:  validate.NoArgs,
 		Short: "Create a new empty pod",
 		Long:  podCreateDescription,
diff --git a/cmd/podman/pods/inspect.go b/cmd/podman/pods/inspect.go
index 142c8d270..659ebe1f0 100644
--- a/cmd/podman/pods/inspect.go
+++ b/cmd/podman/pods/inspect.go
@@ -26,7 +26,7 @@ var (
 	By default, this will render all results in a JSON array.`)
 
 	inspectCmd = &cobra.Command{
-		Use:     "inspect [flags] POD [POD...]",
+		Use:     "inspect [options] POD [POD...]",
 		Short:   "Displays a pod configuration",
 		Long:    inspectDescription,
 		RunE:    inspect,
diff --git a/cmd/podman/pods/kill.go b/cmd/podman/pods/kill.go
index d666d7537..1902a2c80 100644
--- a/cmd/podman/pods/kill.go
+++ b/cmd/podman/pods/kill.go
@@ -16,7 +16,7 @@ var (
 
   The default signal is SIGKILL, or any signal specified with option --signal.`
 	killCommand = &cobra.Command{
-		Use:   "kill [flags] POD [POD...]",
+		Use:   "kill [options] POD [POD...]",
 		Short: "Send the specified signal or SIGKILL to containers in pod",
 		Long:  podKillDescription,
 		RunE:  kill,
diff --git a/cmd/podman/pods/pause.go b/cmd/podman/pods/pause.go
index 591378983..bba26f90d 100644
--- a/cmd/podman/pods/pause.go
+++ b/cmd/podman/pods/pause.go
@@ -16,7 +16,7 @@ var (
 
   All running containers within each specified pod will then be paused.`
 	pauseCommand = &cobra.Command{
-		Use:   "pause [flags] POD [POD...]",
+		Use:   "pause [options] POD [POD...]",
 		Short: "Pause one or more pods",
 		Long:  podPauseDescription,
 		RunE:  pause,
diff --git a/cmd/podman/pods/prune.go b/cmd/podman/pods/prune.go
index f13d95ae9..e3eae3f71 100644
--- a/cmd/podman/pods/prune.go
+++ b/cmd/podman/pods/prune.go
@@ -23,7 +23,7 @@ var (
 	pruneDescription = fmt.Sprintf(`podman pod prune Removes all exited pods`)
 
 	pruneCommand = &cobra.Command{
-		Use:     "prune [flags]",
+		Use:     "prune [options]",
 		Args:    validate.NoArgs,
 		Short:   "Remove all stopped pods and their containers",
 		Long:    pruneDescription,
diff --git a/cmd/podman/pods/ps.go b/cmd/podman/pods/ps.go
index 0013cca02..aa9094428 100644
--- a/cmd/podman/pods/ps.go
+++ b/cmd/podman/pods/ps.go
@@ -25,7 +25,7 @@ var (
 
 	// Command: podman pod _ps_
 	psCmd = &cobra.Command{
-		Use:     "ps",
+		Use:     "ps  [options]",
 		Aliases: []string{"ls", "list"},
 		Short:   "List pods",
 		Long:    psDescription,
diff --git a/cmd/podman/pods/restart.go b/cmd/podman/pods/restart.go
index 11e8b4ebc..119b4ddee 100644
--- a/cmd/podman/pods/restart.go
+++ b/cmd/podman/pods/restart.go
@@ -16,7 +16,7 @@ var (
 
   All of the containers within each of the specified pods will be restarted. If a container in a pod is not currently running it will be started.`
 	restartCommand = &cobra.Command{
-		Use:   "restart [flags] POD [POD...]",
+		Use:   "restart [options] POD [POD...]",
 		Short: "Restart one or more pods",
 		Long:  podRestartDescription,
 		RunE:  restart,
diff --git a/cmd/podman/pods/rm.go b/cmd/podman/pods/rm.go
index 2975db3e8..714e075e2 100644
--- a/cmd/podman/pods/rm.go
+++ b/cmd/podman/pods/rm.go
@@ -28,7 +28,7 @@ var (
 
   The pod name or ID can be used.  A pod with containers will not be removed without --force. If --force is specified, all containers will be stopped, then removed.`)
 	rmCommand = &cobra.Command{
-		Use:   "rm [flags] POD [POD...]",
+		Use:   "rm [options] POD [POD...]",
 		Short: "Remove one or more pods",
 		Long:  podRmDescription,
 		RunE:  rm,
diff --git a/cmd/podman/pods/start.go b/cmd/podman/pods/start.go
index e2ca3fd41..28ee4769a 100644
--- a/cmd/podman/pods/start.go
+++ b/cmd/podman/pods/start.go
@@ -24,7 +24,7 @@ var (
 
   All containers defined in the pod will be started.`
 	startCommand = &cobra.Command{
-		Use:   "start [flags] POD [POD...]",
+		Use:   "start [options] POD [POD...]",
 		Short: "Start one or more pods",
 		Long:  podStartDescription,
 		RunE:  start,
diff --git a/cmd/podman/pods/stats.go b/cmd/podman/pods/stats.go
index 2f59e4e47..38ecac97e 100644
--- a/cmd/podman/pods/stats.go
+++ b/cmd/podman/pods/stats.go
@@ -33,7 +33,7 @@ var (
 	statsDescription = `Display the containers' resource-usage statistics of one or more running pod`
 	// Command: podman pod _pod_
 	statsCmd = &cobra.Command{
-		Use:   "stats [flags] [POD...]",
+		Use:   "stats [options] [POD...]",
 		Short: "Display a live stream of resource usage statistics for the containers in one or more pods",
 		Long:  statsDescription,
 		RunE:  stats,
diff --git a/cmd/podman/pods/stop.go b/cmd/podman/pods/stop.go
index 20c3f59bf..a2a9b0b57 100644
--- a/cmd/podman/pods/stop.go
+++ b/cmd/podman/pods/stop.go
@@ -29,7 +29,7 @@ var (
   This command will stop all running containers in each of the specified pods.`
 
 	stopCommand = &cobra.Command{
-		Use:   "stop [flags] POD [POD...]",
+		Use:   "stop [options] POD [POD...]",
 		Short: "Stop one or more pods",
 		Long:  podStopDescription,
 		RunE:  stop,
diff --git a/cmd/podman/pods/top.go b/cmd/podman/pods/top.go
index 9877db404..0ffa724da 100644
--- a/cmd/podman/pods/top.go
+++ b/cmd/podman/pods/top.go
@@ -23,7 +23,7 @@ var (
 	topOptions = entities.PodTopOptions{}
 
 	topCommand = &cobra.Command{
-		Use:   "top [flags] POD [FORMAT-DESCRIPTORS|ARGS...]",
+		Use:   "top [options] POD [FORMAT-DESCRIPTORS|ARGS...]",
 		Short: "Display the running processes of containers in a pod",
 		Long:  topDescription,
 		RunE:  top,
diff --git a/cmd/podman/pods/unpause.go b/cmd/podman/pods/unpause.go
index 8474da57e..15b30db14 100644
--- a/cmd/podman/pods/unpause.go
+++ b/cmd/podman/pods/unpause.go
@@ -16,7 +16,7 @@ var (
 
   The pod name or ID can be used.`
 	unpauseCommand = &cobra.Command{
-		Use:   "unpause [flags] POD [POD...]",
+		Use:   "unpause [options] POD [POD...]",
 		Short: "Unpause one or more pods",
 		Long:  podUnpauseDescription,
 		RunE:  unpause,
diff --git a/cmd/podman/root.go b/cmd/podman/root.go
index 6293fa17d..b59b8341a 100644
--- a/cmd/podman/root.go
+++ b/cmd/podman/root.go
@@ -38,7 +38,7 @@ Description:
 // command should not use this.
 const usageTemplate = `Usage:{{if (and .Runnable (not .HasAvailableSubCommands))}}
   {{.UseLine}}{{end}}{{if .HasAvailableSubCommands}}
-  {{.CommandPath}} [command]{{end}}{{if gt (len .Aliases) 0}}
+  {{.UseLine}} [command]{{end}}{{if gt (len .Aliases) 0}}
 
 Aliases:
   {{.NameAndAliases}}{{end}}{{if .HasExample}}
@@ -49,24 +49,24 @@ Examples:
 Available Commands:{{range .Commands}}{{if (or .IsAvailableCommand (eq .Name "help"))}}
   {{rpad .Name .NamePadding }} {{.Short}}{{end}}{{end}}{{end}}{{if .HasAvailableLocalFlags}}
 
-Flags:
+Options:
 {{.LocalFlags.FlagUsages | trimTrailingWhitespaces}}{{end}}{{if .HasAvailableInheritedFlags}}
 {{end}}
 `
 
 var (
 	rootCmd = &cobra.Command{
-		Use:                path.Base(os.Args[0]),
-		Long:               "Manage pods, containers and images",
-		SilenceUsage:       true,
-		SilenceErrors:      true,
-		TraverseChildren:   true,
-		PersistentPreRunE:  persistentPreRunE,
-		RunE:               validate.SubCommandExists,
-		PersistentPostRunE: persistentPostRunE,
-		Version:            version.Version.String(),
+		Use:                   path.Base(os.Args[0]) + " [options]",
+		Long:                  "Manage pods, containers and images",
+		SilenceUsage:          true,
+		SilenceErrors:         true,
+		TraverseChildren:      true,
+		PersistentPreRunE:     persistentPreRunE,
+		RunE:                  validate.SubCommandExists,
+		PersistentPostRunE:    persistentPostRunE,
+		Version:               version.Version.String(),
+		DisableFlagsInUseLine: true,
 	}
-
 	logLevels = []string{"debug", "info", "warn", "error", "fatal", "panic"}
 	logLevel  = "error"
 	useSyslog bool
@@ -81,6 +81,7 @@ func init() {
 	)
 
 	rootFlags(rootCmd, registry.PodmanConfig())
+	rootCmd.SetUsageTemplate(usageTemplate)
 }
 
 func Execute() {
diff --git a/cmd/podman/system/connection/add.go b/cmd/podman/system/connection/add.go
index df036af1a..0d81a64ca 100644
--- a/cmd/podman/system/connection/add.go
+++ b/cmd/podman/system/connection/add.go
@@ -27,7 +27,7 @@ const schemaPattern = "^[A-Za-z][A-Za-z0-9+.-]*:"
 
 var (
 	addCmd = &cobra.Command{
-		Use:   "add [flags] NAME DESTINATION",
+		Use:   "add [options] NAME DESTINATION",
 		Args:  cobra.ExactArgs(2),
 		Short: "Record destination for the Podman service",
 		Long: `Add destination to podman configuration.
diff --git a/cmd/podman/system/df.go b/cmd/podman/system/df.go
index da7bbed02..63c80a8d9 100644
--- a/cmd/podman/system/df.go
+++ b/cmd/podman/system/df.go
@@ -23,7 +23,7 @@ var (
 	Show podman disk usage
 	`
 	dfSystemCommand = &cobra.Command{
-		Use:   "df",
+		Use:   "df [options]",
 		Args:  validate.NoArgs,
 		Short: "Show podman disk usage",
 		Long:  dfSystemDescription,
diff --git a/cmd/podman/system/events.go b/cmd/podman/system/events.go
index aaf572873..3f3fbc340 100644
--- a/cmd/podman/system/events.go
+++ b/cmd/podman/system/events.go
@@ -20,7 +20,7 @@ var (
 
   By default, streaming mode is used, printing new events as they occur.  Previous events can be listed via --since and --until.`
 	eventsCommand = &cobra.Command{
-		Use:   "events",
+		Use:   "events [options]",
 		Args:  validate.NoArgs,
 		Short: "Show podman events",
 		Long:  eventsDescription,
diff --git a/cmd/podman/system/info.go b/cmd/podman/system/info.go
index ee720abf8..b84bdc51a 100644
--- a/cmd/podman/system/info.go
+++ b/cmd/podman/system/info.go
@@ -20,7 +20,7 @@ var (
   Useful for the user and when reporting issues.
 `
 	infoCommand = &cobra.Command{
-		Use:     "info",
+		Use:     "info [options]",
 		Args:    validate.NoArgs,
 		Long:    infoDescription,
 		Short:   "Display podman system information",
diff --git a/cmd/podman/system/migrate.go b/cmd/podman/system/migrate.go
index 018701fc9..7870df60b 100644
--- a/cmd/podman/system/migrate.go
+++ b/cmd/podman/system/migrate.go
@@ -21,7 +21,7 @@ var (
 `
 
 	migrateCommand = &cobra.Command{
-		Use:   "migrate",
+		Use:   "migrate [options]",
 		Args:  validate.NoArgs,
 		Short: "Migrate containers",
 		Long:  migrateDescription,
diff --git a/cmd/podman/system/prune.go b/cmd/podman/system/prune.go
index f34df3698..a229b06b0 100644
--- a/cmd/podman/system/prune.go
+++ b/cmd/podman/system/prune.go
@@ -25,7 +25,7 @@ var (
 `)
 
 	pruneCommand = &cobra.Command{
-		Use:     "prune [flags]",
+		Use:     "prune [options]",
 		Short:   "Remove unused data",
 		Args:    validate.NoArgs,
 		Long:    pruneDescription,
diff --git a/cmd/podman/system/reset.go b/cmd/podman/system/reset.go
index a7a42ea58..0b04c6ee0 100644
--- a/cmd/podman/system/reset.go
+++ b/cmd/podman/system/reset.go
@@ -22,7 +22,7 @@ var (
   All containers will be stopped and removed, and all images, volumes and container content will be removed.
 `
 	systemResetCommand = &cobra.Command{
-		Use:   "reset",
+		Use:   "reset [options]",
 		Args:  validate.NoArgs,
 		Short: "Reset podman storage",
 		Long:  systemResetDescription,
diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go
index 7c692b07e..2a2b1984f 100644
--- a/cmd/podman/system/service.go
+++ b/cmd/podman/system/service.go
@@ -26,7 +26,7 @@ Enable a listening service for API access to Podman commands.
 `
 
 	srvCmd = &cobra.Command{
-		Use:     "service [flags] [URI]",
+		Use:     "service [options] [URI]",
 		Args:    cobra.MaximumNArgs(1),
 		Short:   "Run API service",
 		Long:    srvDescription,
diff --git a/cmd/podman/system/varlink.go b/cmd/podman/system/varlink.go
index 57e7e4ba6..89669d51a 100644
--- a/cmd/podman/system/varlink.go
+++ b/cmd/podman/system/varlink.go
@@ -16,7 +16,7 @@ var (
   Tools speaking varlink protocol can remotely manage pods, containers and images.
 `
 	varlinkCmd = &cobra.Command{
-		Use:        "varlink [flags] [URI]",
+		Use:        "varlink [options] [URI]",
 		Args:       cobra.MinimumNArgs(1),
 		Short:      "Run varlink interface",
 		Long:       varlinkDescription,
diff --git a/cmd/podman/system/version.go b/cmd/podman/system/version.go
index 4f47c5fba..5a5686744 100644
--- a/cmd/podman/system/version.go
+++ b/cmd/podman/system/version.go
@@ -19,7 +19,7 @@ import (
 
 var (
 	versionCommand = &cobra.Command{
-		Use:   "version",
+		Use:   "version [options]",
 		Args:  validate.NoArgs,
 		Short: "Display the Podman Version Information",
 		RunE:  version,
diff --git a/cmd/podman/volumes/create.go b/cmd/podman/volumes/create.go
index 934a552dc..a54530183 100644
--- a/cmd/podman/volumes/create.go
+++ b/cmd/podman/volumes/create.go
@@ -15,7 +15,7 @@ var (
 	createDescription = `If using the default driver, "local", the volume will be created on the host in the volumes directory under container storage.`
 
 	createCommand = &cobra.Command{
-		Use:   "create [flags] [NAME]",
+		Use:   "create [options] [NAME]",
 		Short: "Create a new volume",
 		Long:  createDescription,
 		RunE:  create,
diff --git a/cmd/podman/volumes/inspect.go b/cmd/podman/volumes/inspect.go
index 8d1350228..674fd2b61 100644
--- a/cmd/podman/volumes/inspect.go
+++ b/cmd/podman/volumes/inspect.go
@@ -19,7 +19,7 @@ var (
 
   Use a Go template to change the format from JSON.`
 	inspectCommand = &cobra.Command{
-		Use:   "inspect [flags] VOLUME [VOLUME...]",
+		Use:   "inspect [options] VOLUME [VOLUME...]",
 		Short: "Display detailed information on one or more volumes",
 		Long:  volumeInspectDescription,
 		RunE:  inspect,
diff --git a/cmd/podman/volumes/list.go b/cmd/podman/volumes/list.go
index 18765a499..9a5fed0dd 100644
--- a/cmd/podman/volumes/list.go
+++ b/cmd/podman/volumes/list.go
@@ -24,7 +24,7 @@ podman volume ls
 List all available volumes. The output of the volumes can be filtered
 and the output format can be changed to JSON or a user specified Go template.`
 	lsCommand = &cobra.Command{
-		Use:     "ls",
+		Use:     "ls [options]",
 		Aliases: []string{"list"},
 		Args:    validate.NoArgs,
 		Short:   "List volumes",
diff --git a/cmd/podman/volumes/prune.go b/cmd/podman/volumes/prune.go
index 78c258bec..79e6f1a54 100644
--- a/cmd/podman/volumes/prune.go
+++ b/cmd/podman/volumes/prune.go
@@ -21,7 +21,7 @@ var (
   The command prompts for confirmation which can be overridden with the --force flag.
   Note all data will be destroyed.`
 	pruneCommand = &cobra.Command{
-		Use:   "prune",
+		Use:   "prune [options]",
 		Args:  validate.NoArgs,
 		Short: "Remove all unused volumes",
 		Long:  volumePruneDescription,
diff --git a/cmd/podman/volumes/rm.go b/cmd/podman/volumes/rm.go
index 4c960d4d5..4026764ac 100644
--- a/cmd/podman/volumes/rm.go
+++ b/cmd/podman/volumes/rm.go
@@ -18,7 +18,7 @@ var (
 
   By default only volumes that are not being used by any containers will be removed. To remove the volumes anyways, use the --force flag.`
 	rmCommand = &cobra.Command{
-		Use:     "rm [flags] VOLUME [VOLUME...]",
+		Use:     "rm [options] VOLUME [VOLUME...]",
 		Aliases: []string{"remove"},
 		Short:   "Remove one or more volumes",
 		Long:    volumeRmDescription,