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>

2 files changed, 11 insertions, 9 deletions

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`,