diff --git a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
index 71124df6ba..c4c4c24ee4 100644
--- a/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml
@@ -1746,7 +1746,7 @@ nis_client_enable="YES"</programlisting>
 	<para>To prevent specified users from logging on to a system,
 	  even if they are present in the
 	  <acronym>NIS</acronym> database, use <command>vipw</command>
-	  to add <literal>-username</literal> with the correct number
+	  to add <literal>-<replaceable>username</replaceable></literal> with the correct number
 	  of colons towards the end of
 	  <filename>/etc/master.passwd</filename> on the client,
 	  where <replaceable>username</replaceable> is the username of
@@ -2024,7 +2024,7 @@ ellington&prompt.user; <userinput>ypcat -k netgroup.byuser</userinput></screen>
 	<literal>~</literal> function of the shell and all routines
 	which convert between user names and numerical user IDs.  In
 	other words,
-	<command>cd ~user</command> will
+	<command>cd ~<replaceable>user</replaceable></command> will
 	not work, <command>ls -l</command> will show the numerical ID
 	instead of the username, and <command>find . -user joe
 	  -print</command> will fail with the message
@@ -2501,7 +2501,7 @@ cn: Manager</programlisting>
       <para>To import this datafile, issue the following command,
 	assuming the file is <filename>import.ldif</filename>:</para>
 
-      <screen>&prompt.root; <userinput>ldapadd -Z -D "cn=Manager,dc=example,dc=com" -W -f import.ldif</userinput></screen>
+      <screen>&prompt.root; <userinput>ldapadd -Z -D "cn=Manager,dc=example,dc=com" -W -f <replaceable>import.ldif</replaceable></userinput></screen>
 
       <para>There will be a request for the password specified
 	earlier, and the output should look like this:</para>
@@ -2707,7 +2707,7 @@ result: 0 Success
 	</listitem>
 
 	<listitem>
-	  <para><filename>/var/db/dhclient.leases.interface</filename></para>
+	  <para><filename>/var/db/dhclient.leases.<replaceable>interface</replaceable></filename></para>
 
 	  <para>The <acronym>DHCP</acronym> client keeps a database of
 	    valid leases in this file, which is written as a log and
@@ -3220,7 +3220,7 @@ dhcpd_ifaces="dc0"</programlisting>
 	<filename>/etc/namedb/named.conf</filename> that are beyond
 	the scope of this document.  Other startup options
 	for <application>named</application> on &os; can be found in
-	the <literal>named_*</literal>
+	the <literal>named_<replaceable>*</replaceable></literal>
 	flags in <filename>/etc/defaults/rc.conf</filename> and in
 	&man.rc.conf.5;.  The
 	<xref linkend="configtuning-rcd"/> section is also a good
@@ -3637,7 +3637,7 @@ www             IN      CNAME   example.org.</programlisting>
 	  an exact hostname, whereas everything without a trailing
 	  <quote>.</quote> is relative to the origin.  For example,
 	  <literal>ns1</literal> is translated into
-	  <literal>ns1.example.org.</literal></para>
+	  <literal>ns1.<replaceable>example.org.</replaceable></literal></para>
 
 	<para>The format of a zone file follows:</para>
 
@@ -4032,7 +4032,7 @@ dnssec-validation yes;</programlisting>
 	  will contain the <literal>AD</literal> flag to indicate the
 	  data was authenticated.  Running a query such as</para>
 
-	<screen>&prompt.user; <userinput>dig @resolver +dnssec se ds </userinput></screen>
+	<screen>&prompt.user; <userinput>dig @<replaceable>resolver</replaceable> +dnssec se ds </userinput></screen>
 
 	<para>should return the <acronym>DS</acronym>
 	  <acronym>RR</acronym> for the <literal>.se</literal> zone.
@@ -4379,7 +4379,7 @@ $include Kexample.com.+005+nnnnn.ZSK.key    ; ZSK</programlisting>
 
       <para>In &os;, the main <application>Apache HTTP
 	  Server</application> configuration file is installed as
-	<filename>/usr/local/etc/apache2x/httpd.conf</filename>.
+	<filename>/usr/local/etc/apache2<replaceable>x</replaceable>/httpd.conf</filename>.
 	This ASCII text file begins comment lines with the
 	<literal>#</literal>.  The most frequently modified directives
 	are:</para>
@@ -4394,7 +4394,7 @@ $include Kexample.com.+005+nnnnn.ZSK.key    ; ZSK</programlisting>
 	      Binaries are stored in the <filename>bin</filename> and
 	      <filename>sbin</filename> subdirectories of the server
 	      root, and configuration files are stored in
-	      <filename>etc/apache2x</filename>.</para>
+	      <filename class="directory">etc/apache2<replaceable>x</replaceable></filename>.</para>
 	  </listitem>
 	</varlistentry>
 
@@ -4421,7 +4421,7 @@ $include Kexample.com.+005+nnnnn.ZSK.key    ; ZSK</programlisting>
 
 	<varlistentry>
 	  <term><literal>DocumentRoot
-	    "/usr/local/www/apache2x/data"</literal></term>
+	    "/usr/local/www/apache2<replaceable>x</replaceable>/data"</literal></term>
 
 	  <listitem>
 	    <para>The directory
@@ -4485,7 +4485,7 @@ $include Kexample.com.+005+nnnnn.ZSK.key    ; ZSK</programlisting>
       <screen>&prompt.root; <userinput>service apache24 start</userinput></screen>
 
       <para>The <command>httpd</command> service can be tested by
-	entering <literal>http://localhost</literal>
+	entering <literal>http://<replaceable>localhost</replaceable></literal>
 	in a web browser, replacing
 	<replaceable>localhost</replaceable> with the fully-qualified
 	domain name of the machine running <command>httpd</command>,
@@ -5140,7 +5140,7 @@ DocumentRoot /www/someotherdomain.tld
 	    <literal>tdbsam</literal>, and the following command
 	    should be used to add user accounts:</para>
 
-	  <screen>&prompt.root; <userinput>pdbedit -a -u username</userinput></screen>
+	  <screen>&prompt.root; <userinput>pdbedit -a -u <replaceable>username</replaceable></userinput></screen>
 	</note>
 
 	<para>Please see the <link
@@ -5543,7 +5543,7 @@ syslogd_flags="-s -v -v"</programlisting>
 	network, use &man.logger.1; on the client to send a message to
 	<application>syslogd</application>:</para>
 
-      <screen>&prompt.root; <userinput>logger "Test message from logclient"</userinput></screen>
+      <screen>&prompt.root; <userinput>logger "<replaceable>Test message from logclient</replaceable>"</userinput></screen>
 
       <para>This message should now exist both in
 	<filename>/var/log/messages</filename> on the client and