Index: chapter.xml
===================================================================
--- chapter.xml
+++ chapter.xml
@@ -71,7 +71,7 @@
       <step>
 	<para>Unpack the software from its distribution format.  This
 	  is typically a tarball compressed with &man.compress.1;,
-	  &man.gzip.1;, or &man.bzip2.1;.</para>
+	  &man.gzip.1;, &man.bzip2.1; &man.xz.1;, or similar program.</para>
       </step>
 
       <step>
@@ -257,7 +259,7 @@
 	</indexterm>
 
 	<para xml:id="pkg-search">To search the binary package
-	  repository for an application:</para>
+	  repository for an application, for instance, Subversion:</para>
 
 	<screen>&prompt.root; <userinput>pkg search <replaceable>subversion</replaceable></userinput>
 git-subversion-<replaceable>1.9.2</replaceable>
@@ -401,7 +403,7 @@
       faster and easier.</para>
 
     <para><application>pkg</application> is not a replacement for
-      port management tools like
+      port management tools such as
       <package>ports-mgmt/portmaster</package> or
       <package>ports-mgmt/portupgrade</package>.  These tools can be
       used to install third-party software from both binary packages
@@ -415,13 +417,14 @@
 
       <para>&os; includes a bootstrap utility which can be used to
 	download and install <application>pkg</application>, along
-	with its manual pages.</para>
+	with its manual pages.  This utility is designed to work
+	with most versions of &os;.</para>
 
       <para>To bootstrap the system, run:</para>
 
       <screen>&prompt.root; <userinput>/usr/sbin/pkg</userinput></screen>
 
-      <para>For earlier &os; versions,
+      <para>If that does not work,
 	<application>pkg</application> must instead be installed
 	from the Ports Collection or as a binary package.</para>
 
@@ -469,7 +472,8 @@
 
       <programlisting>WITH_PKGNG=	yes</programlisting>
 
-      <para>By default <application>pkg</application> uses the &os;
+      <para>By default, <application>pkg</application> uses the
+	repository on the &os;
 	package mirrors.  For information about building a custom
 	package repository, see <xref
 	  linkend="ports-poudriere"/></para>
@@ -1152,8 +1178,8 @@
 
 	<para><package>ports-mgmt/portmaster</package> is a very
 	  small utility for upgrading installed ports.
-	  It is designed to use the tools installed with &os;
-	  without depending on other ports or databases.
+	  It is designed to use the tools installed with the &os;
+	  base system, without depending on other ports or databases.
 	  To install this utility
 	  as a port:</para>
 
@@ -1327,8 +1372,8 @@
 
       <para>In addition, a lot of out-dated source distribution files
 	will collect in <filename>/usr/ports/distfiles</filename> over
-	time.  If <application>Portupgrade</application> is installed,
-	this command will delete all the distfiles that are no longer
+	time.  To use <application>Portupgrade</application> to
+	delete all the distfiles that are no longer
 	referenced by any ports:</para>
 
       <screen>&prompt.root; <userinput>portsclean -D</userinput></screen>
@@ -1347,8 +1392,8 @@
       <para>By default, this command is interactive and will prompt
 	the user to confirm if a distfile should be deleted.</para>
 
-      <para>In addition to these commands, the
-	<package>ports-mgmt/pkg_cutleaves</package> package or port
+      <para>In addition to these commands,
+	<package>ports-mgmt/pkg_cutleaves</package>
 	automates the task of removing installed ports that are no
 	longer needed.</para>
     </sect2>
@@ -1395,7 +1440,7 @@
     <para>The number of processor cores detected is used to define how
       many builds should run in parallel.  Supply enough virtual
       memory, either with <acronym>RAM</acronym> or swap space.  If
-      virtual memory runs out, compiling jails will stop and be torn
+      virtual memory runs out, the jails used for compiling will stop and be torn
       down, resulting in weird error messages.</para>
 
     <sect2 xml:id="poudriere-initialization">
@@ -1496,15 +1541,15 @@
 
       <screen>&prompt.root; <userinput>poudriere bulk -j <replaceable>10amd64</replaceable> -p <replaceable>local</replaceable> -z <replaceable>workstation</replaceable> -f <replaceable>10amd64-local-workstation-pkglist</replaceable></userinput></screen>
 
-      <para><keycombo
+      <para>While running, <keycombo
 	  action="simul"><keycap>Ctrl</keycap><keycap>t</keycap></keycombo>
-	displays the current state of the build.
+	will display the current state of the build.
 	<application>Poudriere</application> also builds files in
 	<filename>/poudriere/logs/bulk/<replaceable>jailname</replaceable></filename>
 	that can be used with a web server to display build
 	information.</para>
 
-      <para>Packages are now available for
+      <para>After completion, the packages are now available for
 	installation from the <application>poudriere</application>
 	repository.</para>
 
@@ -1530,10 +1575,10 @@
 }</screen>
 
       <para>Usually it is easiest to serve a poudriere repository to
-	the client machines via HTTP.  Setup a webserver to serve up
+	the client machines via HTTP.  Set up a webserver to serve up
 	the package directory, usually something like:
-	<filename>/usr/local/poudriere/data/packages/<replaceable>10amd64</replaceable></filename>.
-	Where <filename>10amd64</filename> is the name of the
+	<filename>/usr/local/poudriere/data/packages/<replaceable>10amd64</replaceable></filename>,
+	where <filename>10amd64</filename> is the name of the
 	build.</para>
 
       <para>If the URL to the package repository is:
@@ -1562,7 +1607,7 @@
       <listitem>
 	<para>Most applications install at least one default
 	  configuration file in <filename>/usr/local/etc</filename>.
-	  In the case where an application has a large number of
+	  In some cases where an application has a large number of
 	  configuration files, a subdirectory will be created to hold
 	  them.  Often, sample configuration files are installed which
 	  end with a suffix such as <filename>.sample</filename>.  The
@@ -1628,7 +1673,7 @@
 
 	<note>
 	  <para>Some ports are not maintained by an individual but
-	    instead by a <link
+	    instead by a group maintainer such as a <link
 	      xlink:href="&url.articles.mailing-list-faq;/article.html">mailing
 	      list</link>.  Many, but not all, of these addresses look
 	    like <email