diff options
| author | Jeff King <peff@peff.net> | 2022-10-05 21:58:19 +0300 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2022-10-05 21:58:54 +0300 |
| commit | a7faa8ebd7293f89352ae7c43daac408a89be143 (patch) | |
| tree | eafd3f2613fc8bdb7fc7f1da6957e98c993cc64a | |
| parent | 94bf6b04d5250ff773f8d6401b3b0116da805657 (diff) | |
| parent | c3f88338802a4c4c04841175bb95491e9f6eaae4 (diff) | |
Merge remote-tracking branch 'origin' into update-ruby-3
This needed some light merge resolution, since the rubocop fixes touched
some nearby lines. Viewing the diff with "-w" helps, since the rubocop
changed reduced the indentation by one level.
| -rw-r--r-- | lib/tasks/index.rake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/tasks/index.rake b/lib/tasks/index.rake index f9b5d727..0e443542 100644 --- a/lib/tasks/index.rake +++ b/lib/tasks/index.rake @@ -225,10 +225,10 @@ def index_doc(filter_tags, doc_list, get_content) next unless cmd_file content = get_content.call(cmd_file.second) - section = content.match(/^git.*\(([1-9])\)/)[1] + section = content.match(/^[a-z0-9-]+\(([1-9])\)/)[1] match = content.match(/NAME\n----\n\S+ - (.*)$/) if match - "linkgit:#{cmd}[#{section}]::\n\t#{attr == 'deprecated' ? '(deprecated) ' : ''}#{match[1]}\n" + "linkgit:#{cmd}[#{section}]::\n\t#{attr == 'deprecated' ? '(deprecated) ' : ''}#{match[1]}\n" end end list.merge!("Documentation/cmds-#{category}.txt" => links.compact.join("\n")) |