From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 17 Feb 2017 20:54:14 +0000 (+0000)
Subject: spec: Don't say implementation-specific locations must be lowest priority
X-Git-Tag: dbus-1.11.12~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=968e2cce9393979e90a3f743612d1b074dbc99c7;p=thirdparty%2Fdbus.git

spec: Don't say implementation-specific locations must be lowest priority

We're treating transient services as higher-priority than those in
the XDG_DATA_HOME or XDG_DATA_DIRS, which is consistent with systemd.

The specific list used by the standard session dbus-daemon will be
added to dbus-daemon(1) in the next commit.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99825
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml
index 50c785839..7110be79c 100644
--- a/doc/dbus-specification.xml
+++ b/doc/dbus-specification.xml
@@ -5532,18 +5532,14 @@
           </para>
         </sect4>
         <sect4>
-          <title></title>
+          <title>Finding session services</title>
           <para>
             On Unix systems, the session bus should search for .service files
             in <literal>$XDG_DATA_DIRS/dbus-1/services</literal> as defined
             by the
             <ulink url="http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html">XDG Base Directory Specification</ulink>.
-            Implementations may also search additional locations, which
-            should be searched with lower priority than anything in
-            XDG_DATA_HOME, XDG_DATA_DIRS or their respective defaults;
-            for example, the reference implementation also
-            looks in <literal>${datadir}/dbus-1/services</literal> as
-            set at compile time.
+            Implementations may also search additional locations,
+            with a higher or lower priority than the XDG directories.
           </para>
           <para>
             As described in the XDG Base Directory Specification, software