[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[menus] <DefaultMergeDirs> element



Hi,

Adding <DefaultMergeDirs> per suggestion from Waldo.

Havoc

Index: menu-spec.sgml
===================================================================
RCS file: /home/freedesktop/web/content/standards/menu/draft/menu-spec.sgml,v
retrieving revision 1.9
diff -u -p -u -r1.9 menu-spec.sgml
--- menu-spec.sgml	6 Dec 2002 18:19:07 -0000	1.9
+++ menu-spec.sgml	6 Dec 2002 18:34:09 -0000
@@ -126,17 +126,15 @@
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term><replaceable>sysconfdir</replaceable>/desktop/menus/applications-merged/</term>
+          <term><replaceable>sysconfdir</replaceable>/desktop/menus/<replaceable>menu-file-basename</replaceable>-merged/</term>
           <listitem>
             <para>
-              This directory should be specified in
-              <replaceable>sysconfdir</replaceable>/desktop/menus/applications.menu
-              as a &lt;MergeDir&gt; for the root &lt;Menu&gt; element, but
-              should not be otherwise known to the menu implementation.
-              By convention, third parties may add new &lt;Menu&gt; 
-              files in this location. Thus vendors should ship with 
-              this &lt;MergeDir&gt; in their default configuration. However, 
-              local sites may choose to remove the &lt;MergeDir&gt;.
+              One of the default merge directories included in the
+              &lt;DefaultMergeDirs&gt; element.  By convention, third parties
+              may add new &lt;Menu&gt; files in this
+              location. <replaceable>menu-file-basename</replaceable> means the
+              "applications" from "applications.menu" for example. So the merge
+              directory would be "applications-merged".
             </para>
           </listitem>
         </varlistentry>
@@ -188,13 +186,12 @@
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term><replaceable>userdir</replaceable>/menus/applications-merged</term>
+          <term><replaceable>userdir</replaceable>/menus/<replaceable>menu-file-basename</replaceable>-merged</term>
           <listitem>
             <para>
-              The per-user equivalent of the system version. Should be included
-              as a &lt;MergeDir&gt; statement in
-              <replaceable>userdir</replaceable>/menus/applications.menu, rather
-              than hardcoded anywhere. Contains .menu files to be merged.
+              The per-user equivalent of the system version. Also included in
+              the &lt;DefaultMergeDirs&gt; element. Contains .menu files to be
+              merged.
             </para>
           </listitem>
         </varlistentry>
@@ -631,6 +628,20 @@ entries</ulink>: <varname>Categories</va
                 Duplicate &lt;MergeDir&gt; elements (that specify the same
                 directory) are handled as with duplicate &lt;AppDir&gt;
                 elements (the last duplicate is used).
+              </para>
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>&lt;DefaultMergeDirs&gt;</term>
+            <listitem>
+              <para>
+                This element may only appear below &lt;Menu&gt;. The element has
+                no content. The element should be treated as if it were a list
+                of &lt;MergeDir&gt; elements containing the default merge
+                directory locations. When expanding &lt;DefaultMergeDirs&gt; to a
+                list of &lt;MergeDir&gt;, the default locations that are earlier
+                in the search path go later in the &lt;Menu&gt; so that they
+                have priority.
               </para>
             </listitem>
           </varlistentry>





[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]