Merge pull request #15260 from edsantiago/docs_dedup_continued

Man pages: refactor common options

2 files changed, 3 insertions, 3 deletions

diff --git a/hack/markdown-preprocess b/hack/markdown-preprocess
index 0b66abb06..86667a32d 100755
--- a/hack/markdown-preprocess
+++ b/hack/markdown-preprocess
@@ -29,7 +29,7 @@ def process(infile):
     # Some options are the same between containers and pods; determine
     # which description to use from the name of the source man page.
     pod_or_container = 'container'
-    if '-pod-' in infile:
+    if '-pod-' in infile or '-kube-' in infile:
         pod_or_container = 'pod'
 
     # Sometimes a man page includes the subcommand.
diff --git a/hack/markdown-preprocess-review b/hack/markdown-preprocess-review
index e8b042e94..a487265ad 100755
--- a/hack/markdown-preprocess-review
+++ b/hack/markdown-preprocess-review
@@ -26,7 +26,7 @@ while (my $line = <$git_diff>) {
         if ($line =~ s/^-####\s+//) {
             $line =~ /^\*\*--(\S+?)\*\*/
                 or die "$ME: in $newname: weird '$line'";
-            $changed{$newname}{$1}{name} = $1;
+            $changed{$newname}{$1}{name} //= $1;
         }
         # Usually the same, but not for host.container and host.pod.md
         elsif ($line =~ /^\+\@\@option\s+(\S+)/) {
@@ -86,7 +86,7 @@ for my $md_file (sort keys %changed) {
             or die "$ME: Error writing $outfile: $!\n";
 
         my $new_text = "$DSM/options/$changed{$md_file}{$opt}{name}.md";
-        die "$ME: File does not exist: $new_text\n" if ! -e $new_text;
+        die "$ME: $md_file: File does not exist: $new_text\n" if ! -e $new_text;
         system('cp', $new_text, "$d/zzz-chosen.md");
     }
 }