Index: en_US.ISO8859-1/books/porters-handbook/quick-porting/chapter.xml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/quick-porting/chapter.xml
+++ en_US.ISO8859-1/books/porters-handbook/quick-porting/chapter.xml
@@ -332,6 +332,12 @@
       right shape and the
       <link linkend="porting-pkgname">package</link> is named
       appropriately.</para>
+
+    <important>
+      <para>Do not blindly follow the output of
+	<command>portlint</command>, it is a static lint tool, and it
+	will get things wrong.</para>
+    </important>
   </sect1>
 
   <sect1 xml:id="porting-submitting">
@@ -357,22 +363,26 @@
       is located, and then type:
       <command>shar `find oneko` &gt; oneko.shar</command></para>
 
-    <!-- The link here is wrong, but, I have no idea where
-    to point it now, so commenting the whole paragraph.
-
-    <para>Include <filename>oneko.shar</filename> in a bug
-      report and submit it.  See <link
-	xlink:href="&url.articles.contributing;/contrib-how.html#CONTRIB-GENERAL">Bug
-	Reports and General Commentary</link> for more information
-      submitting problem reports.</para> -->
-
-    <para>To submit <filename>oneko.shar</filename>, use the <link
+    <para>If using a ports tree that is a
+      <application>Subversion</application> checkout, it is also
+      possible to submit a &man.diff.1;.  Make sure that all the files
+      have been <command>svn add</command>'ed.  Then, generate the
+      diff with <command>svn diff</command> from the base of the ports
+      tree, so that it can be applied easily with <command>svn
+	patch</command>.  For example, <command>svn diff
+	games/oneko &gt; oneko.diff</command>.</para>
+
+    <para>To submit <filename>oneko.shar</filename> or
+      <filename>oneko.diff</filename>, use the <link
 	xlink:href="https://bugs.freebsd.org/submit/">bug submit
-	form</link> (category <literal>Ports Tree</literal>).
+	form</link>.  Use product <quote>Ports &amp; Packages</quote>,
+      component <quote>Individual Port(s)</quote>, and follow the
+      guidelines of the box with the green text on the right.
       Add a short
       description of the program to the Description field of the PR
       (perhaps a short version of <varname>COMMENT</varname>), and
-      do not forget to add <filename>oneko.shar</filename> as an
+      do not forget to add <filename>oneko.shar</filename> or
+      <filename>oneko.diff</filename> as an
       attachment.</para>
 
     <note>
Index: en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml
+++ en_US.ISO8859-1/books/porters-handbook/upgrading/chapter.xml
@@ -152,7 +152,9 @@
   <note>
     <para>Once again, please use &man.diff.1; and not &man.shar.1;
       to send updates to existing ports!  This helps ports
-      committers understand exactly what is being changed.</para>
+      committers understand exactly what is being changed.  An update
+      submitted in a &man.shar.1; file will most likely end up being
+      ignored.</para>
   </note>
 
   <para>Now that all of that is done, read about