From bcad2fcf04a96e71677a8b64bc8d7fc50b0d9327 Mon Sep 17 00:00:00 2001 From: Didier Raboud <odyx@debian.org> Date: Mon, 4 Feb 2019 14:24:15 +0000 Subject: [PATCH] Fix table formatting, and a typo --- 914897_merged_usr/ballot.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/914897_merged_usr/ballot.md b/914897_merged_usr/ballot.md index ccc30f8..d618d95 100644 --- a/914897_merged_usr/ballot.md +++ b/914897_merged_usr/ballot.md @@ -54,7 +54,7 @@ Various valid long-term desireable situations coexist, and while discussing imme These are the five possible situations at the time of bullseye (buster + 1): -* `none`: "merged `/usr`" has been happened +* `none`: "merged `/usr`" has been reverted * `weak`: both directory schemes are allowed, packages only built on classical hosts * `hard`: both directory schemes are allowed, packages can be built anywhere * `all` : only "merged `/usr`" directory schemes are allowed, packages only built on "merged `/usr`" hosts @@ -62,6 +62,7 @@ These are the five possible situations at the time of bullseye (buster + 1): It can be summarized by the following table: +``` | | Host types that are allowed | Are merged-/usr | Official packages are built on | Packages built on ⦠can break on the other | | Codename | classical hosts | merged-/usr hosts | symlinks allowed | classical hosts | merged-/usr hosts | classical hosts | merged-/usr hosts | |----------|-----------------|-------------------|------------------|â----------------|-------------------|---------------------|----------------------| @@ -70,6 +71,7 @@ It can be summarized by the following table: | hard | yes | yes | yes | yes | yes | no | no | | all | no | yes | yes | no | yes | yes | no | | full | no | yes | no | no | yes | yes | yes | +``` ## Immediate actions -- 2.39.5