Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Port fix for #3867 from #3874 to 3.7.3 #3945

Merged
merged 4 commits into from Jun 20, 2022
Merged

Port fix for #3867 from #3874 to 3.7.3 #3945

merged 4 commits into from Jun 20, 2022

Conversation

infotexture
Copy link
Member

This PR ports the fix for #3867 that @chrispy-snps provided in #3874 to 3.7.3 (previously merged to develop in 0ca967d).

Per @jlacour31’s suggestion in #3867 (comment):

@jelovirt and @infotexture it seems that the pull request was merged into develop branch and not in hotfixes/3.7.1. So the fix is not available neither in DOT 3.7.1 nor 3.7.2. You should consider cherry picking this fix for a 3.7.3 and updating the release notes to remove the reference to this fix.

chrispy-snps and others added 4 commits June 17, 2022 22:09
@chrispy-snps @infotexture
implement suggested fix for #3867 from @raducoravu
b42edbc 
Signed-off-by: chrispy <chrispy@synopsys.com>
(cherry picked from commit 2792509)
@chrispy-snps @infotexture
add test to KeyrefModuleTest for nested-topic keyref fix
bbecb1d 
Signed-off-by: chrispy <chrispy@synopsys.com>
(cherry picked from commit 6d5baf5)
@jelovirt @infotexture
Simplify test asserts
c4e7b2e 
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
(cherry picked from commit e71f8df)
@jelovirt @infotexture
Clean URI handling
100f97e 
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
(cherry picked from commit e6bf635)
@infotexture infotexture added bug priority/medium Medium (or unknown) priority issue preprocess/keyref labels Jun 17, 2022
@infotexture infotexture self-assigned this Jun 17, 2022
@infotexture infotexture mentioned this pull request Jun 17, 2022
Closed
infotexture added a commit to dita-ot/docs that referenced this pull request Jun 17, 2022
@infotexture
Drop № 3867/3874 from 3.7.1 pending 3.7.3 release
b3a0788 
- dita-ot/dita-ot#3867 (comment)
- dita-ot/dita-ot#3874
- dita-ot/dita-ot#3945

Signed-off-by: Roger Sheen <roger@infotexture.net>
@jelovirt jelovirt merged commit 320be2c into hotfix/3.7.3 Jun 20, 2022
@jelovirt jelovirt added this to the 3.7.3 milestone Jun 20, 2022
@jelovirt jelovirt linked an issue Jun 20, 2022 that may be closed by this pull request
Child navigation links to nested topics are incorrect/missing if there is a <ph keyref/> #3867
Closed
@jelovirt jelovirt deleted the feature/port-pr-3874-to-v373 branch September 6, 2022 16:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jelovirt jelovirt jelovirt approved these changes

Assignees

@infotexture infotexture

Labels
bug preprocess/keyref priority/medium Medium (or unknown) priority issue
Projects
No open projects
3.7.3
Status: Done
Milestone
3.7.3
Development

Successfully merging this pull request may close these issues.

Child navigation links to nested topics are incorrect/missing if there is a <ph keyref/>
3 participants
@infotexture @jelovirt @chrispy-snps