diff --git a/en_US.ISO8859-1/books/faq/book.xml b/en_US.ISO8859-1/books/faq/book.xml
index 532b818b12..eaab6c11a8 100644
--- a/en_US.ISO8859-1/books/faq/book.xml
+++ b/en_US.ISO8859-1/books/faq/book.xml
@@ -2964,8 +2964,8 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
 	    </listitem>
 
 	    <listitem>
-	      <para>You are not running &man.config.8; with the
-		<option>-g</option> option.</para>
+	      <para>You are not running &man.config.8; with
+		<option>-g</option>.</para>
 	    </listitem>
 	  </itemizedlist>
 
@@ -5425,9 +5425,8 @@ UserConfig&gt; <userinput>quit</userinput></screen>
 	    </listitem>
 
 	    <listitem>
-	      <para><keycode>117</keycode> &mdash; <keycap>Menu</keycap>
-		key, to the left of the right-hand <keycap>Ctrl</keycap>
-		key</para>
+	      <para><keycode>117</keycode> &mdash; <keycap>Menu</keycap>,
+		to the left of the right-hand <keycap>Ctrl</keycap></para>
 	    </listitem>
 	  </itemizedlist>
 
@@ -5438,11 +5437,11 @@ UserConfig&gt; <userinput>quit</userinput></screen>
 
 	  <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 <filename>~/.xmodmaprc</filename> and include the
+	    <command>xmodmap</command> commands in
+	    <filename>~/.xinitrc</filename> or, preferably, create
+	    a <filename>~/.xmodmaprc</filename> and include the
 	    <command>xmodmap</command> options, one per line, then add
-	    the following line to your
+	    the following line to
 	    <filename>~/.xinitrc</filename>:</para>
 
 	  <programlisting>xmodmap $HOME/.xmodmaprc</programlisting>
@@ -6442,8 +6441,8 @@ add 0 0 HISADDR</programlisting>
 	    <acronym>RD</acronym> light does not), the problem is with
 	    the remote end.  If <acronym>TD</acronym> does not flash,
 	    the problem is local.  With an internal modem, you will need
-	    to use the <literal>set server</literal> command in your
-	    <filename>ppp.conf</filename> file.  When the hang occurs,
+	    to use the <literal>set server</literal> command in
+	    <filename>ppp.conf</filename>.  When the hang occurs,
 	    connect to &man.ppp.8; using &man.pppctl.8;.  If your
 	    network connection suddenly revives (PPP was revived due to
 	    the activity on the diagnostic socket) or if you cannot
@@ -6544,9 +6543,8 @@ deny pred1 deflate deflate24 protocomp acfcomp shortseq vj</programlisting>
 	    use the <command>bt</command> or <command>where</command>
 	    commands to get a stack trace.  Save the output of your
 	    <application>gdb</application> session, and
-	    <quote>detach</quote> from the running process by the
-	    <command>quit</command> command of
-	    <application>gdb</application>.</para>
+	    <quote>detach</quote> from the running process by typing
+	    <command>quit</command>.</para>
 	</answer>
       </qandaentry>
 
@@ -6775,8 +6773,8 @@ set dfilter 3 permit 0/0 0/0</programlisting>
 	      url="&url.books.handbook;/smtp-dialup.html">using email with a dialup connection</ulink>
 	    in the &os; Handbook for details on how to create your own
 	    configuration file and what should go into it.  You may also
-	    want to add the following line to your
-	    <filename>.mc</filename> file:</para>
+	    want to add the following line to
+	    <filename>.mc</filename>:</para>
 
 	  <programlisting>define(`confDELIVERY_MODE', `d')dnl</programlisting>
 
@@ -6894,8 +6892,8 @@ ATDT1234567</programlisting>
       <qandaentry>
 	<question id="ppp-segfault-nocore">
 	  <para>Why does &man.ppp.8; get a <errorname>Segmentation
-	    fault</errorname>, but I see no <filename>ppp.core</filename>
-	    file?</para>
+	      fault</errorname>, but I see no
+	    <filename>ppp.core</filename></para>
 	</question>
 
 	<answer>