diff --git a/chapter04/settingenviron.xml b/chapter04/settingenviron.xml
index ead407f65..f45f85ddb 100644
--- a/chapter04/settingenviron.xml
+++ b/chapter04/settingenviron.xml
@@ -93,8 +93,8 @@ EOF</userinput></screen>
   <para>Setting the user file-creation mask (umask) to 022 ensures that newly
   created files and directories are only writable by their owner, but are
   readable and executable by anyone (assuming default modes are used by the
-  <function>open(2)</function> system call, new files will end up with permission
-  mode 644 and directories with mode 755).</para>
+  <filename>open(2)</filename> system call, new files will end up with
+  permission mode 644 and directories with mode 755).</para>
       </listitem>
     </varlistentry>
 
diff --git a/chapter07/creatingdirs.xml b/chapter07/creatingdirs.xml
index a95f3bd57..0d7ed6c62 100644
--- a/chapter07/creatingdirs.xml
+++ b/chapter07/creatingdirs.xml
@@ -57,7 +57,7 @@ install -dv -m 1777 /tmp /var/tmp</userinput></screen>
   <filename class="directory">/tmp</filename> and <filename
   class="directory">/var/tmp</filename> directories, but cannot remove
   another user's files from them. The latter is prohibited by the so-called
-  <quote>sticky bit,</quote> the highest bit (1) in the 1777 bit mask.</para>
+  <quote>sticky bit</quote>, the highest bit (1) in the 1777 bit mask.</para>
 
   <sect2>
     <title>FHS Compliance Note</title>
diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index d76b83047..080b6900b 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -252,7 +252,7 @@ install -v -Dm644 ../nscd/nscd.service /usr/lib/systemd/system/nscd.service</use
     locales necessary for the optimal coverage of tests:</para>
 
 <screen role="nodump"><userinput remap="locale-test">mkdir -pv /usr/lib/locale
-localedef -i POSIX -f UTF-8 C.UTF-8 2> /dev/null || true
+localedef -i C -f UTF-8 C.UTF-8
 localedef -i cs_CZ -f UTF-8 cs_CZ.UTF-8
 localedef -i de_DE -f ISO-8859-1 de_DE
 localedef -i de_DE@euro -f ISO-8859-15 de_DE@euro
diff --git a/chapter08/openssl.xml b/chapter08/openssl.xml
index 6ab288f93..1ab51894e 100644
--- a/chapter08/openssl.xml
+++ b/chapter08/openssl.xml
@@ -227,7 +227,7 @@ rm -rf DESTDIR</userinput></screen>
             is a command-line tool for using the various cryptography functions
             of <application>OpenSSL</application>'s crypto library from the
             shell. It can be used for various functions which are documented in
-            <command>man 1 openssl</command>
+            <filename>openssl(1)</filename>
           </para>
           <indexterm zone="ch-system-openssl openssl-prog">
             <primary sortas="b-openssl">openssl</primary>
@@ -259,7 +259,7 @@ rm -rf DESTDIR</userinput></screen>
           <para>
             implements the Transport Layer Security (TLS v1) protocol.
             It provides a rich API, documentation
-            on which can be found by running <command>man 7 ssl</command>
+            on which can be found in <filename>ssl(7)</filename>
           </para>
           <indexterm zone="ch-system-openssl libssl">
             <primary sortas="c-libssl">libssl.so</primary>
diff --git a/chapter09/networkd.xml b/chapter09/networkd.xml
index 27f15e815..1ad7ec94c 100644
--- a/chapter09/networkd.xml
+++ b/chapter09/networkd.xml
@@ -113,14 +113,14 @@ Name=ether0</literal>
 EOF</userinput></screen>
 
           <para>
-             See the man page systemd.link(5) for more information.
+            See <filename>systemd.link(5)</filename> for more information.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            In /boot/grub/grub.cfg, pass the option net.ifnames=0 on the
-            kernel command line.
+            In /boot/grub/grub.cfg, pass the option
+            <option>net.ifnames=0</option> on the kernel command line.
           </para>
         </listitem>
       </itemizedlist>
diff --git a/chapter10/fstab.xml b/chapter10/fstab.xml
index ccf767ab6..eaac86b72 100644
--- a/chapter10/fstab.xml
+++ b/chapter10/fstab.xml
@@ -56,7 +56,7 @@ EOF</userinput></screen>
   class="partition">sda2</filename>, <filename
   class="partition">sda5</filename>, and <systemitem
   class="filesystem">ext4</systemitem>. For details on the six
-  fields in this file, see <command>man 5 fstab</command>.</para>
+  fields in this file, see <filename>fstab(5)</filename>.</para>
 
   <para>Filesystems with MS-DOS or Windows origin (i.e. vfat, ntfs, smbfs,
   cifs, iso9660, udf) need a special option, utf8, in order for non-ASCII