docs: fix merge-conflict fallout + a fresh Contractions/Auto typo from the merge
Resolving the 5 branches (contractions/foreign/auto/quotes/hyphens) onto current main surfaced a few things beyond plain conflict markers: - docs/scheduler/coordinator.md had 'auto-noops' turned into the malformed 'autanoops' by the auto-hyphens batch -- fixed to 'autonoops'. - main had moved (new prose, some option renames) since the batches were generated against an older commit, so a handful of merge conflicts needed both sides combined (keep main's updated content, reapply the lint fix on top) rather than a plain pick-one resolution. - A few genuinely new Microsoft.Contractions hits had appeared in the moved-forward main and in content pulled in wholesale during conflict resolution -- fixed the 2 real ones (docs/integrations/forge.md, docs/turn-loop/claude-invocation.md). - The other 'new' Contractions hits vale reports now (docs/integrations/forge.md:281, docs/tools/forge.md:260, docs/tools/hivectl.md:239, docs/tools/swarmctl-cli.md:28, docs/web-ui/dashboard.md:457) are a side effect of the Foreign batch's own 'i.e.' -> 'that is' substitution: vale's Contractions rule can't tell 'that is' used as a copula (contractable) from 'that is' used as a parenthetical clarifier (not contractable, would break the sentence -- 'that's it raced the merge' isn't English). Left those alone; noted in the PR description. Final vale count on this branch: the only Microsoft.Contractions/ Foreign/Auto/Quotes/Hyphens hits left are the known legitimate skips (ALL-CAPS/bold emphasis, vale's own false positives, and this Foreign/Contractions interaction) -- verified with a fresh vale run.
This commit is contained in:
parent
3f41e7a09c
commit
ec9ee866db
3 changed files with 4 additions and 4 deletions
|
|
@ -5,7 +5,7 @@ swarm's persistent code-collaboration surface (issues, PRs, reviews,
|
|||
attachments). Configured via `services.hyperhive.swarm.forge.*` (what the
|
||||
forge IS to every hive — its package, names, ports, URLs) plus
|
||||
`services.hyperhive.deploy.forgejo.*` (what the host running it decides —
|
||||
how it is served, what it mirrors, where its host-local secrets sit).
|
||||
how it's served, what it mirrors, where its host-local secrets sit).
|
||||
Container
|
||||
shape, ROOT_URL / sub-domain routing, and operator-vs-in-cluster URL
|
||||
handling live in [`docs/networking/gateway.md`](../networking/gateway.md); this file owns the
|
||||
|
|
|
|||
Loading…
Reference in a new issue