Docs: consistency between man / --help

New functionality in hack/man-page-checker: start cross-
referencing the man page 'Synopsis' line against the
output of 'podman foo --help'. This is part 1, flag/option
consistency. Part 2 (arg consistency) is too big and will
have to wait for later.

flag/option consistency means: if 'podman foo --help'
includes the string '[flags]' in the Usage message,
make sure the man page includes '[*options*]' in its
Synopsis line, and vice-versa. This found several
inconsistencies, which I've fixed.

While doing this I realized that Cobra automatically
includes a 'Flags:' subsection in its --help output
for all subcommands that have defined flags. This
is great - it lets us cross-check against the
usage synopsis, and make sure that '[flags]' is
present or absent as needed, without fear of
human screwups. If a flag-less subcommand ever
gets extended with flags, but the developer forgets
to add '[flags]' and remove DisableFlagsInUseLine,
we now have a test that will catch that. (This,
too, caught two instances which I fixed).

I don't actually know if the new man-page-checker
functionality will work in CI: I vaguely recall that
it might run before 'make podman' does; and also
vaguely recall that some steps were taken to remedy
that.

Signed-off-by: Ed Santiago <santiago@redhat.com>

7 files changed, 56 insertions, 47 deletions

diff --git a/cmd/podman/healthcheck/run.go b/cmd/podman/healthcheck/run.go
index 5612910cb..17ddf17b6 100644
--- a/cmd/podman/healthcheck/run.go
+++ b/cmd/podman/healthcheck/run.go
@@ -12,12 +12,13 @@ import (
 var (
 	healthcheckRunDescription = "run the health check of a container"
 	healthcheckrunCommand     = &cobra.Command{
-		Use:     "run [flags] CONTAINER",
-		Short:   "run the health check of a container",
-		Long:    healthcheckRunDescription,
-		Example: `podman healthcheck run mywebapp`,
-		RunE:    run,
-		Args:    cobra.ExactArgs(1),
+		Use:                   "run CONTAINER",
+		Short:                 "run the health check of a container",
+		Long:                  healthcheckRunDescription,
+		Example:               `podman healthcheck run mywebapp`,
+		RunE:                  run,
+		Args:                  cobra.ExactArgs(1),
+		DisableFlagsInUseLine: true,
 	}
 )
 
diff --git a/cmd/podman/images/tag.go b/cmd/podman/images/tag.go
index dae3416c4..859489552 100644
--- a/cmd/podman/images/tag.go
+++ b/cmd/podman/images/tag.go
@@ -9,22 +9,24 @@ import (
 var (
 	tagDescription = "Adds one or more additional names to locally-stored image."
 	tagCommand     = &cobra.Command{
-		Use:   "tag [flags] IMAGE TARGET_NAME [TARGET_NAME...]",
-		Short: "Add an additional name to a local image",
-		Long:  tagDescription,
-		RunE:  tag,
-		Args:  cobra.MinimumNArgs(2),
+		Use:                   "tag IMAGE TARGET_NAME [TARGET_NAME...]",
+		Short:                 "Add an additional name to a local image",
+		Long:                  tagDescription,
+		RunE:                  tag,
+		Args:                  cobra.MinimumNArgs(2),
+		DisableFlagsInUseLine: true,
 		Example: `podman tag 0e3bbc2 fedora:latest
   podman tag imageID:latest myNewImage:newTag
   podman tag httpd myregistryhost:5000/fedora/httpd:v2`,
 	}
 
 	imageTagCommand = &cobra.Command{
-		Args:  tagCommand.Args,
-		Use:   tagCommand.Use,
-		Short: tagCommand.Short,
-		Long:  tagCommand.Long,
-		RunE:  tagCommand.RunE,
+		Args:                  tagCommand.Args,
+		DisableFlagsInUseLine: true,
+		Use:                   tagCommand.Use,
+		Short:                 tagCommand.Short,
+		Long:                  tagCommand.Long,
+		RunE:                  tagCommand.RunE,
 		Example: `podman image tag 0e3bbc2 fedora:latest
   podman image tag imageID:latest myNewImage:newTag
   podman image tag httpd myregistryhost:5000/fedora/httpd:v2`,
diff --git a/cmd/podman/images/untag.go b/cmd/podman/images/untag.go
index 266a3f115..5d1274895 100644
--- a/cmd/podman/images/untag.go
+++ b/cmd/podman/images/untag.go
@@ -8,22 +8,24 @@ import (
 
 var (
 	untagCommand = &cobra.Command{
-		Use:   "untag [flags] IMAGE [NAME...]",
-		Short: "Remove a name from a local image",
-		Long:  "Removes one or more names from a locally-stored image.",
-		RunE:  untag,
-		Args:  cobra.MinimumNArgs(1),
+		Use:                   "untag IMAGE [NAME...]",
+		Short:                 "Remove a name from a local image",
+		Long:                  "Removes one or more names from a locally-stored image.",
+		RunE:                  untag,
+		Args:                  cobra.MinimumNArgs(1),
+		DisableFlagsInUseLine: true,
 		Example: `podman untag 0e3bbc2
   podman untag imageID:latest otherImageName:latest
   podman untag httpd myregistryhost:5000/fedora/httpd:v2`,
 	}
 
 	imageUntagCommand = &cobra.Command{
-		Args:  untagCommand.Args,
-		Use:   untagCommand.Use,
-		Short: untagCommand.Short,
-		Long:  untagCommand.Long,
-		RunE:  untagCommand.RunE,
+		Args:                  untagCommand.Args,
+		DisableFlagsInUseLine: true,
+		Use:                   untagCommand.Use,
+		Short:                 untagCommand.Short,
+		Long:                  untagCommand.Long,
+		RunE:                  untagCommand.RunE,
 		Example: `podman image untag 0e3bbc2
   podman image untag imageID:latest otherImageName:latest
   podman image untag httpd myregistryhost:5000/fedora/httpd:v2`,
diff --git a/cmd/podman/manifest/inspect.go b/cmd/podman/manifest/inspect.go
index 5112aa5b2..861f4be4f 100644
--- a/cmd/podman/manifest/inspect.go
+++ b/cmd/podman/manifest/inspect.go
@@ -12,12 +12,13 @@ import (
 
 var (
 	inspectCmd = &cobra.Command{
-		Use:     "inspect [flags] IMAGE",
-		Short:   "Display the contents of a manifest list or image index",
-		Long:    "Display the contents of a manifest list or image index.",
-		RunE:    inspect,
-		Example: "podman manifest inspect localhost/list",
-		Args:    cobra.ExactArgs(1),
+		Use:                   "inspect IMAGE",
+		Short:                 "Display the contents of a manifest list or image index",
+		Long:                  "Display the contents of a manifest list or image index.",
+		RunE:                  inspect,
+		Example:               "podman manifest inspect localhost/list",
+		Args:                  cobra.ExactArgs(1),
+		DisableFlagsInUseLine: true,
 	}
 )
 
diff --git a/cmd/podman/manifest/remove.go b/cmd/podman/manifest/remove.go
index 4d345efc0..815a3f0a8 100644
--- a/cmd/podman/manifest/remove.go
+++ b/cmd/podman/manifest/remove.go
@@ -12,12 +12,13 @@ import (
 
 var (
 	removeCmd = &cobra.Command{
-		Use:     "remove [flags] LIST IMAGE",
-		Short:   "Remove an entry from a manifest list or image index",
-		Long:    "Removes an image from a manifest list or image index.",
-		RunE:    remove,
-		Example: `podman manifest remove mylist:v1.11 sha256:15352d97781ffdf357bf3459c037be3efac4133dc9070c2dce7eca7c05c3e736`,
-		Args:    cobra.ExactArgs(2),
+		Use:                   "remove LIST IMAGE",
+		Short:                 "Remove an entry from a manifest list or image index",
+		Long:                  "Removes an image from a manifest list or image index.",
+		RunE:                  remove,
+		Example:               `podman manifest remove mylist:v1.11 sha256:15352d97781ffdf357bf3459c037be3efac4133dc9070c2dce7eca7c05c3e736`,
+		Args:                  cobra.ExactArgs(2),
+		DisableFlagsInUseLine: true,
 	}
 )
 
diff --git a/cmd/podman/system/renumber.go b/cmd/podman/system/renumber.go
index b90640de3..39cd15dd7 100644
--- a/cmd/podman/system/renumber.go
+++ b/cmd/podman/system/renumber.go
@@ -22,11 +22,12 @@ var (
 `
 
 	renumberCommand = &cobra.Command{
-		Use:   "renumber",
-		Args:  validate.NoArgs,
-		Short: "Migrate lock numbers",
-		Long:  renumberDescription,
-		Run:   renumber,
+		Use:                   "renumber",
+		Args:                  validate.NoArgs,
+		DisableFlagsInUseLine: true,
+		Short:                 "Migrate lock numbers",
+		Long:                  renumberDescription,
+		Run:                   renumber,
 	}
 )
 
diff --git a/cmd/podman/system/unshare.go b/cmd/podman/system/unshare.go
index e5d41e06d..109bab9ed 100644
--- a/cmd/podman/system/unshare.go
+++ b/cmd/podman/system/unshare.go
@@ -13,10 +13,11 @@ import (
 var (
 	unshareDescription = "Runs a command in a modified user namespace."
 	unshareCommand     = &cobra.Command{
-		Use:   "unshare [flags] [COMMAND [ARG ...]]",
-		Short: "Run a command in a modified user namespace",
-		Long:  unshareDescription,
-		RunE:  unshare,
+		Use:                   "unshare [COMMAND [ARG ...]]",
+		DisableFlagsInUseLine: true,
+		Short:                 "Run a command in a modified user namespace",
+		Long:                  unshareDescription,
+		RunE:                  unshare,
 		Example: `podman unshare id
   podman unshare cat /proc/self/uid_map,
   podman unshare podman-script.sh`,