diff --git a/chapter04/settingenviron.xml b/chapter04/settingenviron.xml
index 61a655655..13a8a0437 100644
--- a/chapter04/settingenviron.xml
+++ b/chapter04/settingenviron.xml
@@ -79,8 +79,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 e2faa08da..c96d9c5b8 100644
--- a/chapter07/creatingdirs.xml
+++ b/chapter07/creatingdirs.xml
@@ -54,7 +54,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/openssl.xml b/chapter08/openssl.xml
index 25295f056..efc909627 100644
--- a/chapter08/openssl.xml
+++ b/chapter08/openssl.xml
@@ -163,7 +163,7 @@ make MANSUFFIX=ssl install</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>
@@ -195,7 +195,7 @@ make MANSUFFIX=ssl install</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