diff --git a/en_US.ISO8859-1/articles/laptop/article.sgml b/en_US.ISO8859-1/articles/laptop/article.sgml
index 1505f84283..bda2b1830f 100644
--- a/en_US.ISO8859-1/articles/laptop/article.sgml
+++ b/en_US.ISO8859-1/articles/laptop/article.sgml
@@ -42,27 +42,27 @@
   <sect1>    
     <title>XFree86</title>
       
-    <para>Recent versions of XFree86 work with most display adapters
+    <para>Recent versions of <application>XFree86</application> work with most display adapters
       available on laptops these days.  Acceleration may not be
       supported, but a generic SVGA configuration should work.</para>
 
     <para>Check your laptop documentation for which card you have,
-      and check in the XFree86 documentation (or setup program) 
+      and check in the <application>XFree86</application> documentation (or setup program) 
       to see whether it is specifically supported.  If it is not, use
       a generic device (do not go for a name which just looks
-      similar).  In XFree86 version 4, you can try your luck
+      similar).  In <application>XFree86</application> version 4, you can try your luck
       with the command <userinput>XFree86 -configure</userinput>
       which auto-detects a lot of configurations.</para>
 
     <para>The problem often is configuring the monitor.  Common
-      resources for XFree86 focus on CRT monitors; getting a
+      resources for <application>XFree86</application> focus on CRT monitors; getting a
       suitable modeline for an LCD display may be tricky.  You may
       be lucky and not need to specify a modeline, or just need to
       specify suitable HorizSync and VertRefresh ranges.  If that
       does not work, the best option is to check web resources
       devoted to configuring X on laptops (these are often
       linux-oriented sites but it does not matter because both systems
-      use XFree86) and copy a modeline posted by someone for similar 
+      use <application>XFree86</application>) and copy a modeline posted by someone for similar 
       hardware.</para>
 
     <para>Most laptops come with two buttons on their pointing
@@ -75,7 +75,7 @@
       Option "Emulate3Buttons"
     </programlisting>
 
-    <para>in the XF86Config file in the <literal>InputDevice</literal> 
+    <para>in the <filename>XF86Config</filename> file in the <literal>InputDevice</literal> 
       section (for XFree86 version 4; for version 3, put just the line 
       <literal>Emulate3Buttons</literal>, without the quotes, in the 
       <literal>Pointer</literal> section.)</para>
@@ -103,7 +103,7 @@
 
     <para> Most laptops come with PCMCIA (also called PC Card)
       slots; these are supported fine under FreeBSD.  Look through
-      your boot-up messages (using <command>dmesg</command>) and see whether these were
+      your boot-up messages (using &man.dmesg.8;) and see whether these were
       detected correctly (they should appear as
       <devicename>pccard0</devicename>,
       <devicename>pccard1</devicename> etc on devices like
@@ -131,7 +131,7 @@
       allowed values (listed in the manual page &man.pccardc.8;).
     </para>
 
-    <para>If it is not running already, start the <command>pccardd</command> daemon.
+    <para>If it is not running already, start the &man.pccardd.8; daemon.
       (To enable it at boot time, add
       <programlisting>pccard_enable="YES"</programlisting> to
       <filename>/etc/rc.conf</filename>.)  Now your cards should be
@@ -157,10 +157,10 @@
       power management support (<literal>device apm0</literal>) or
       add the option <literal>enable apm0</literal> to 
       <filename>/boot/loader.conf</filename>, and
-      also enable the apm daemon at boot time (line
+      also enable the &man.apmd.8; daemon at boot time (line
       <literal>apm_enable="YES"</literal> in
       <filename>/etc/rc.conf</filename>).  The apm commands are
-      listed in the &man.apm.8; manpage.  For instance,
+      listed in the &man.apm.8; manual page.  For instance,
       <command>apm -b</command> gives you battery status (or 255 if
       not supported), <command>apm -Z</command> puts the laptop on
       standby, <command>apm -z</command> (or zzz) suspends it.  To
@@ -170,10 +170,10 @@
       in console mode but not under X (that is, the screen does not
       come on again; in that case, switch to a virtual console
       (using Ctrl-Alt-F1 or another function key) and then execute
-      the apm command.
+      the &man.apm.8; command.
     </para>
 
-    <para>The X window system (XFree86) also includes display power
+    <para>The X window system (<application>XFree86</application>) also includes display power
       management (look at the &man.xset.1; manual page, and search for
       <quote>dpms</quote> there).  You may want to investigate this.  However, this, 
       too, works inconsistently on laptops: it