diff --git a/en_US.ISO8859-1/books/handbook/ports/chapter.sgml b/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
index 343660c462..251bdbfc1b 100644
--- a/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/ports/chapter.sgml
@@ -870,7 +870,7 @@ Receiving lsof_4.57D.freebsd.tar.gz (439860 bytes): 100%
 &prompt.root;</screen>
 
         <para>As you can see, the only difference is the line that tells
-	  you where the system is fetching the port from.</para>
+	  you where the system is fetching the port distfile from.</para>
 
 	<para>The ports system uses &man.fetch.1; to download the files, 
 	  which honours various environment variables, including 
@@ -984,7 +984,7 @@ Receiving lsof_4.57D.freebsd.tar.gz (439860 bytes): 100%
     <para>The following sections cover some of the more frequently asked
       questions about the ports collection and some basic troubleshooting
       techniques, and what do to if a <link
-      linkend="ports-broken">port is broken.</link></para>
+      linkend="ports-broken">port is broken</link>.</para>
 
     <sect2 id="ports-questions">
       <title>Some Questions and Answers</title>
@@ -1016,7 +1016,7 @@ Receiving lsof_4.57D.freebsd.tar.gz (439860 bytes): 100%
 	    <quote>add these two lines after line 468</quote>, or
 	    <quote>change line 197 to this</quote>.  They are also known
 	    as diffs because they are generated by the
-	    <application>diff</application> program.</para>
+	    &man.diff.1; program.</para>
 	  </answer>
 	</qandaentry>
 
@@ -1043,7 +1043,7 @@ Receiving lsof_4.57D.freebsd.tar.gz (439860 bytes): 100%
 
 	  <para>You can see what files are in them, or even extract
             them yourself by using the standard Unix
-	    <command>tar</command> program, which comes with the base
+	    &man.tar.1; program, which comes with the base
 	    FreeBSD system, like this:</para>
 
 	  <screen>&prompt.user; <userinput>tar tvzf foobar.tar.gz</userinput>
@@ -1071,7 +1071,7 @@ Receiving lsof_4.57D.freebsd.tar.gz (439860 bytes): 100%
 	<qandaentry>
 	  <question>
 	  <para>I did what you said for compiling ports from a CDROM and
-	    it worked great until I tried to install the kermit
+	    it worked great until I tried to install the <application>Kermit</application>
 	    port.</para>
 
 	  <screen>&prompt.root; <userinput>make install</userinput>
@@ -1083,10 +1083,10 @@ Receiving lsof_4.57D.freebsd.tar.gz (439860 bytes): 100%
 
 	  <answer>
 	  <para>As explained in the <link
-	    linkend="ports-cd">compiling ports from CDROM</link>
+	    linkend="ports-cd">installing ports from CDROM</link>
 	    section, some ports cannot be put on the CDROM set
-	    due to licensing restrictions.  Kermit is an example of
-	    that.  The licensing terms for kermit do not allow us to put
+	    due to licensing restrictions.  <application>Kermit</application> is an example of
+	    that.  The licensing terms for <application>Kermit</application> do not allow us to put
 	    the tarball for it on the CDROM, so you will have to fetch
 	    it by hand&mdash;sorry!</para>
 
@@ -1283,9 +1283,9 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ fetch</userinput></screen>
 	  <para>or by editing <filename>/etc/make.conf</filename>, but
 	    unfortunately not all ports respect this.  The surest way
 	    is to do <command>make configure</command>, then go into
-	    the source directory and inspect the Makefiles by hand, but
+	    the source directory and inspect the <filename>Makefile</filename>s by hand, but
 	    this can get tedious if the source has lots of
-	    sub-directories, each with their own Makefiles.</para>
+	    sub-directories, each with their own <filename>Makefile</filename>s.</para>
 
 	    <para>The default FreeBSD compiler options are quite conservative, 
 	      so if you have not changed them you should not have any
@@ -1367,7 +1367,7 @@ Information for grizzle-6.5:
 grizzle-6.5 - the combined piano tutorial, LOGO interpreter and shoot 'em up
 arcade game.</screen>
 
-	  <para>The version number can also be found using the 
+	  <para>The version number can be found either by using the 
 	    <command>pkg_info</command> or by typing:
 	    <command>ls /var/db/pkg</command></para>
 
@@ -1382,7 +1382,7 @@ arcade game.</screen>
 	  </question>
 
 	  <answer>
-	  <para>Yes, if you have installed the program and are fairly
+	  <para>Yes, if you have installed a program and are fairly
 	    certain you will not need the source again, there is no
 	    point in keeping it hanging around.  The surest way to do
 	    this is:</para>
@@ -1485,7 +1485,7 @@ arcade game.</screen>
 	  <para>At work, we are using <literal>frobble</literal>, which
 	    is in your ports collection, but we have altered it quite a
 	    bit to get it to do what we need.  Is there any way of making
-	    our own packages, so we can distribute it more easily around
+	    our own package, so we can distribute it more easily around
 	    our sites?</para>
 	  </question>
 
@@ -1537,7 +1537,7 @@ arcade game.</screen>
 	</listitem>
 
 	<listitem>
-	  <para>Gripe&mdash;<emphasis>by email only!</emphasis>  Send
+	  <para>Gripe&mdash;<emphasis>by email only</emphasis>!  Send
 	    email to the maintainer of the port first.  Type <command>make
 	    maintainer</command> or read the <filename>Makefile</filename>
 	    to find the maintainer's email address.  Remember to include
@@ -1546,16 +1546,16 @@ arcade game.</screen>
 	    <filename>Makefile</filename>) and the output leading up to the
 	    error when you email the maintainer.  If you do not get a
 	    response from the maintainer, you can use
-	    <command>send-pr</command> to submit a bug report.</para>
+	    &man.send-pr.1; to submit a bug report.</para>
 	</listitem>
 
 	<listitem>
-	  <para>Grab the package from an ftp site near you.  The
+	  <para>Grab the package from an FTP site near you.  The
 	    <quote>master</quote> package collection is on <hostid
 	    role="fqdn">ftp.FreeBSD.org</hostid> in the <ulink
 	    URL="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/packages/">packages
 	    directory</ulink>, but be sure to check your local mirror
-	    <emphasis>first!</emphasis>  These are more likely to work
+	    <emphasis>first</emphasis>!  These are more likely to work
 	    than trying to compile from source and are a lot faster as
 	    well.  Use the &man.pkg.add.1; program to install the package
 	    on your system.</para>