Align develop with main after the docs-site merge - #18
Merged
Conversation
Slides 11 and 12 were previously marked legacy-hidden and had never been published. Restoring them puts their content on the public docs site, and the "Structured Error Analysis" slide carried a real allocation map: two internal Slurm hostnames and the frontend's private address. Replace them with neutral placeholders in both the EN and CN decks. The slide is illustrating how an sflow run is diagnosed, so the exact host names and IP carry no explanatory value -- only the shape of the allocation and the timeline matter.
Docs site: language switch, Agent Skills nav, and CN intro deck
…ith-main # Conflicts: # docs-site/static/sflow_intro_zh.html
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
1 participant
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.
Back-merge of
mainintodevelopso the two branches agree on the intro decks.PR #17 took only the
docs-site/changes ontomainand added a redaction commit thatdevelopnever received. Without this,developstill carries the unredacted decks and thenext sync or merge would reintroduce them.
Net effect on develop
Six lines, in the two intro decks:
Nothing else changes.
git diff origin/develop -- ':!docs-site'is empty, so PR #15'ssrc/sflow, tests,docs/userand examples work is untouched, and everydocs-sitefile nowmatches
mainbyte for byte.Note on the conflict
sflow_intro_zh.htmlcame through as an add/add conflict: the file reached each branch by arename from
docs/developer/dev-notes/, once ondevelopand once via the cherry-pick onmain, so git saw two independent adds rather than a shared history. Resolved by takingmain's copy, which differs only by the redaction above.Merging
main(rather than the cherry-picked branch alone) also makesdevelopa superset ofmain, so the two cannot silently drift again.Verification
docs-sitetests pass; full versioned build succeeds atbaseUrl=/nv-sflow/.slurm-node-*or10.52.32.8any more.