diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml
index a353cc1c5..311c2b12d 100644
--- a/chapter06/man-db.xml
+++ b/chapter06/man-db.xml
@@ -128,8 +128,7 @@ do
         shift
         iconv -f "$FROM" -t "$TO" "$FILE" >.tmp.iconv
         mv .tmp.iconv "$FILE"
-done
-</literal>
+done</literal>
 EOF
 install -m755 convert-mans  /usr/bin</userinput></screen>
 
@@ -152,9 +151,9 @@ install -m755 convert-mans  /usr/bin</userinput></screen>
     Man-DB does not understand man pages stored in UTF-8. And, for our
     purposes, Man-DB is preferable to Man as it works without extra
     configuration in any locale. Lastly, as of now, there is no fully-working
-    implementation of the RedHat convention. RedHat's groff is known to
-    misformat text.</para>
- 
+    implementation of the RedHat convention. RedHat's <command>groff</command>
+    is known to misformat text.</para>
+
     <para>The relationship between language codes and the expected encoding
     of manual pages is listed below. Man-DB automatically converts them to
     the locale encoding while viewing.</para>
@@ -298,12 +297,13 @@ cp -rv man? /usr/share/man/fr</userinput></screen>
     <para>If upstream distributes manual pages in UTF-8 (i.e., <quote>for
     RedHat</quote>) instead of the encoding listed in the table above, they
     have to be converted from UTF-8 to the encoding listed in the table before
-    installation. This can be achieved with convert-mans, e.g., Spanish manual
-    pages (<ulink url="http://ditec.um.es/~piernas/manpages-es/man-pages-es-1.55.tar.bz2"/>)
+    installation. This can be achieved with <command>convert-mans</command>,
+    e.g., Spanish manual pages (<ulink
+    url="http://ditec.um.es/~piernas/manpages-es/man-pages-es-1.55.tar.bz2"/>)
     can be installed with the following commands:</para>
 
 <screen role="nodump"><userinput>mv man7/iso_8859-7.7{,X}
-convert-mans UTF-8 ISO-8859-1 man?/*.? 
+convert-mans UTF-8 ISO-8859-1 man?/*.?
 mv man7/iso_8859-7.7{X,}
 make install</userinput></screen>