Skip to content

docs: backport #22649 — apiref links + stale include markers (v4-next)#22708

Merged
nventuro merged 2 commits into
backport-to-v4-next-stagingfrom
claudebox/backport-22649-v4-next
Apr 21, 2026
Merged

docs: backport #22649 — apiref links + stale include markers (v4-next)#22708
nventuro merged 2 commits into
backport-to-v4-next-stagingfrom
claudebox/backport-22649-v4-next

Conversation

@AztecBot

Copy link
Copy Markdown
Collaborator

Backport of #22649 to v4-next.

Original PR

#22649 — "docs: link to apiref, not gh, remove stale include code markers"
Swaps GitHub-file links for apiref pages and strips ~hundreds of // docs:start:* / // docs:end:* markers that no longer feed any #include_code macro (remnants of deleted tutorials).

Cherry-pick conflicts

The automatic cherry-pick produced 3 content conflicts and 37 modify/delete conflicts. Resolution follows .claude/claudebox/backport.md: commit 1 records the cherry-pick with conflict markers intact; commit 2 resolves them.

Content conflicts (3) — upstream renamed developer_versioned_docs/version-v4.1.0-rc.2/version-v4.2.0/; on v4-next only v4.1.0-rc.2 exists, so the files stay at the original path but the body of each conflict takes the upstream (apiref) side:

  • docs/developer_versioned_docs/version-v4.1.0-rc.2/docs/aztec-nr/framework-description/advanced/protocol_oracles.md
  • docs/developer_versioned_docs/version-v4.1.0-rc.2/docs/aztec-nr/testing_contracts.md
  • docs/examples/ts/recursive_verification/index.ts — kept import assert from "node:assert" (still used on line 118), dropped the stale // docs:end:imports marker.

Modify/delete conflicts (37)docs/examples/webapp-tutorial/* and docs/examples/solidity/example_swap/* were removed on v4-next but modified by #22649. Resolution: keep them deleted.

Sanity check

Grepped all #include_code references still live in docs-developers/ and developer_versioned_docs/ against the markers #22649 removed: every marker name that shows up in both lists still exists in the referenced source file after the backport, so no docs build should break.

Docs-only change — no compile step, no third "build fixes" commit needed.

ClaudeBox log: https://claudebox.work/s/3a184859f1383af3?run=1

nventuro and others added 2 commits April 21, 2026 19:13
…markers (#22649)

Cherry-picked d84d562 as-is. Conflict markers intact in:
- docs/developer_versioned_docs/version-v4.1.0-rc.2/docs/aztec-nr/framework-description/advanced/protocol_oracles.md
- docs/developer_versioned_docs/version-v4.1.0-rc.2/docs/aztec-nr/testing_contracts.md
- docs/examples/ts/recursive_verification/index.ts

Modify/delete conflicts (files removed on v4-next but modified upstream)
left as the upstream modified version in tree — will be resolved in the
next commit per .claude/claudebox/backport.md.
- Accept upstream apiref-link content in the two versioned docs files,
  keeping them at the v4.1.0-rc.2 path (v4-next has no v4.2.0 directory).
- Drop stale `// docs:end:imports` marker in recursive_verification
  index.ts, keeping the `assert` import which is still used.
- Delete the webapp-tutorial and solidity/example_swap example trees
  that were already removed on v4-next (they were re-added by the
  modify/delete side of the cherry-pick).
@AztecBot AztecBot added ci-draft Run CI on draft PRs. claudebox Owned by claudebox. it can push to this PR. labels Apr 21, 2026
@nventuro nventuro marked this pull request as ready for review April 21, 2026 20:38
@nventuro nventuro requested review from a team, LeilaWang and nventuro as code owners April 21, 2026 20:38
@nventuro nventuro enabled auto-merge April 21, 2026 20:39
@nventuro nventuro merged commit 4dc7fa1 into backport-to-v4-next-staging Apr 21, 2026
23 of 26 checks passed
@nventuro nventuro deleted the claudebox/backport-22649-v4-next branch April 21, 2026 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci-draft Run CI on draft PRs. claudebox Owned by claudebox. it can push to this PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants