Policy should now conflict with and replace packaging-manual

[debian/debian-policy.git] / mime-policy.sgml

diff --git a/mime-policy.sgml b/mime-policy.sgml
index 310302f13585334013394d6239ec89d39700a5e9..53ba2cc8ed3a76db7f0c34fa412eb19bd83bc1f6 100644 (file)
--- a/mime-policy.sgml
+++ b/mime-policy.sgml
@@ -42,10 +42,10 @@
            <p>Michael Alan Dorman <email>mdorman@debian.org</email></p>
          </item>
          <item>
-           <p>Richard Braakman <email>dark@xs4all.nl</email></p>
+           <p>Philip Hands <email>phil@hands.com</email></p>
          </item>
          <item>
-           <p>Philip Hands <email>phil@hands.com</email></p>
+           <p>Julian Gilbey <email>J.D.Gilbey@qmw.ac.uk</email></p>
          </item>
          <item>
            <p>Manoj Srivastava <email>srivasta@debian.org</email></p>
@@ -77,7 +77,7 @@
          <tt>/usr/share/common-licenses/GPL</tt> in the Debian GNU/Linux
          distribution or on the World Wide Web at 
          <url id="http://www.gnu.org/copyleft/gpl.html"
-         name="&urlname">. You can also obtain it by writing to the
+         name="The GNU Public Licence">. You can also obtain it by writing to the
          Free Software Foundation, Inc., 59 Temple Place - Suite 330,
          Boston, MA 02111-1307, USA.
        </p>