In ACPI debugging section:

- Respect trademarks for Microsoft and Windows
- Add and fix some tags for consistency

en_US.ISO8859-1/books/handbook/config/chapter.sgml

@@ -2726,11 +2726,11 @@ hw.acpi.s4bios: 0</screen>
 	  are the top priority to be fixed.  The first step is to
 	  isolate the steps to reproduce the panic (if possible)
 	  and get a backtrace.  Follow the advice for enabling
-	  <option>options DDB</option> and setting up a serial console
+	  <literal>options DDB</literal> and setting up a serial console
 	  (see <xref linkend="serialconsole-ddb">)
 	  or setting up a &man.dump.8; partition.  You can get a
 	  backtrace in <acronym>DDB</acronym> with
-	  <option>tr</option>.  If you have to handwrite the
+	  <literal>tr</literal>.  If you have to handwrite the
 	  backtrace, be sure to at least get the lowest five (5) and top
 	  five (5) lines in the trace.</para>
 
@@ -2744,10 +2744,10 @@ hw.acpi.s4bios: 0</screen>
       <sect3>
 	<title>System Powers Up After Suspend or Shutdown</title>
 	<para>First, try setting
-	  <option>hw.acpi.disable_on_poweroff=</option><quote>0</quote>
+	  <literal>hw.acpi.disable_on_poweroff="0"</literal>
 	  in &man.loader.conf.5;.  This keeps <acronym>ACPI</acronym>
 	  from disabling various events during the shutdown process.
-	  Some systems need this value set to <quote>1</quote> (the
+	  Some systems need this value set to <literal>1</literal> (the
 	  default) for the same reason.  This usually fixes
 	  the problem of a system powering up spontaneously after a
 	  suspend or poweroff.</para>
@@ -2810,13 +2810,13 @@ hw.acpi.s4bios: 0</screen>
 	<acronym>ACPI</acronym> work without any user intervention.  At
 	this point, however, we are still developing workarounds for
 	common mistakes made by the <acronym>BIOS</acronym> vendors.
-	The Microsoft interpreter (<filename>acpi.sys</filename> and
+	The &microsoft; interpreter (<filename>acpi.sys</filename> and
 	<filename>acpiec.sys</filename>) does not strictly check for
 	adherence to the standard, and thus many <acronym>BIOS</acronym>
-	vendors who only test <acronym>ACPI</acronym> under Windows
+	vendors who only test <acronym>ACPI</acronym> under &windows;
 	never fix their <acronym>ASL</acronym>.  We hope to continue to
 	identify and document exactly what non-standard behavior is
-	allowed by Microsoft's interpreter and replicate it so &os; can
+	allowed by &microsoft;'s interpreter and replicate it so &os; can
 	work without forcing users to fix the <acronym>ASL</acronym>.
 	As a workaround and to help us identify behavior, you can fix
 	the <acronym>ASL</acronym> manually.  If this works for you,
@@ -2832,10 +2832,10 @@ hw.acpi.s4bios: 0</screen>
 	<title>_OS dependencies</title>
 
 	<para>Some <acronym>AML</acronym> assumes the world consists of
-	  various Windows versions.  You can tell &os; to claim it is
+	  various &windows; versions.  You can tell &os; to claim it is
 	  any <acronym>OS</acronym> to see if this fixes problems you
 	  may have.  An easy way to override this is to set
-	  <option>hw.acpi.osname</option>=<quote>Windows 2001</quote>
+	  <literal>hw.acpi.osname="Windows 2001"</literal>
 	  in <filename>/boot/loader.conf</filename> or other similar
 	  strings you find in the <acronym>ASL</acronym>.</para>
       </sect3>
@@ -2903,9 +2903,9 @@ acpi_dsdt_name="/boot/DSDT.aml"</programlisting>
 	page.</para>
 
       <para>Debugging output is not enabled by default.  To enable it,
-	add <option>options ACPI_DEBUG</option> to your kernel config
+	add <literal>options ACPI_DEBUG</literal> to your kernel configuration file
 	if <acronym>ACPI</acronym> is compiled into the kernel.  You can
-	add <option>ACPI_DEBUG=1</option> to your
+	add <literal>ACPI_DEBUG=1</literal> to your
 	<filename>/etc/make.conf</filename> to enable it globally.  If
 	it is a module, you can recompile just your
 	<filename>acpi.ko</filename> module as follows:</para>