Index: en_US.ISO8859-1/books/porters-handbook/special/chapter.xml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/special/chapter.xml	(revision 51372)
+++ en_US.ISO8859-1/books/porters-handbook/special/chapter.xml	(working copy)
@@ -5580,18 +5580,24 @@
       <varname>OPTIONS_DEFAULT</varname>.</para>
 
     <table frame="none" xml:id="shell-completion-paths">
-      <title>Shell completion file paths</title>
+      <title>Full shell completion file names</title>
 
       <tgroup cols="2">
 	<tbody>
 	  <row>
 	    <entry><command>bash</command></entry>
-	    <entry><filename>${PREFIX}/etc/bash_completion.d</filename></entry>
+	    <entry><filename>${PREFIX}/etc/bash_completion.d</filename> or <filename>${PREFIX}/share/bash-completion/completions</filename></entry>
+	    <entry>(any unique file names in one of these folders)</entry>
 	  </row>
 
 	  <row>
+	    <entry><command>fish</command></entry>
+	    <entry><filename>${PREFIX}/share/fish/completions/${PORTNAME}.fish</filename></entry>
+	  </row>
+
+	  <row>
 	    <entry><command>zsh</command></entry>
-	    <entry><filename>${PREFIX}/share/zsh/site-functions</filename></entry>
+	    <entry><filename>${PREFIX}/share/zsh/site-functions/_${PORTNAME}</filename></entry>
 	  </row>
 	</tbody>
       </tgroup>