diff --git a/policy/tpa-rfc-80-debian-trixie-upgrade-schedule.md b/policy/tpa-rfc-80-debian-trixie-upgrade-schedule.md index 468ed145cfc5d4f0e250be3dd4a4f89f87d99674..3ab550249b67d431e141505452b3509b57935da5 100644 --- a/policy/tpa-rfc-80-debian-trixie-upgrade-schedule.md +++ b/policy/tpa-rfc-80-debian-trixie-upgrade-schedule.md @@ -58,13 +58,13 @@ assistance, and vice-versa. All service admins are affected by this change. If you have shell access on any TPA server, you want to read this announcement. -In the past, TPA has typically keeps a page detailing notable changes -and proposal like this one would link against the upstream release +In the past, TPA has typically kept a page detailing notable changes +and a proposal like this one would link against the upstream release notes. Unfortunately, at the time writing, upstream hasn't yet produced release notes (as we're still in testing). We're hoping the procedure will be fine-tuned by the time we're ready -to coordinate the second batch of updates, around May 20204, when we +to coordinate the second batch of updates, around May 2024, when we will send reminders to affected teams. ## Upgrade schedule @@ -110,7 +110,7 @@ details. ### Batch 1: low complexity, April-May 2025 -This is actually scheduled in two weeks: TPA boxes will be upgraded in +This is scheduled during two weeks: TPA boxes will be upgraded in the last week of April, and Tails in the first week of May. The idea is to start the upgrade long enough before the vacations to @@ -172,7 +172,7 @@ stone.tails.net In the [first batch of bookworm machines][], we ended up taking 20 minutes per machine, done in a single day, but warned that the second -batch took longer. +batch took longer. It's probably safe to estimate 20 hours (30 minutes per machine) for this work, in a single week.