<p>
Maintainer is also responsible for testing in various possible permutations of
-the autoconf and scons build.
+the meson and scons build.
</p>
<h2>Cherry-picking and build/check testing</h2>
<p>
<strong>Note:</strong> If a patch in the current queue needs any additional
fix(es), then they should be squashed together. The commit messages and the
-<code>cherry picked from</code> tags must be preserved.
+"<code>cherry picked from</code>"-tags must be preserved.
</p>
<p>