Index: menu-spec.xml
===================================================================
RCS file: /cvs/menus/menu-spec/menu-spec.xml,v
retrieving revision 1.30
diff -u -r1.30 menu-spec.xml
--- menu-spec.xml	13 Jul 2006 22:15:54 -0000	1.30
+++ menu-spec.xml	6 Sep 2006 21:58:58 -0000
@@ -1280,42 +1280,95 @@
   <appendix id="category-registry">
     <title>Registered Categories</title>
     <para>
-      Remember, these are case-sensitive. 
-      When using a category described in the list below it is strongly 
-      recommended to also include the category listed under Related 
-      Categories. If a category has multiple related categories the most
-      suitable related category should be included.
+      This section contains a number of well known categories and
+      suggestions on how to use them. The list of Main Categories consist
+      of those categories that every conforming desktop environment MUST
+      support. By including one of these categories in an application's
+      desktop entry file the application will be ensured that it will
+      show up in a section of the application menu dedicated to this
+      category. The list of Additional Categories provides categories
+      that can be used to provide more fine grained information about
+      the application. Additional Categories should always be used in
+      combination with one of the Main Categories.  
+    </para>
+    <para>    
+      The table below lists all Main Categories. 
+      Note that category names are case-sensitive.
       <informaltable>
-        <tgroup cols="2">
+        <tgroup cols="3">
           <thead>
             <row>
-              <entry>Category</entry>
+              <entry>Main Category</entry>
               <entry>Description</entry>
-			  <entry>Related Categories</entry>
+              <entry>Notes</entry>
             </row>
           </thead>
           <tbody>
             <row>
-              <entry>Legacy</entry> 
-              <entry>Keyword that must be added to menu
-              entries merged from legacy locations. May not actually exist in a
-              desktop entry (should be stripped out if found there). If the same
-              directory is given as both a &lt;LegacyDir&gt; and an
-              &lt;AppDir&gt;, its desktop entries should be labeled "Legacy"
-              only if the &lt;LegacyDir&gt; appears later in the file than the
-              &lt;AppDir&gt;</entry>
-
+              <entry>AudioVideo</entry>
+              <entry>A multimedia (audio/video) application</entry>
             </row><row>
-              <entry>Core</entry>
-              <entry>Important application, core to the desktop such as a file manager or a help browser</entry>
-			  <entry></entry>
-
+              <entry>Audio</entry>
+              <entry>An audio application</entry>
+              <entry>Desktop entry must include AudioVideo as well</entry> 
+            </row><row>
+              <entry>Video</entry>
+              <entry>A video application</entry>
+              <entry>Desktop entry must include AudioVideo as well</entry> 
             </row><row>
               <entry>Development</entry>
               <entry>An application for development</entry>
-			  <entry></entry>
-
             </row><row>
+              <entry>Education</entry>
+              <entry>Educational software</entry>
+            </row><row>
+              <entry>Game</entry>
+              <entry>A game</entry>
+            </row><row>
+              <entry>Graphics</entry>
+              <entry>Graphical application</entry>
+            </row><row>
+              <entry>Network</entry>
+              <entry>Network application such as a web browser</entry>
+            </row><row>
+              <entry>Office</entry>
+              <entry>An office type application</entry>
+            </row><row>
+              <entry>Settings</entry>
+              <entry>Settings applications</entry>
+              <entry>Entries may appear in a separate menu or as part of a
+              "Control Center"</entry>
+            </row><row>
+              <entry>System</entry>
+              <entry>System application, "System Tools" such as say a log viewer or network monitor</entry>
+            </row><row>
+              <entry>Utility</entry>
+              <entry>Small utility application, "Accessories"</entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </informaltable>
+    </para>
+    <para>
+      The table below describes Additional Categories. The Related
+      Categories column lists one or more categories that are suggested
+      to be used in conjunction with the Additional Category. Note that at
+      least one Main Category must be included in the desktop entry's list
+      of categories. If multiple Main Categories are included in a single
+      desktop entry file, the entry may appear more than once in the menu.
+      If the Related Categories column is blank, the
+      Additional Category can be used with any Main Category.
+      <informaltable>
+        <tgroup cols="2">
+          <thead>
+            <row>
+              <entry>Additional Category</entry>
+              <entry>Description</entry>
+			  <entry>Related Categories</entry>
+            </row>
+          </thead>
+          <tbody>
+<row>
               <entry>Building</entry>
               <entry>A tool to build applications</entry>
 			  <entry>Development</entry>
@@ -1351,10 +1404,6 @@
 			  <entry>Development</entry>
 
             </row><row>
-              <entry>Office</entry>
-              <entry>An office type application</entry>
-
-            </row><row>
               <entry>Calendar</entry>
               <entry>Calendar application</entry>
 			  <entry>Office</entry>
@@ -1420,10 +1469,6 @@
 			  <entry>Office</entry>
 
             </row><row>
-              <entry>Graphics</entry>
-              <entry>Graphical application</entry>
-
-            </row><row>
               <entry>2DGraphics</entry>
               <entry>2D based graphical application</entry>
 			  <entry>Graphics</entry>
@@ -1431,12 +1476,12 @@
             </row><row>
               <entry>VectorGraphics</entry>
               <entry>Vector based graphical application</entry>
-			  <entry>2DGraphics</entry>
+			  <entry>Graphics;2DGraphics</entry>
 
             </row><row>
               <entry>RasterGraphics</entry>
               <entry>Raster based graphical application</entry>
-			  <entry>2DGraphics</entry>
+			  <entry>Graphics;2DGraphics</entry>
 
             </row><row>
               <entry>3DGraphics</entry>
@@ -1451,7 +1496,7 @@
             </row><row>
               <entry>OCR</entry>
               <entry>Optical character recognition application</entry>
-			  <entry>Scanning</entry>
+			  <entry>Graphics;Scanning</entry>
 
             </row><row>
               <entry>Photography</entry>
@@ -1464,10 +1509,6 @@
 			  <entry>Graphics or Office</entry>
 
             </row><row>
-              <entry>Settings</entry>
-              <entry>Settings applications</entry>
-
-            </row><row>
               <entry>DesktopSettings</entry>
               <entry>Configuration tool for the GUI</entry>
 			  <entry>Settings</entry>
@@ -1483,11 +1524,6 @@
 			  <entry>Settings</entry>
 
             </row><row>
-              <entry>Network</entry>
-              <entry>Network application such as a web browser</entry>
-			  <entry>(Settings)</entry>
-
-            </row><row>
               <entry>Dialup</entry>
               <entry>A dial-up program</entry>
 			  <entry>Network</entry>
@@ -1515,6 +1551,7 @@
             </row><row>
               <entry>News</entry>
               <entry>A news reader or a news ticker</entry>
+			  <entry>Network</entry>
 
             </row><row>
               <entry>P2P</entry>
@@ -1542,43 +1579,29 @@
 			  <entry>Network or Development</entry>
 
             </row><row>
-              <entry>AudioVideo</entry>
-              <entry>A multimedia (audio/video) application</entry>
-
-            </row><row>
-              <entry>Audio</entry>
-              <entry>An audio application</entry>
-			  <entry>AudioVideo</entry>
-
-            </row><row>
               <entry>Midi</entry>
               <entry>An app related to MIDI</entry>
-			  <entry>Audio</entry>
+			  <entry>AudioVideo;Audio</entry>
 
             </row><row>
               <entry>Mixer</entry>
               <entry>Just a mixer</entry>
-			  <entry>Audio</entry>
+			  <entry>AudioVideo;Audio</entry>
 
             </row><row>
               <entry>Sequencer</entry>
               <entry>A sequencer</entry>
-			  <entry>Audio</entry>
+			  <entry>AudioVideo;Audio</entry>
 
             </row><row>
               <entry>Tuner</entry>
               <entry>A tuner</entry>
-			  <entry>Audio</entry>
-
-            </row><row>
-              <entry>Video</entry>
-              <entry>A video application</entry>
-			  <entry>AudioVideo</entry>
+			  <entry>AudioVideo;Audio</entry>
 
             </row><row>
               <entry>TV</entry>
               <entry>A TV application</entry>
-			  <entry>Video</entry>
+			  <entry>AudioVideo;Video</entry>
 
             </row><row>
               <entry>AudioVideoEditing</entry>
@@ -1601,10 +1624,6 @@
 			  <entry>AudioVideo</entry>
 
             </row><row>
-              <entry>Game</entry>
-              <entry>A game</entry>
-
-            </row><row>
               <entry>ActionGame</entry>
               <entry>An action game</entry>
 			  <entry>Game</entry>
@@ -1665,10 +1684,6 @@
 			  <entry>Game</entry>
 
             </row><row>
-              <entry>Education</entry>
-              <entry>Educational software</entry>
-
-            </row><row>
               <entry>Art</entry>
               <entry>Software to teach arts</entry>
 			  <entry>Education</entry>
@@ -1696,57 +1711,48 @@
             </row><row>
               <entry>Astronomy</entry>
               <entry>Astronomy software</entry>
-			  <entry>Science</entry>
+			  <entry>Education;Science</entry>
 
             </row><row>
               <entry>Biology</entry>
               <entry>Biology software</entry>
-			  <entry>Science</entry>
+			  <entry>Education;Science</entry>
 
             </row><row>
               <entry>Chemistry</entry>
               <entry>Chemistry software</entry>
-			  <entry>Science</entry>
+			  <entry>Education;Science</entry>
 
             </row><row>
               <entry>Geology</entry>
               <entry>Geology software</entry>
-			  <entry>Science</entry>
+			  <entry>Education;Science</entry>
 
             </row><row>
               <entry>Math</entry>
               <entry>Math software</entry>
-			  <entry>Science</entry>
+			  <entry>Education;Science</entry>
 
             </row><row>
               <entry>MedicalSoftware</entry>
               <entry>Medical software</entry>
-			  <entry>Science</entry>
+			  <entry>Education;Science</entry>
 
             </row><row>
               <entry>Physics</entry>
               <entry>Physics software</entry>
-			  <entry>Science</entry>
-
-            </row><row>
-              <entry>Teaching</entry>
-              <entry>An education program for teachers</entry>
-			  <entry>Education</entry>
+			  <entry>Education;Science</entry>
 
             </row><row>
               <entry>Amusement</entry>
               <entry>A simple amusement</entry>
 			  <entry></entry>
 
-            </row><row>
-              <entry>Applet</entry>
-              <entry>An applet that will run inside a panel or another such application, likely desktop specific</entry>
-			  <entry></entry>
 
             </row><row>
               <entry>Archiving</entry>
               <entry>A tool to archive/backup data</entry>
-			  <entry></entry>
+			  <entry>Utility</entry>
 
             </row><row>
               <entry>Electronics</entry>
@@ -1756,7 +1762,7 @@
             </row><row>
               <entry>Emulator</entry>
               <entry>Emulator of another platform, such as a DOS emulator</entry>
-			  <entry></entry>
+			  <entry>System or Game</entry>
 
             </row><row>
               <entry>Engineering</entry>
@@ -1766,32 +1772,12 @@
             </row><row>
               <entry>FileManager</entry>
               <entry>A file manager</entry>
-			  <entry></entry>
-
-            </row><row>
-              <entry>Shell</entry>
-              <entry>A shell (an actual specific shell such as
-              <filename>bash</filename> or <filename>tcsh</filename>, not a TerminalEmulator)</entry>
-
-            </row><row>
-              <entry>Screensaver</entry>
-              <entry>A screen saver (launching this desktop entry should activate the screen saver)</entry>
-			  <entry></entry>
+			  <entry>System</entry>
 
             </row><row>
               <entry>TerminalEmulator</entry>
               <entry>A terminal emulator application</entry>
-			  <entry></entry>
-
-            </row><row>
-              <entry>TrayIcon</entry>
-              <entry>An application that is primarily an icon for the "system tray" or "notification area" (apps that open a normal window and just happen to have a tray icon as well should not list this category)</entry>
-			  <entry></entry>
-
-            </row><row>
-              <entry>System</entry>
-              <entry>System application, "System Tools" such as say a log viewer or network monitor</entry>
-			  <entry>(Settings)</entry>
+			  <entry>System</entry>
 
             </row><row>
               <entry>Filesystem</entry>
@@ -1809,11 +1795,6 @@
 			  <entry>Settings or System</entry>
 
             </row><row>
-              <entry>Utility</entry>
-              <entry>Small utility application, "Accessories"</entry>
-			  <entry></entry>
-
-            </row><row>
               <entry>Accessibility</entry>
               <entry>Accessibility</entry>
 			  <entry>Settings or Utility</entry>
@@ -1834,6 +1815,31 @@
 			  <entry>Utility</entry>
 
             </row><row>
+              <entry>Applet</entry>
+              <entry>An applet that will run inside a panel or another such application, likely desktop specific</entry>
+			  <entry></entry>
+
+            </row><row>
+              <entry>Shell</entry>
+              <entry>A shell (an actual specific shell such as
+              <filename>bash</filename> or <filename>tcsh</filename>, not a TerminalEmulator)</entry>
+
+            </row><row>
+              <entry>Screensaver</entry>
+              <entry>A screen saver (launching this desktop entry should activate the screen saver)</entry>
+			  <entry></entry>
+
+            </row><row>
+              <entry>TrayIcon</entry>
+              <entry>An application that is primarily an icon for the "system tray" or "notification area" (apps that open a normal window and just happen to have a tray icon as well should not list this category)</entry>
+			  <entry></entry>
+
+            </row><row>
+              <entry>Core</entry>
+              <entry>Important application, core to the desktop such as a file manager or a help browser</entry>
+			  <entry></entry>
+
+            </row><row>
               <entry>KDE</entry>
               <entry>Application based on KDE libraries</entry>
 			  <entry>QT</entry>
