Merge branch 'main' into 2.5.0, resolving PRIVACY.md/README.md conflicts
Both files diverged from a shared base: main got doc content fixes without the oAI→Confab rename, while 2.5.0 got the same fixes plus the rename plus new feature docs (crash recovery, unsaved-changes prompt). 2.5.0's version is a strict superset, so conflicts resolved in its favor.
This commit is contained in: