fix(docs): restore operator changelog v4.md (backport #22609)#22639
Merged
critesjosh merged 3 commits intobackport-to-v4-next-stagingfrom Apr 17, 2026
Merged
fix(docs): restore operator changelog v4.md (backport #22609)#22639critesjosh merged 3 commits intobackport-to-v4-next-stagingfrom
critesjosh merged 3 commits intobackport-to-v4-next-stagingfrom
Conversation
… to sidebar (with conflicts) Cherry-pick of #22609 (merge commit cbb09bc) onto v4-next. Applied with -m 1 -Xno-renames. Conflicts + git rename-detection misfires to resolve in next commit: - version-v2.1.11-ignition/reference/changelog/v4.md: conflict (git mapped the v4.2.0/reference/changelog/v4.md patch here because version-v4.2.0/ does not exist on v4-next) - version-v2.1.11-ignition-sidebars.json: auto-merged from version-v4.2.0-sidebars.json — not a real target - version-v4.1.2/operators/reference/changelog/index.md: auto-merged from v4.2.0 — v4.2 does not yet have a versioned folder here - version-v4.1.2/operators/reference/changelog/v4.md: auto-merged link fix from v4.2.0 — v4.1.2 already points at the correct path Legitimate portions: docs-operate/reference/changelog/v4.md restore, docs-operate/operators/reference/changelog/index.md v4.2 entry, sidebars-operate.js v4.2 entry.
Restore version-v2.1.11-ignition/reference/changelog/v4.md to its pre-cherry-pick state. Git rename-detected version-v4.2.0/reference/ changelog/v4.md onto this path (version-v4.2.0 does not exist on v4-next), producing a conflict plus unwanted auto-merges. The v2.1.11-ignition snapshot must remain unchanged.
Adapt cherry-pick result for v4-next, which does not yet contain the v4.2.0 versioned snapshot nor the operator v4.2.md source file. - Revert misdirected rename targets in v4.1.2/operators/changelog/index.md and v2.1.11-ignition-sidebars.json (v4.2 entries point to files that do not exist on this branch). - Drop the v4.2 entries from docs-operate/operators/reference/changelog/ index.md and sidebars-operate.js for the same reason — including them would break the Docusaurus build. They should be added back when v4.2 infrastructure (#22581 / #22612) is backported. Kept: - docs-operate/reference/changelog/v4.md content restore (core fix) - v4.1.2/operators/reference/changelog/v4.md HA-guide link fix (the target file is high-availability.md on v4-next too, so the underscore link was already broken here).
AztecBot
added
ci-draft
critesjosh
approved these changes
Apr 17, 2026
critesjosh
merged commit 1c34bec
into
backport-to-v4-next-staging
20 of 26 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Backport of #22609 onto
v4-next.The upstream PR did two things:
v4.2.mdby adding it to the operator changelog index, thesidebars-operate.jssidebar, and theversion-v4.2.0/versioned snapshot.Only (1) applies to
v4-next. The v4.2.0 versioned folder andv4.2.mdsource file do not exist on this branch yet (PRs #22581 / #22612 have not been backported), so advertisingv4.2.mdwould break the Docusaurus build.3-commit structure
Per
.claude/claudebox/backport.md:cherry-pick: ... (with conflicts)— rawgit cherry-pick -m 1 -Xno-renames cbb09bcc85output. Git's rename detection misrouted the v4.2.0 patches ontoversion-v2.1.11-ignitionandversion-v4.1.2, producing a conflict plus unwanted auto-merges.fix: resolve cherry-pick conflicts— restoreversion-v2.1.11-ignition/reference/changelog/v4.mdto its pre-cherry-pick state. The conflict was caused by the misdirected rename, not by real content that belongs here.fix: adapt backport for v4-next (no v4.2.0 version yet)— revert the remaining rename-misfires, and drop the v4.2 entries fromdocs-operateindex.md +sidebars-operate.jsthat would reference the non-existentv4.2.md. Keep the HA-guide link fix (high_availability_sequencers→high-availability.md), which is valid on v4-next too.Net effect
Analysis: https://gist.github.com/AztecBot/8024d49bed623cf741c9fd64f72505b0
Test plan
yarn buildindocs/succeeds (no broken sidebar / broken-link errors).docs/docs-operate/reference/changelog/v4.mdrenders with the full v4.x migration content.docs-operate/operators/reference/changelog/index.md+sidebars-operate.jsafter chore(docs): cut versioned developer docs for v4.2.0 (mainnet) #22581 / docs: backfill v4.2.0 migration notes #22612 are backported to re-add v4.2 entries.ClaudeBox log: https://claudebox.work/s/c59bb40b529f1bc2?run=1