Add meeting notes from the past 4 meetings

[debian-ctte.git] / 914897_merged_usr / ballot.md

diff --git a/914897_merged_usr/ballot.md b/914897_merged_usr/ballot.md
index e577d04e4c5ea55592d360be2dfcc0c4006bd38a..4ad4cdcc73dd96e323e344789f16b1578d611d1d 100644 (file)
--- a/914897_merged_usr/ballot.md
+++ b/914897_merged_usr/ballot.md
@@ -79,7 +79,7 @@ It can be summarized by the following table:
 
 The current state of buster is `weak`.
 
-=== DRAFT Resolution ===
+=== Resolution ===
 
 The Technical Committee resolves to decline to override the debootstrap maintainers.
 
@@ -87,10 +87,10 @@ Furthermore, using its §6.1.5 "Offering advice" power, the Technical Committee
 
 * W: `weak`:   both directory schemes are allowed, but packages should only be built on hosts with classical directory schemes (or in such chroots)
 
-* M: `middle`: both directory schemes are allowed, and packages (including official packages) can be built on hosts with either classical or "merged-`/usr`" directory schemes
+* M: `middle`: both directory schemes are allowed, and packages (including official packages) can be built on hosts with either classical or "merged `/usr`" directory schemes
 
-* H: `hard`:   both directory schemes are allowed, but packages should only be built on hosts with "merged-`/usr`" directory schemes (or in such chroots)
+* H: `hard`:   both directory schemes are allowed, but packages should only be built on hosts with "merged `/usr`" directory schemes (or in such chroots)
 
 * FD: Further Discussion
 
-=== End DRAFT Resolution ===
+=== End Resolution ===