diff --git a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
index 8903485068..6641912cc3 100644
--- a/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
@@ -420,10 +420,10 @@ MergeChanges /etc/ /var/named/etc/ /boot/device.hints</programlisting>
 		using the following commands:</para>
 
 	      <screen>&prompt.root; <userinput>mount /cdrom</userinput>
-&prompt.root; <userinput>cd /cdrom/X.Y-RELEASE/kernels</userinput>
+&prompt.root; <userinput>cd /cdrom/<replaceable>X.Y-RELEASE</replaceable>/kernels</userinput>
 &prompt.root; <userinput>./install.sh GENERIC</userinput></screen>
 
-	      <para>Replace <filename>X.Y-RELEASE</filename>
+	      <para>Replace <filename class="directory">X.Y-RELEASE</filename>
 		with the actual version of the release being used.
 		The <filename>GENERIC</filename> kernel will be
 		installed in <filename>/boot/GENERIC</filename> by
@@ -797,7 +797,7 @@ before running "/usr/sbin/freebsd-update install"</screen>
 	fetch a clean copy of the documentation sources from the
 	western US mirror using the HTTPS protocol:</para>
 
-      <screen>&prompt.root; <userinput>svn checkout https://svn0.us-west.FreeBSD.org/doc/head /usr/doc</userinput></screen>
+      <screen>&prompt.root; <userinput>svn checkout <replaceable>https://svn0.us-west.FreeBSD.org</replaceable>/doc/head /usr/doc</userinput></screen>
 
       <para>Select the closest mirror from the available
 	<link linkend="svn-mirrors">Subversion mirror
@@ -1109,7 +1109,7 @@ before running "/usr/sbin/freebsd-update install"</screen>
 	<note>
 	  <para>Packages use a format that differs from the
 	    corresponding port's name:
-	    <literal>lang-freebsd-doc</literal>,
+	    <literal><replaceable>lang</replaceable>-freebsd-doc</literal>,
 	    where <replaceable>lang</replaceable> is the short format
 	    of the language code, such as <literal>hu</literal> for
 	    Hungarian, or <literal>zh_cn</literal> for Simplified
@@ -1765,7 +1765,7 @@ Script done, &hellip;</screen>
 
 	<para>The general format of the command is as follows:</para>
 
-	<screen>&prompt.root; <userinput>make -x -DVARIABLE target</userinput></screen>
+	<screen>&prompt.root; <userinput>make -<replaceable>x</replaceable> -D<replaceable>VARIABLE</replaceable> <replaceable>target</replaceable></userinput></screen>
 
 	<para>In this example,
 	  <option>-<replaceable>x</replaceable></option> is an option
@@ -1779,7 +1779,7 @@ Script done, &hellip;</screen>
 	  in <filename>/etc/make.conf</filename>, and this provides
 	  another way of setting them.  For example:</para>
 
-	<screen>&prompt.root; <userinput>make -DNO_PROFILE target</userinput></screen>
+	<screen>&prompt.root; <userinput>make -DNO_PROFILE <replaceable>target</replaceable></userinput></screen>
 
 	<para>is another way of specifying that profiled libraries
 	  should not be built, and corresponds with the</para>
@@ -1801,7 +1801,7 @@ Script done, &hellip;</screen>
 	<para>Most of the time, no parameters need to be passed to
 	  &man.make.1; and the command looks like this:</para>
 
-	<screen>&prompt.root; <userinput>make target</userinput></screen>
+	<screen>&prompt.root; <userinput>make <replaceable>target</replaceable></userinput></screen>
 
 	<para>Where <replaceable>target</replaceable> is one of many
 	  build options.  The first target should always be
@@ -1908,11 +1908,11 @@ Script done, &hellip;</screen>
       <note>
 	<para>To build a custom kernel with an existing customized
 	  configuration file, use
-	  <literal>KERNCONF=MYKERNEL</literal>:</para>
+	  <literal>KERNCONF=<replaceable>MYKERNEL</replaceable></literal>:</para>
 
 	<screen>&prompt.root; <userinput>cd /usr/src</userinput>
-&prompt.root; <userinput>make buildkernel KERNCONF=MYKERNEL</userinput>
-&prompt.root; <userinput>make installkernel KERNCONF=MYKERNEL</userinput></screen>
+&prompt.root; <userinput>make buildkernel KERNCONF=<replaceable>MYKERNEL</replaceable></userinput>
+&prompt.root; <userinput>make installkernel KERNCONF=<replaceable>MYKERNEL</replaceable></userinput></screen>
 
       </note>
 
@@ -2472,7 +2472,7 @@ Building everything..
 	      <option>noatime</option>.</para>
 
 	    <para>The file system holding
-	      <filename>/usr/obj</filename> can be mounted or
+	      <filename class="directory">/usr/obj</filename> can be mounted or
 	      remounted with <option>async</option> so that disk
 	      writes happen asynchronously.  The write completes
 	      immediately, and the data is written to the disk a
@@ -2601,7 +2601,7 @@ Building everything..
 	should list them all in <varname>KERNCONF</varname>, listing
 	its own kernel first.  The build machine must have the kernel
 	configuration files for each machine in
-	<filename>/usr/src/sys/arch/conf</filename>
+	<filename class="directory">/usr/src/sys/<replaceable>arch</replaceable>/conf</filename>
 	if it is going to build their kernels.</para>
     </sect2>