Skip to content

Reconcile with policymaker; surface the four canonical term sets#12

Open
yesnet0 wants to merge 1 commit into
masterfrom
reconcile-with-policymaker
Open

Reconcile with policymaker; surface the four canonical term sets#12
yesnet0 wants to merge 1 commit into
masterfrom
reconcile-with-policymaker

Conversation

@yesnet0
Copy link
Copy Markdown
Member

@yesnet0 yesnet0 commented Apr 18, 2026

Summary

  • Restructures dioterms around the four canonical term families mirrored 1:1 with policymaker.disclose.io's gh-pages templates: terms/vdp/, terms/vdp-with-cvd/, terms/safe-harbor/, terms/simple-safe-harbor/ — each in en-US, ar, np-NP.
  • Adds two previously-missing templates: the plain VDP (without CVD) and the standalone full Safe Harbor (previously only embedded inside the VDP).
  • Relocates BBP to bbp/en-US.md as a fifth canonical (not part of the policymaker-aligned four; preserved for community use).
  • Moves the modular core-terms/ fragments folder to archive/core-terms/ to preserve history while surfacing the four canonicals at the top level.
  • Deletes /practices/ — the stubs never populated; operational-playbook content belongs on the disclose.io website.
  • All file moves use git mv to preserve blame.
  • Every canonical file byte-matches the corresponding policymaker template.

Layout after merge

terms/
  README.md              # explains the four-canonical layout
  languages.json         # supported-locale manifest (from policymaker)
  vdp/{en-US,ar,np-NP}.md
  vdp-with-cvd/{en-US,ar,np-NP}.md
  safe-harbor/{en-US,ar,np-NP}.md
  simple-safe-harbor/{en-US,ar,np-NP}.md
bbp/en-US.md             # 5th canonical (policymaker doesn't carry BBP)
regional/                # unchanged — jurisdictional variants
maturity/                # unchanged — diostatus levels 0-5
archive/core-terms/      # moved here from repo root

Coordination

Paired with disclose/website PR that bumps the submodule pointer and updates scripts/preprocess-framework.js. Merge this first.

Policymaker is treated as authoritative for term prose drift; dioterms is re-aligned where the two diverged. Future edits to the four canonicals should happen here first, with policymaker picking them up on its next release.

Test plan

  • Verify terms/languages.json content matches policymaker
  • Verify each of the 12 canonical files (4 × 3 locales) byte-matches disclose/policymaker@gh-pages:templates/disclose-io-<template>/<locale>.md
  • Confirm git blame preserved across the three renames (core-terms-vdp.md → terms/vdp-with-cvd/en-US.md, core-terms-bbp.md → bbp/en-US.md, simple-safeharbor/simple-safe-harbor.md → terms/simple-safe-harbor/en-US.md)
  • Confirm archive/core-terms/ carries blame from the original core-terms/ folder

🤖 Generated with Claude Code

Restructure dioterms so the four canonical templates served by
policymaker.disclose.io are obvious and one-click-discoverable in the
repo layout, adding the two templates that were previously missing
(plain VDP without CVD; standalone full Safe Harbor) and mirroring all
three policymaker locales (en-US, ar, np-NP) for each.

Layout:
- terms/{vdp,vdp-with-cvd,safe-harbor,simple-safe-harbor}/{en-US,ar,np-NP}.md
  - mirrors policymaker gh-pages templates 1:1 (byte-identical)
- bbp/en-US.md
  - preserved as a fifth canonical; policymaker does not (yet) carry it
- terms/README.md, terms/languages.json
  - explain the layout and policymaker relationship; declare supported locales
- regional/, maturity/
  - unchanged
- archive/core-terms/
  - modular section fragments folder relocated here

Moves (blame preserved via git mv):
- core-terms-vdp.md -> terms/vdp-with-cvd/en-US.md
  (the existing file already used {{disclosure_window}}, so it is the
  with-CVD variant; the plain VDP is newly added from policymaker)
- core-terms-bbp.md -> bbp/en-US.md
- simple-safeharbor/simple-safe-harbor.md -> terms/simple-safe-harbor/en-US.md
- core-terms/ -> archive/core-terms/

Removed:
- practices/ - the operational-playbook pillar. Stubs were never populated
  (all "Coming soon"); that material belongs on the disclose.io website,
  not in the terms repo. Git history preserves the stubs.

Updated: README, CHANGELOG, CODEOWNERS, metadata.yaml to reflect the new
layout. Policymaker is treated as authoritative for term prose; dioterms
is now re-aligned byte-for-byte so future edits can flow dioterms ->
policymaker rather than the other way around.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants