Synchronize with upstream branch.

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

diff --git a/menu-policy.sgml b/menu-policy.sgml
index 33892fad65560d7ae0950d2d8dcebb96c691346e..c2a2ec63bf628da0c3aca99850ec71001f62329b 100644 (file)
--- a/menu-policy.sgml
+++ b/menu-policy.sgml
@@ -58,8 +58,8 @@
          distribution or on the World Wide Web at 
          <url id="http://www.gnu.org/copyleft/gpl.html"
          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.
+         Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+         Boston, MA 02110-1301, USA. 
        </p>
       </copyright>
     </titlepag>
@@ -67,16 +67,16 @@
     <toc detail="sect">
     <chapt>
       <heading>About this document</heading>
+
       <p>
-       The latest copy of this document can be found in the
-       <tt>menu-policy</tt> files in the <tt>debian-policy</tt> package.
-       They are also available from the Debian web mirrors at
+       This document is distributed as the <tt>menu-policy</tt> files
+       in the Debian package
+        <package><url name="debian-policy" id="http://packages.debian.org/debian-policy"></package>.
+       It is also available from the Debian web mirrors at
        <tt><url name="/doc/packaging-manuals/menu-policy/"
-               id="http://www.debian.org/doc/packaging-manuals/menu-policy/"></tt>
-       and from the Debian archive mirrors at
-       <tt><url name="/doc/package-developer/menu-policy.txt.gz"
-               id="http://ftp.debian.org/debian/doc/package-developer/menu-policy.txt.gz"></tt>.
+               id="http://www.debian.org/doc/packaging-manuals/menu-policy/"></tt>.
       </p>
+
       <p>
        This document has been extracted and separated from the
        <em>Menu</em> package to:<enumlist>
@@ -96,6 +96,7 @@
        </enumlist>
       </p>
     </chapt>
+
     <chapt>
       <heading>Menu Structure</heading>
       <p>
@@ -125,6 +126,10 @@
                  <item>
                    <p>text editors, word processors</p>
                  </item>
+                 <tag>Education</tag>
+                 <item>
+                   <p>educational and training programs</p>
+                 </item>
                  <tag>Emulators</tag>
                  <item>
                    <p>wine, dosemu, etc.</p>
@@ -261,7 +266,7 @@
              <p>X window managers</p>
              <p>
                <taglist>
-                 <tag>Modules></tag>
+                 <tag>Modules</tag>
                  <item>
                    <p>window manager modules</p>
                  </item>