2007-07-24 Richard Hughes <richard@hughsie.com>

* bus/dbus-daemon.1.in:
Add standard_system_servicedirs and servicehelper into the man file
and explain what each does.

diff --git a/ChangeLog b/ChangeLog
index 1d3ac4499d4630337a60d6054e45e27930f4d5c2..e89c9b07a4cef4fa55b759f207a8fb12ce7a5d75 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-24  Richard Hughes  <richard@hughsie.com>
+
+       * bus/dbus-daemon.1.in:
+       Add standard_system_servicedirs and servicehelper into the man file
+       and explain what each does.
+
 2007-07-24  Richard Hughes  <richard@hughsie.com>
 
        * doc/busconfig.dtd:

diff --git a/bus/dbus-daemon.1.in b/bus/dbus-daemon.1.in
index ce623f8b9e05c4a7b88043e5144ab6d926f0c19b..d4d816f4c616bb0007448dc9c6b057b657852da9 100644 (file)
--- a/bus/dbus-daemon.1.in
+++ b/bus/dbus-daemon.1.in
@@ -287,6 +287,33 @@ per-user-session bus daemon defined in
 @EXPANDED_SYSCONFDIR@/dbus-1/session.conf. Putting it in any other
 configuration file would probably be nonsense.
 
+.TP
+.I "<standard_system_servicedirs/>"
+
+.PP
+<standard_system_servicedirs/> specifies the standard system-wide
+activation directories that should be searched for service files.
+This option defaults to @EXPANDED_DATADIR@/dbus-1/system-services.
+
+.PP
+The <standard_system_servicedirs/> option is only relevant to the
+per-system bus daemon defined in
+@EXPANDED_SYSCONFDIR@/dbus-1/system.conf. Putting it in any other
+configuration file would probably be nonsense.
+
+.TP
+.I "<servicehelper/>"
+
+.PP
+<servicehelper/> specifies the setuid helper that is used to launch
+system daemons with an alternate user. Typically this should be
+the dbus-daemon-launch-helper executable in located in libexec.
+
+.PP
+The <servicehelper/> option is only relevant to the per-system bus daemon
+defined in @EXPANDED_SYSCONFDIR@/dbus-1/system.conf. Putting it in any other
+configuration file would probably be nonsense.
+
 .TP
 .I "<limit>"