From 30e731ecc8e439d038bbd2b7ab964a980579acf8 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Fri, 7 May 2021 18:30:00 +0200 Subject: Revert escaped double dash man page flag syntax Commit 800a2e2d35 introduced a way to disable the conversion of `--`into an en dash on docs.podman.io, so the ugly workaround of escaping the dashes is no longer necessary. Signed-off-by: Paul Holzinger --- hack/xref-helpmsgs-manpages | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'hack/xref-helpmsgs-manpages') diff --git a/hack/xref-helpmsgs-manpages b/hack/xref-helpmsgs-manpages index 25e972fbc..cc1e233b9 100755 --- a/hack/xref-helpmsgs-manpages +++ b/hack/xref-helpmsgs-manpages @@ -331,23 +331,12 @@ sub podman_man { @most_recent_flags = (); # As of PR #8292, all options are

and anchored if ($line =~ s/^\#{4}\s+//) { - # 2021-03: PR #9856: some (bleep) markdown processor converts - # double dashes to a single em-dash. We need to escape every - # instance with backslashes. This is anti-intuitive, and - # developers will naturally write --foo; try to catch that - # and warn with a helpful message. - if ($line =~ /--([a-z]+)/) { - warn "$ME: $subpath:$.: You probably need to backslash-escape '--$1' as '\\-\\-$1'\n"; - } - # If option has long and short form, long must come first. # This is a while-loop because there may be multiple long # option names, e.g. --net/--network - while ($line =~ s/^\*\*\\-\\-([a-z0-9-]+)\*\*(=\*[a-zA-Z0-9-]+\*)?(,\s+)?//g) { - # add -- to the flag name - my $flag = "--".$1; - $man{$flag} = 1; - push @most_recent_flags, $flag; + while ($line =~ s/^\*\*(--[a-z0-9-]+)\*\*(=\*[a-zA-Z0-9-]+\*)?(,\s+)?//g) { + $man{$1} = 1; + push @most_recent_flags, $1; } # Short form if ($line =~ s/^\*\*(-[a-zA-Z0-9])\*\*(=\*[a-zA-Z0-9-]+\*)?//g) { -- cgit v1.2.3-54-g00ecf