diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | bus/dbus-daemon.1.in | 27 |
2 files changed, 33 insertions, 0 deletions
@@ -1,5 +1,11 @@ 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: Add servicehelper into the dtd, it will soon be a valid part of the config file. diff --git a/bus/dbus-daemon.1.in b/bus/dbus-daemon.1.in index ce623f8b..d4d816f4 100644 --- a/bus/dbus-daemon.1.in +++ b/bus/dbus-daemon.1.in @@ -288,6 +288,33 @@ per-user-session bus daemon defined in 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>" .PP |