 @@ -1,14 +1,14 @@
-<!-- $NetBSD: fixes.xml,v 1.119 2013/05/05 21:26:37 rodent Exp $ -->
+<!-- $NetBSD: fixes.xml,v 1.120 2013/05/06 01:32:58 rodent Exp $ -->
 <chapter id="fixes"> <?dbhtml filename="fixes.html"?>
 <title>Making your package work</title>
 <sect1 id="general-operation">
   <title>General operation</title>
   <sect2 id="portability-of-packages">
     <title>Portability of packages</title>
     <para>One appealing feature of pkgsrc is that it runs on many
     different platforms. As a result, it is important to ensure,
     where possible, that packages in pkgsrc are portable. This
 @@ -705,42 +705,43 @@ FETCH_MESSAGE+= "manually from "${MASTER
   <sect2 id="modified-distfiles-same-name">
     <title>How to handle modified distfiles with the 'old' name</title>
     <para>Sometimes authors of a software package make some
     modifications after the software was released, and they put up a
     new distfile without changing the package's version number. If a
     package is already in pkgsrc at that time, the checksum will
     no longer match. The contents of the new distfile should be
     compared against the old one before changing anything, to make
     sure the distfile was really updated on purpose, and that
     no trojan horse or so crept in.
     Please mention that the distfiles were compared and what was found
-    in your commit message.
+    in your commit message.</para>
-    Then, the correct way to work around this is to
+    <para>Then, the correct way to work around this is to
     set <varname>DIST_SUBDIR</varname> to a unique directory name,
     usually based on <varname>PKGNAME_NOREV</varname>. All
     <varname>DISTFILES</varname> and
     <varname>PATCHFILES</varname> for this package will be put in that
     subdirectory of the local distfiles directory.
     (See <xref linkend="bumping-pkgrevision"/> for more details.)
     In case this
     happens more often, <varname>PKGNAME</varname> can be used (thus
     including the <filename>nbX</filename> suffix) or a date stamp
-    can be appended, like <varname>${PKGNAME_NOREV}-YYYYMMDD</varname>.
+    can be appended, like <varname>${PKGNAME_NOREV}-YYYYMMDD</varname>.</para>
-    Do not forget regenerating the <filename>distinfo</filename> file
+    <para><varname>DIST_SUBDIR</varname> is also used when a distfile's name does not contain a version and the distfile is apt to change. In cases where the likelihood of this is very small, <varname>DIST_SUBDIR</varname> might not be required. Additionally, <varname>DIST_SUBDIR</varname> must not be removed unless the distfile name changes, even if a package is being moved or renamed.</para>
     <para>Do not forget regenerating the <filename>distinfo</filename> file
     after that, since it contains the <varname>DIST_SUBDIR</varname>
     path in the filenames.
-    Also increase the PKGREVISION if the installed package is different.
+    Also, increase the PKGREVISION if the installed package is different.
     Furthermore, a mail to the package's authors seems appropriate
     telling them that changing distfiles after releases without
     changing the file names is not good practice.</para>
   </sect2>
 </sect1>
 <sect1 id="fixes.configure">
   <title>Fixing problems in the <emphasis>configure</emphasis> phase</title>
   <sect2 id="fixes.libtool">
     <title>Shared libraries - libtool</title>
 @@ -1902,28 +1903,28 @@ PERL5_PACKLIST= auto/Pg/.packlist
       </orderedlist>
       <para>The best way to verify that the PLIST is correct with
       respect to the last two points is to regenerate it using
       <command>make print-PLIST</command>.</para>
     </sect2>
     <sect2 id="desktop-files">
       <title>Packages installing desktop files</title>
       <para>If a package installs <filename>.desktop</filename> files
       under <filename>share/applications</filename> and these include
-      MIME information, you need to take extra steps to ensure that they
+      MIME information (MimeType key), you need to take extra steps to
-      are registered into the MIME database:</para>
+      ensure that they are registered into the MIME database:</para>
       <orderedlist>
         <listitem>
 	  <para>Include
 	  <filename>../../sysutils/desktop-file-utils/desktopdb.mk</filename>.</para>
         </listitem>
         <listitem>
           <para>Check the PLIST and remove the entry that refers to the
 	  <filename>share/applications/mimeinfo.cache</filename> file.
 	  It will be handled automatically.</para>
         </listitem>
       </orderedlist>