Index: head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
===================================================================
--- head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
+++ head/en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
@@ -1697,8 +1697,7 @@
 	we can discuss it before we import it.  As a committer,
 	send a note to the &a.ports; so we can discuss it
 	first.  Too often, new ports are imported to the wrong
-	category only to be moved right away.  This causes unnecessary
-	and undesirable bloat in the master source repository.</para>
+	category only to be moved right away.</para>
     </sect2>
 
     <sect2 xml:id="proposing-categories">
@@ -2058,10 +2057,7 @@
 
       <para>It is recommended that multiple sites are included on this
 	list, preferably from different continents.  This will
-	safeguard against wide-area network problems.  We are even
-	planning to add support for automatically determining the
-	closest master site and fetching from there; having multiple
-	sites will go a long way towards helping this effort.</para>
+	safeguard against wide-area network problems.</para>
 
       <important>
 	<para><varname>MASTER_SITES</varname> must not be blank.  It
@@ -2968,7 +2964,7 @@
 	<filename>.bz2</filename> or <filename>.xz</filename>.</para>
 
       <para>If the patch is distributed with some other files, such as
-	documentation, in a <command>gzip</command>ped tarball, using
+	documentation, in a compressed tarball, using
 	<varname>PATCHFILES</varname> is not possible.  If that is the
 	case, add the name and the location of the patch tarball to
 	<varname>DISTFILES</varname> and
@@ -2997,9 +2993,8 @@
       <note>
 	<para>The tarball will have been extracted alongside the
 	  regular source by then, so there is no need to explicitly
-	  extract it if it is a regular <command>gzip</command>ped or
-	  <command>compress</command>ed tarball.  Take extra care not
-	  to overwrite something that already exists in that
+	  extract it if it is a regular compressed tarball.  Take extra
+	  care not to overwrite something that already exists in that
 	  directory if extracting it manually.  Also, do not forget to
 	  add a command to remove the copied patch in the
 	  <buildtarget>pre-clean</buildtarget> target.</para>
@@ -3676,8 +3671,9 @@
 	that subdirectory.</para>
 
       <para>It will also look at the subdirectory with the same name
-	on the backup master site at
-	<filename>ftp.FreeBSD.org</filename>.  (Setting
+	on the backup master site at <link>
+	  <xlink:href="http://distcache.FreeBSD.org">http://distcache.FreeBSD.org</link>
+	(Setting
 	<varname>DISTDIR</varname> explicitly in
 	<filename>Makefile</filename> will not accomplish this, so
 	please use <varname>DIST_SUBDIR</varname>.)</para>
@@ -4772,7 +4768,7 @@
 	      Equivalent to setting <link
 		linkend="porting-restrictions-no_package"><varname>NO_PACKAGE</varname></link>.
 	      The package will <emphasis>not</emphasis> be distributed
-	      otn the &os; package
+	      from the &os; package
 	      <acronym>CDN</acronym> <link
 		xlink:href="http://pkg.freebsd.org/">http://pkg.freebsd.org/</link>.</para>
 	  </listitem>
@@ -7445,10 +7441,8 @@
 	  additional documentation installed in
 	  <varname>DOCSDIR</varname>.  It does not apply to standard
 	  man pages and info pages.  Things installed in
-	  <varname>DATADIR</varname> and
 	  <varname>EXAMPLESDIR</varname> are controlled by
-	  <literal>DATA</literal> and <literal>EXAMPLES</literal>
-	  options, respectively.</para>
+	  the <literal>EXAMPLES</literal> option.</para>
       </note>
 
       <para>These variables are exported to