Skip to content

Support wildcard includes for upgrade notes to avoid merge conflicts - #1704

Merged
cmouse merged 5 commits into
dovecot:mainfrom
sirainen:upgrade-include-wildcard
Oct 24, 2026
Merged

cmouse merged 5 commits into
dovecot:mainfrom
sirainen:upgrade-include-wildcard

Conversation

@sirainen

Copy link
Copy Markdown
Contributor

DOV-10058

<!-- @include: dir/prefix-*.inc --> is expanded to include all the
matching files sorted by name. This allows each change to add its own
file instead of modifying the same lines in the including page, which
keeps conflicting between branches.

A wildcard matching no files is a build error, since VitePress would
otherwise silently leave the include out.
The other 2.4.6 includes with multiple paragraphs have their heading in
the include file. No functional change.
A list item included after a section would be shown as part of that
section, so the wildcard includes need to keep them apart. No functional
change.
All the list items are now before the sections. Previously some of them
were shown as part of the preceding section.
@cmouse
cmouse merged commit d23cfc8 into dovecot:main Oct 24, 2026
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants