diff --git a/en_US.ISO8859-1/books/handbook/config/chapter.sgml b/en_US.ISO8859-1/books/handbook/config/chapter.sgml
index 0846ac9369..88c929fd52 100644
--- a/en_US.ISO8859-1/books/handbook/config/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/config/chapter.sgml
@@ -2421,11 +2421,11 @@ device_probe_and_attach: cbb0 attach returned 12</screen>
 	    very large.  Generate a copy of your <acronym>ASL</acronym>
 	    by running this command:</para>
 
-	  <screen>&prompt.root; <userinput>acpidump -t -d &gt; $NAME-$SYSTEM.asl</userinput></screen>
+	  <screen>&prompt.root; <userinput>acpidump -t -d &gt; <replaceable>name</replaceable>-<replaceable>system</replaceable>.asl</userinput></screen>
 
 	  <para>(Substitute your login name for
-	    <filename>$NAME</filename> and manufacturer/model for
-	    <filename>$SYSTEM</filename>.  Example:
+	    <replaceable>name</replaceable> and manufacturer/model for
+	    <replaceable>system</replaceable>.  Example:
 	    <filename>njl-FooCo6000.asl</filename>)</para>
 	</listitem>
       </itemizedlist>
@@ -2515,11 +2515,11 @@ device_probe_and_attach: cbb0 attach returned 12</screen>
 	<screen>hw.acpi.supported_sleep_state: S3 S4 S5</screen>
 	<screen>hw.acpi.s4bios: 0</screen>
 
-	<para>This means that I can use <quote>acpiconf
-	  <option>-s</option></quote> to test <literal>S3</literal>,
+	<para>This means that I can use <command>acpiconf
+	  -s</command> to test <literal>S3</literal>,
 	  <literal>S4</literal><acronym>OS</acronym>, and
 	  <literal>S5</literal>.  If <option>s4bios</option> was one
-	  (1), I would have <literal>S4</literal><acronym>BIOS</acronym>
+	  (<literal>1</literal>), I would have <literal>S4</literal><acronym>BIOS</acronym>
 	  support instead of <literal>S4</literal>
 	  <acronym>OS</acronym>.</para>
 
@@ -2588,9 +2588,9 @@ device_probe_and_attach: cbb0 attach returned 12</screen>
 	  <acronym>SCI</acronym>.</para>
 
 	<para>Interrupt storms can be distinguished from lost interrupts
-	  by checking the output of <command>vmstat</command>
-	  <option>-i</option> and looking at the line that has
-	  <quote>acpi0</quote>.  If the counter is increasing at more
+	  by checking the output of <command>vmstat -i</command>
+	  and looking at the line that has
+	  <literal>acpi0</literal>.  If the counter is increasing at more
 	  than a couple per second, you have an interrupt storm.  If the
 	  system appears hung, try breaking to <acronym>DDB</acronym>
 	  (<keycombo action="simul"><keycap>CTRL</keycap>
@@ -2599,7 +2599,7 @@ device_probe_and_attach: cbb0 attach returned 12</screen>
 
 	<para>Your best hope when dealing with interrupt problems is to
 	  try disabling <acronym>APIC</acronym> support with
-	  <option>hint.apic.0.disabled=</option><quote>1</quote> in
+	  <literal>hint.apic.0.disabled="1"</literal> in
 	  <filename>loader.conf</filename>.</para>
       </sect3>
 
@@ -2752,7 +2752,7 @@ device_probe_and_attach: cbb0 attach returned 12</screen>
 	  filename for <command>iasl</command>.  You can load this
 	  instead of your <acronym>BIOS</acronym>'s buggy copy (which
 	  is still present in flash memory) by editing
-	  <filename role="directory">/boot/loader.conf</filename> as
+	  <filename>/boot/loader.conf</filename> as
 	  follows:</para>
 
 	<programlisting>acpi_dsdt_load="YES"
@@ -2791,8 +2791,8 @@ acpi_dsdt_name="/boot/DSDT.aml"</programlisting>
 	<filename>acpi.ko</filename> module as follows:</para>
 
       <screen>&prompt.root; <userinput>cd /sys/modules/acpi/acpi
-	&amp;&amp; make clean &amp;&amp; make
-	ACPI_DEBUG=1</userinput></screen>
+&amp;&amp; make clean &amp;&amp;
+make ACPI_DEBUG=1</userinput></screen>
 
       <para>Install <filename>acpi.ko</filename> in
 	<filename role="directory">/boot/kernel</filename> and add your