diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2934094d2..8a7160245 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,7 +7,7 @@ Thanks for helping. The project is moving quickly, so the best contributions are Odysseus has two branches: - **`dev`** — where all PRs land. Things can be in flux here; the merge button gets used freely. -- **`main`** — what users run. Curated and tested by the maintainer. Fast-forwarded to a stable `dev` commit at each release. +- **`main`** — what users run. Curated and tested by the release's [Release Maintainer](docs/maintainers/testing-and-releases.md#release-ownership). Fast-forwarded to a stable `dev` commit at each release. **Open your PR against `dev`, not `main`.** The GitHub "base" dropdown defaults to `dev`. If you opened a PR against `main` by accident, click "Edit" on the PR and change the base — no rebase needed. diff --git a/docs/maintainers/changes-and-review.md b/docs/maintainers/changes-and-review.md index fdad31d23..664b2596a 100644 --- a/docs/maintainers/changes-and-review.md +++ b/docs/maintainers/changes-and-review.md @@ -43,7 +43,7 @@ A high-risk review should verify the threat or failure model, exact final commit ## Cross-area changes and CODEOWNERS -Touching multiple areas does **not** automatically require multiple approvals. Consult domain expertise when needed. CODEOWNERS helps identify reviewers and accountable contacts; it is not a blanket approval requirement by itself. See [issue #593](https://github.com/odysseus-dev/odysseus/issues/593) for the ongoing ownership map discussion. +Touching multiple areas does **not** automatically require multiple approvals. Consult domain expertise when needed. `.github/CODEOWNERS` currently contains no ownership rules; the per-area map is under discussion in [issue #593](https://github.com/odysseus-dev/odysseus/issues/593). Once populated, it helps identify reviewers and accountable contacts; it is not a blanket approval requirement by itself. ## Validation and UI evidence diff --git a/docs/maintainers/documentation.md b/docs/maintainers/documentation.md index 91bb5b919..36c88d81d 100644 --- a/docs/maintainers/documentation.md +++ b/docs/maintainers/documentation.md @@ -7,8 +7,9 @@ Repository Markdown is the canonical source for project documentation. A public | Location | Purpose | |---|---| | `/design` | Product intent, proposals, and accepted decisions (when those paths are used) | -| `/specs` | Technical contracts and invariants (when those paths are used) | -| `/docs` | User, developer, architecture, security, deployment, and maintainer guidance | +| `/specs` | Technical contracts and invariants | +| `/website` | User, setup, configuration, and deployment guidance (published as the docs site) | +| `/docs` | Developer, architecture, security, and maintainer guidance | | Root Markdown | Discoverable entry points and policies | Keep root documents easy to find: @@ -16,6 +17,7 @@ Keep root documents easy to find: - `README.md` - `CONTRIBUTING.md` - `SECURITY.md` +- `THREAT_MODEL.md` Not every named directory exists today; do not invent a parallel documentation store just to match this map. diff --git a/docs/maintainers/product-and-features.md b/docs/maintainers/product-and-features.md index b120bd806..d41055a7f 100644 --- a/docs/maintainers/product-and-features.md +++ b/docs/maintainers/product-and-features.md @@ -1,6 +1,6 @@ # Product and feature proposals -Pewds is the Product Owner for Odysseus and has final authority over product direction. Maintainers own technical feasibility, implementation, and safety. +Pewds ([@pewdiepie-archdaemon](https://github.com/pewdiepie-archdaemon)) is the Product Owner for Odysseus and has final authority over product direction. Maintainers own technical feasibility, implementation, and safety. ## Which changes require product approval? @@ -27,6 +27,8 @@ A Product Owner proposal is already product-approved; it is not automatically te ## Community or maintainer initiated +Community proposals start as a Feature Request issue. Check [ROADMAP.md](../../ROADMAP.md) and existing issues first; take early ideas to [Discussions](https://github.com/odysseus-dev/odysseus/discussions/categories/ideas). + ```text Feature proposal -> Product Owner accepts / rejects, where approval is required