diff --git a/postlfs/config/lsb-release.xml b/postlfs/config/lsb-release.xml
index e5cc60da39..e163d6e676 100644
--- a/postlfs/config/lsb-release.xml
+++ b/postlfs/config/lsb-release.xml
@@ -79,8 +79,7 @@
 
 <screen role="root"><userinput>install -v -m 644 lsb_release.1 /usr/share/man/man1 &amp;&amp;
 install -v -m 755 lsb_release   /usr/bin            &amp;&amp;
-install -v -m 755 help2man      /usr/bin
-</userinput></screen>
+install -v -m 755 help2man      /usr/bin</userinput></screen>
 
   </sect2>
 
diff --git a/x/installing/tuning-fontconfig.xml b/x/installing/tuning-fontconfig.xml
index 883134dd1e..041bff9e4f 100644
--- a/x/installing/tuning-fontconfig.xml
+++ b/x/installing/tuning-fontconfig.xml
@@ -271,24 +271,32 @@ cat > ~/.config/fontconfig/fonts.conf &lt;&lt; "EOF"
     protected, so turn it off to ensure any hinting information in the font
     itself is used, this is the default --&gt;
     &lt;edit mode="assign" name="autohint"&gt;  &lt;bool&gt;false&lt;/bool&gt;&lt;/edit&gt;
+
     &lt;!-- hinting is enabled by default --&gt;
     &lt;edit mode="assign" name="hinting"&gt;   &lt;bool&gt;true&lt;/bool&gt;&lt;/edit&gt;
+    
     &lt;!-- for the lcdfilter see http://www.spasche.net/files/lcdfiltering/ --&gt;
     &lt;edit mode="assign" name="lcdfilter"&gt; &lt;const&gt;lcddefault&lt;/const&gt;&lt;/edit&gt;
+    
     &lt;!-- options for hintstyle:
     hintfull: is supposed to give a crisp font that aligns well to the
     character-cell grid but at the cost of its proper shape.
+
     hintmedium: poorly documented, maybe a synonym for hintfull.
     hintslight is the default: - supposed to be more fuzzy but retains shape.
+    
     hintnone: seems to turn hinting off.
     The variations are marginal and results vary with different fonts --&gt;
     &lt;edit mode="assign" name="hintstyle"&gt; &lt;const&gt;hintslight&lt;/const&gt;&lt;/edit&gt;
+    
     &lt;!-- antialiasing is on by default and really helps for faint characters
     and also for 'xft:' fonts used in rxvt-unicode --&gt;
     &lt;edit mode="assign" name="antialias"&gt; &lt;bool&gt;true&lt;/bool&gt;&lt;/edit&gt;
+    
     &lt;!-- subpixels are usually rgb, see
     http://www.lagom.nl/lcd-test/subpixel.php --&gt;
     &lt;edit mode="assign" name="rgba"&gt;      &lt;const&gt;rgb&lt;/const&gt;&lt;/edit&gt;
+    
     &lt;!-- thanks to the Arch wiki for the lcd and subpixel links --&gt;
   &lt;/match&gt;
 
diff --git a/x/lib/atk.xml b/x/lib/atk.xml
index ce7d312508..7a0c1b0cf4 100644
--- a/x/lib/atk.xml
+++ b/x/lib/atk.xml
@@ -102,8 +102,11 @@
       the following commands:
     </para>
 
-<screen><userinput>meson --prefix /usr $PWD build &amp;&amp;
-ninja -C build</userinput></screen>
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+meson --prefix=/usr &amp;&amp;
+ninja</userinput></screen>
 
     <para>
       This package does not come with a testsuite.
@@ -113,7 +116,7 @@ ninja -C build</userinput></screen>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>ninja -C build install</userinput></screen>
+<screen role="root"><userinput>ninja install</userinput></screen>
 
   </sect2>
 
diff --git a/x/lib/pango.xml b/x/lib/pango.xml
index b80467f28b..fea59e5560 100644
--- a/x/lib/pango.xml
+++ b/x/lib/pango.xml
@@ -120,8 +120,7 @@ meson --prefix=/usr --sysconfdir=/etc .. &amp;&amp;
 ninja</userinput></screen>
 
     <para>
-      To test the results, issue: <command>make check</command>. The
-      test-layout test is known to fail.
+      To test the results, issue: <command>ninja test</command>. DThe
     </para>
 
     <para>