Index: en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
+++ en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
@@ -3539,7 +3539,7 @@
     <para>If the port anchors its man tree somewhere other than
       <varname>PREFIX</varname>, use
       <varname>MANDIRS</varname> to specify those directories.  Note
-      that the files corresponding to manual pages must be be placed in
+      that the files corresponding to manual pages must be placed in
       <filename>pkg-plist</filename> along with the rest of the files.
       The purpose of <varname>MANDIRS</varname> is to enable automatic
       compression of manual pages, therefore the file names are
@@ -4382,6 +4382,14 @@
 	  </listitem>
 	</itemizedlist>
 
+	<note>
+	  <para>Some variables are not in this list, in particular
+	    <varname>PKGNAMEPREFIX</varname> and
+	    <varname>PKGNAMESUFFIX</varname>.  This is intentional. A
+	    port <emphasis>must not</emphasis> change its name when
+	    its option set changes.</para>
+	</note>
+
 	<warning>
 	  <para>Some of these variables, at least
 	    <varname>ALL_TARGET</varname> and
@@ -4481,7 +4489,7 @@
       directory, <filename>foo-1.0</filename>, and the rest of the
       files are located under that directory.</para>
 
-    <para>A number of variables can overriden if that is
+    <para>A number of variables can be overridden if that is
       not the case.</para>
 
     <sect2 xml:id="makefile-wrksrc">
@@ -4591,12 +4599,14 @@
 	targets.  Set ownership directly in
 	<filename>pkg-plist</filename> with the corresponding entries,
 	such as
-	<literal>@owner <replaceable>owner</replaceable></literal> and
+	<literal>@(<replaceable>owner</replaceable>,<replaceable>group</replaceable>,)</literal>,
+	<literal>@owner <replaceable>owner</replaceable></literal>, and
 	<literal>@group <replaceable>group</replaceable></literal>.
-	These operators work until being overridden, or until the end
+	These operators work until overridden, or until the end
 	of <filename>pkg-plist</filename>, so do not forget to reset
 	them after they are no longer needed.  The default ownership
-	is <literal>root:wheel</literal>.</para>
+	is <literal>root:wheel</literal>.  See <xref
+	  linkend="plist-keywords-base"/> for more information.</para>
 
       <itemizedlist>
 	<listitem>
@@ -4634,15 +4644,15 @@
 	</listitem>
       </itemizedlist>
 
-      <para>These are the <command>install</command>
-	command with all the appropriate flags.</para>
+      <para>These are &man.install.1; with the appropriate
+	flags.</para>
 
-      <note>
+      <important>
 	<para>Do not use <varname>INSTALL_LIB</varname> to install
 	  static libraries, because stripping them render them
 	  useless.  Use <varname>INSTALL_DATA</varname>
 	  instead.</para>
-      </note>
+      </important>
     </sect2>
 
     <sect2 xml:id="install-strip">