From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 7 Feb 2011 09:21:08 +0000 (+0100)
Subject: * dbus.texi (Bus names): Adapt descriptions for
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~976
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1ff98217da213c4b933bbb9e70bf6f18fbcfc0f8;p=emacs.git

* dbus.texi (Bus names): Adapt descriptions for
dbus-list-activatable-names and dbus-list-known-names.
---

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 51038726130..53109fe7948 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-07  Michael Albinus  <michael.albinus@gmx.de>
+
+	* dbus.texi (Bus names): Adapt descriptions for
+	dbus-list-activatable-names and dbus-list-known-names.
+
 2011-02-07  Jay Belanger  <jay.p.belanger@gmail.com>
 
 	* calc.texi (Logarithmic Units): New section.
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index e50f48dcec1..64d577f4387 100644
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -132,14 +132,24 @@ There are several basic functions which inspect the buses for
 registered names.  Internally they use the basic interface
 @samp{org.freedesktop.DBus}, which is supported by all objects of a bus.
 
-@defun dbus-list-activatable-names
-This function returns the D-Bus service names, which can be activated.
-An activatable service is described in a service registration file.
-Under GNU/Linux, such files are located at
-@file{/usr/share/dbus-1/services/}.
+@defun dbus-list-activatable-names &optional bus
+This function returns the D-Bus service names, which can be activated
+for @var{bus}.  It must be either the symbol @code{:system} (the
+default) or the symbol @code{:session}.  An activatable service is
+described in a service registration file.  Under GNU/Linux, such files
+are located at @file{/usr/share/dbus-1/system-services/} (for the
+@code{:system} bus) or @file{/usr/share/dbus-1/services/}.  An
+activatable service is not necessarily registered at @var{bus} at already.
 
 The result is a list of strings, which is @code{nil} when there are no
-activatable service names at all.
+activatable service names at all.  Example:
+
+@lisp
+;; Check, whether the document viewer can be accessed via D-Bus.
+(member "org.gnome.evince.Daemon"
+        (dbus-list-activatable-names :session))
+@end lisp
+
 @end defun
 
 @defun dbus-list-names bus
@@ -154,7 +164,7 @@ strings like @samp{org.freedesktop.DBus}.  Names starting with
 @end defun
 
 @defun dbus-list-known-names bus
-Retrieves all services which correspond to a known name in @var{bus}.
+Retrieves all registered services which correspond to a known name in @var{bus}.
 A service has a known name if it doesn't start with @samp{:}.  The
 result is a list of strings, which is @code{nil} when there are no
 known names at all.