Fix cannot, &microsoft;, and Sendmail.

Fix formatting for ZFS portion of FAQ.

Sponsored by:	iXsystems

1 files changed, 28 insertions, 55 deletions

diff --git a/en_US.ISO8859-1/books/faq/book.xml b/en_US.ISO8859-1/books/faq/book.xml
index 2c5fa33e36..929aed53c7 100644
--- a/en_US.ISO8859-1/books/faq/book.xml
+++ b/en_US.ISO8859-1/books/faq/book.xml
@@ -860,7 +860,7 @@
 		    <row>
 		      <entry><literal>rtf</literal></entry>
 
-		      <entry>Microsoft's Rich Text Format</entry>
+		      <entry>&microsoft;'s Rich Text Format</entry>
 		    </row>
 
 		    <row>
@@ -1177,17 +1177,11 @@
 
       <qandaentry>
 	<question xml:id="floppy-image-too-large">
-	  <para>What do I do if the images do not fit on a single
-	    disk?</para>
+	  <para>What do I do if the install image does not boot?</para>
 	</question>
 
 	<answer>
-	  <para>Common mistakes when preparing the boot media
-	    are:</para>
-
-	  <itemizedlist>
-	    <listitem>
-	      <para>Not downloading the image in
+	  <para>This can be caused by not downloading the image in
 		<emphasis>binary</emphasis> mode when using
 		<acronym>FTP</acronym>.</para>
 
@@ -1196,33 +1190,14 @@
 		end-of-line characters received to match the
 		conventions used by the client's system.  This will
 		almost invariably corrupt the boot image.  Check the
-		SHA-256 of the downloaded boot image: if it is not
+		SHA-256 checksum of the downloaded boot image: if it is not
 		<emphasis>exactly</emphasis> that on the server, then
 		the download process is suspect.</para>
 
-	      <para>To workaround: type <emphasis>binary</emphasis> at
+	      <para>When using a command line FTP client, type <emphasis>binary</emphasis> at
 		the FTP command prompt after getting connected to the
 		server and before starting the download of the
 		image.</para>
-	    </listitem>
-
-	    <listitem>
-	      <para>Using the DOS <command>copy</command> command or
-		equivalent GUI tool to transfer the boot image to
-		floppy.</para>
-
-	      <para>Programs like <command>copy</command> will not
-		work as the boot image has been created to be booted
-		into directly.  The image has the complete content of
-		the floppy, track for track, and is not meant to be
-		placed on the floppy as a regular file.
-		Transfer it to the floppy <quote>raw</quote>, using
-		<command>fdimage</command>
-		or <command>rawrite</command> as described in the <link
-		  xlink:href="&url.books.handbook;/install.html">installation
-		  guide to &os;</link>.</para>
-	    </listitem>
-	  </itemizedlist>
 	</answer>
       </qandaentry>
 
@@ -1244,15 +1219,13 @@
 
       <qandaentry>
 	<question xml:id="need-to-run">
-	  <para>What do I need to run &os;?</para>
+	  <para>What are the minimum requirements to run &os;?</para>
 	</question>
 
 	<answer>
 	  <para>&os; requires a 486 or better PC,
-	    64&nbsp;MB or more of RAM, and at least 1&nbsp;GB of hard
+	    64&nbsp;MB or more of RAM, and at least 1.1 GB of hard
 	    disk space.</para>
-
-	  <para>See also <xref linkend="hardware"/>.</para>
 	</answer>
       </qandaentry>
 
@@ -1311,7 +1284,7 @@
 
       <qandaentry>
 	<question xml:id="no-install-cdrom">
-	  <para>I booted from my ATAPI CD-ROM, but the install program
+	  <para>I booted from a CD, but the install program
 	    says no CD-ROM is found.  Where did it go?</para>
 	</question>
 
@@ -1760,7 +1733,7 @@
       <qandaset>
 	<qandaentry>
 	  <question xml:id="moused">
-	    <para>Is it possible to use a mouse in any way outside the
+	    <para>Is it possible to use a mouse outside the
 	      X Window system?</para>
 	  </question>
 
@@ -1928,7 +1901,7 @@ bindkey ^[[3~ delete-char # for xterm</programlisting>
 	    memory area between 3.5&nbsp;GB and 4&nbsp;GB for a
 	    special purpose (usually for PCI).  This address space is
 	    used to access PCI hardware.  As a result real, physical
-	    memory can not be accessed by that address space.</para>
+	    memory cannot be accessed by that address space.</para>
 
 	  <para>What happens to the memory that should appear in that
 	    location is hardware dependent.  Unfortunately,
@@ -2149,7 +2122,7 @@ bindkey ^[[3~ delete-char # for xterm</programlisting>
 
       <qandaentry>
 	<question xml:id="mail-loopback">
-	  <para>Why does <application>sendmail</application> give me
+	  <para>Why does <application>Sendmail</application> give me
 	    an error reading <errorname>mail loops back to
 	      myself</errorname>?</para>
 	</question>
@@ -2747,7 +2720,7 @@ kern.timecounter.hardware: TSC -&gt; i8254</screen>
 
       <qandaentry>
 	<question xml:id="convert-back-from-pkgng">
-	  <para>How can I convert from pkgng to the old package
+	  <para>Can I convert from pkgng to the old package
 	    tools?</para>
 	</question>
 
@@ -3281,7 +3254,7 @@ kern.sched.name: ULE</screen>
 	</question>
 
 	<answer>
-	  <para>This can not be accomplished with the standard boot manager
+	  <para>This cannot be accomplished with the standard boot manager
 	    without rewriting it.  There are a number of other boot
 	    managers in the <filename>sysutils</filename> category of the Ports
 	    Collection.</para>
@@ -3376,7 +3349,7 @@ kern.sched.name: ULE</screen>
 
       <qandaentry>
 	<question xml:id="burncd-isofs">
-	  <para>A CD burned under &os; can not be read
+	  <para>A CD burned under &os; cannot be read
 	    under any other operating system.  Why?</para>
 	</question>
 
@@ -3614,8 +3587,9 @@ kern.sched.name: ULE</screen>
 	</answer>
       </qandaentry>
     </qandaset>
+  </chapter>
 
-    <sect1 xml:id="all-about-zfs">
+  <chapter xml:id="all-about-zfs">
       <title>ZFS</title>
 
       <qandaset>
@@ -3716,7 +3690,7 @@ kern.sched.name: ULE</screen>
 
 	<qandaentry>
 	  <question xml:id="zpool-fully-full">
-	    <para>I can not delete or create files on my ZFS pool.
+	    <para>I cannot delete or create files on my ZFS pool.
 	      How can I fix this?</para>
 	  </question>
 
@@ -3766,7 +3740,6 @@ kern.sched.name: ULE</screen>
 	  </answer>
 	</qandaentry>
       </qandaset>
-    </sect1>
   </chapter>
 
   <chapter xml:id="admin">
@@ -4028,12 +4001,12 @@ options    SYSVMSG          # enable for messaging</programlisting>
       <qandaentry>
 	<question xml:id="sendmail-alternative">
 	  <para>What other mail-server software can I use instead of
-	    <application>sendmail</application>?</para>
+	    <application>Sendmail</application>?</para>
 	</question>
 
 	<answer>
 	  <para>The <link
-	      xlink:href="http://www.sendmail.org/"><application>sendmail</application></link>
+	      xlink:href="http://www.sendmail.org/"><application>Sendmail</application></link>
 	    server is the default mail-server software for &os;, but
 	    it can be replaced with another
 	    MTA installed from the Ports Collection.  Available ports
@@ -4084,7 +4057,7 @@ options    SYSVMSG          # enable for messaging</programlisting>
 	  </note>
 
 	  <note>
-	    <para>If the root partition can not be mounted from
+	    <para>If the root partition cannot be mounted from
 	      single-user mode, it is possible that the partitions are
 	      encrypted and it is impossible to mount them without the
 	      access keys.  For more information see the section
@@ -4255,7 +4228,7 @@ options    SYSVMSG          # enable for messaging</programlisting>
 
 	  <screen>&prompt.root; <userinput>sysctl kern.securelevel</userinput></screen>
 
-	  <para>The security level can not be lowered in multi-user mode, so boot
+	  <para>The security level cannot be lowered in multi-user mode, so boot
 	    to single-user mode to install the kernel, or change the
 	    security level in <filename>/etc/rc.conf</filename> then
 	    reboot.  See the &man.init.8; manual page for details on
@@ -4283,7 +4256,7 @@ options    SYSVMSG          # enable for messaging</programlisting>
 
 	  <screen>&prompt.root; <userinput>sysctl kern.securelevel</userinput></screen>
 
-	  <para>The security level can not be lowered in multi-user mode.  Either boot
+	  <para>The security level cannot be lowered in multi-user mode.  Either boot
 	    to single-user mode to change the date or change the
 	    security level in <filename>/etc/rc.conf</filename> and
 	    reboot.  See the &man.init.8; manual page for details on
@@ -5631,7 +5604,7 @@ Key F15        A        A        Menu Workplace Nop</programlisting>
 	    least some of the securelevel's protections are
 	    enabled.</para>
 
-	  <para>The securelevel of a running system can not be
+	  <para>The securelevel of a running system cannot be
 	    lowered as this would defeat its purpose.  If a task
 	    requires that the securelevel be
 	    non-positive, change the <varname>kern_securelevel</varname> and
@@ -5708,13 +5681,13 @@ Key F15        A        A        Menu Workplace Nop</programlisting>
 
       <qandaentry>
 	<question xml:id="sendmail-port-587">
-	  <para>The <application>sendmail</application> daemon is
+	  <para>The <application>Sendmail</application> daemon is
 	    listening on port 587 as well as the standard port 25!
 	    What is going on?</para>
 	</question>
 
 	<answer>
-	  <para>Recent versions of <application>sendmail</application>
+	  <para>Recent versions of <application>Sendmail</application>
 	    support a mail submission feature that runs over port 587.
 	    This is not yet widely supported, but is growing in
 	    popularity.</para>
@@ -6304,8 +6277,8 @@ set dfilter 3 permit 0/0 0/0</programlisting>
 
 	  <para>In the DNS case, try to determine what is
 	    actually trying to resolve a host name.  A lot of the
-	    time, &man.sendmail.8; is the culprit.  Make
-	    sure to configure <application>sendmail</application> not
+	    time, <application>Sendmail</application> is the culprit.  Make
+	    sure to configure <application>Sendmail</application> not
 	    to do any DNS lookups in its configuration file.  See the
 	    section on <link
 	      xlink:href="&url.books.handbook;/smtp-dialup.html">using
@@ -6316,7 +6289,7 @@ set dfilter 3 permit 0/0 0/0</programlisting>
 
 	  <programlisting>define(`confDELIVERY_MODE', `d')dnl</programlisting>
 
-	  <para>This will make <application>sendmail</application>
+	  <para>This will make <application>Sendmail</application>
 	    queue everything until the queue is run, usually,
 	    every 30 minutes, or until a <command>sendmail
 	      -q</command> is done, perhaps from