Synchronized with patch 150 from Manojs tree

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

diff --git a/menu-policy.sgml b/menu-policy.sgml
index 3c7dd4dfa579ce41124cd588b6d7406815a7209d..d2096d6d5b7abd7b3ef453a84d80f3a317b3f894 100644 (file)
--- a/menu-policy.sgml
+++ b/menu-policy.sgml
@@ -22,7 +22,7 @@
       <title>The Debian Menu sub-policy</title>
       <author>
        <name>Chris Waters  </name>
-       <email>xtifr@dsp.net</email>
+       <email>xtifr@debian.org</email>
       </author>
       <author>
        <name>Joey Hess</name> 
@@ -46,12 +46,6 @@
        have no editorial powers. At the moment, the list of
        maintainers is:
        <enumlist>
-         <item>
-           <p>Michael Alan Dorman <email>mdorman@debian.org</email></p>
-         </item>
-         <item>
-           <p>Philip Hands <email>phil@hands.com</email></p>
-         </item>
          <item>
            <p>Julian Gilbey <email>J.D.Gilbey@qmw.ac.uk</email></p>
          </item>
@@ -85,7 +79,7 @@
          <tt>/usr/doc/copyright/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="The GNU Public Licence">. You can also obtain it by writing to the
+         name="The GNU General 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>
@@ -98,7 +92,7 @@
       <p>
        The latest copy of this document can be found at
        <ftpsite>ftp.debian.org</ftpsite>
-       <ftppath>/debian/doc/package-developer/menu-policy.txt</ftppath> 
+       <ftppath>/debian/doc/package-developer/menu-policy.txt.gz</ftppath> 
       </p>
       <p>
        This document has been extracted and separated from the