diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml
index 6b8bf5cda7..bd07c22539 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.sgml
@@ -7211,7 +7211,7 @@ bitmap_name="/boot/splash.pcx"</programlisting>
 
       <qandaentry>
         <question id="windows-keys">
-          <para>Can I use the &windows;
+          <para>Can I use the <keycap>Windows</keycap>
 	    keys on my keyboard in X?</para>
         </question>
 
@@ -7219,27 +7219,27 @@ bitmap_name="/boot/splash.pcx"</programlisting>
           <para>Yes. All you need to do is use &man.xmodmap.1; to define
             what function you wish them to perform.</para>
 
-          <para>Assuming all <quote>&windows;</quote> keyboards
+          <para>Assuming all <quote>Windows</quote> keyboards
             are standard then the keycodes for the 3 keys are</para>
 
           <itemizedlist>
             <listitem>
-              <para>115 - &windows; key, between
-		the left-hand Ctrl and Alt keys</para>
+              <para><keycode>115</keycode> &mdash; <keycap>Windows</keycap> key, between
+		the left-hand <keycap>Ctrl</keycap> and <keycap>Alt</keycap> keys</para>
             </listitem>
 
             <listitem>
-              <para>116 - &windows; key, to the
+              <para><keycode>116</keycode> &mdash; <keycap>Windows</keycap> key, to the
 		right of the <keycap>AltGr</keycap> key</para>
             </listitem>
 
             <listitem>
-              <para>117 - <keycap>Menu</keycap> key, to the left of
+              <para><keycode>117</keycode> &mdash; <keycap>Menu</keycap> key, to the left of
               the right-hand <keycap>Ctrl</keycap> key</para>
             </listitem>
           </itemizedlist>
 
-          <para>To have the left &windows; key print a comma,
+          <para>To have the left <keycap>Windows</keycap> key print a comma,
 	    try this.</para>
 
           <screen>&prompt.root; <userinput>xmodmap -e "keycode 115 = comma"</userinput></screen>
@@ -7247,7 +7247,7 @@ bitmap_name="/boot/splash.pcx"</programlisting>
           <para>You will probably have to re-start your window manager
             to see the result.</para>
 
-          <para>To have the &windows;
+          <para>To have the <keycap>Windows</keycap>
 	    key-mappings enabled automatically every time you start X either
 	    put the <command>xmodmap</command> commands in your
 	    <filename>~/.xinitrc</filename> file or, preferably, create a file
@@ -7273,7 +7273,7 @@ bitmap_name="/boot/splash.pcx"</programlisting>
 keycode 116 = F14
 keycode 117 = F15</programlisting>
 
-	  <para>If you use <command>fvwm2</command>, for example, you
+	  <para>If you use the <filename role="package">x11-wm/fvwm2</filename> port, for example, you
 	    could map the keys so that <keycap>F13</keycap> iconifies
 	    (or de-iconifies) the window the cursor is in,
 	    <keycap>F14</keycap> brings the window the cursor is in to