summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2012-06-27 11:32:29 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2012-06-27 11:32:29 +0100
commit27a7eb41f6a363cbae71c47e3c6ed7e732bdf43c (patch)
tree078df9a2100390c3e59e3fcf717be13ccd5bc712
parent6ec9900bc121d71b0b91c1d988406155406a38a5 (diff)
downloaddbus-27a7eb41f6a363cbae71c47e3c6ed7e732bdf43c.tar.gz
Still recommend --exit-with-session in documentation, --exit-with-x11 was reverted
-rw-r--r--doc/dbus-launch.18
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/dbus-launch.1 b/doc/dbus-launch.1
index e4341e54..e22a3be0 100644
--- a/doc/dbus-launch.1
+++ b/doc/dbus-launch.1
@@ -56,17 +56,17 @@ about D\-Bus. See also the man page for \fIdbus\-daemon\fP.
Distributions running
.B dbus\-launch
as part of a standard X session should run
-.B "dbus\-launch \-\-exit\-with\-x11"
+.B "dbus\-launch \-\-exit\-with\-session"
after the X server has started and become available, as a wrapper around
the "main" X client (typically a session manager or window manager), as in
these examples:
.RS
-.B "dbus\-launch \-\-exit\-with\-x11 gnome\-session"
+.B "dbus\-launch \-\-exit\-with\-session gnome\-session"
-.B "dbus\-launch \-\-exit\-with\-x11 openbox"
+.B "dbus\-launch \-\-exit\-with\-session openbox"
-.B "dbus\-launch \-\-exit\-with\-x11 ~/.xsession"
+.B "dbus\-launch \-\-exit\-with\-session ~/.xsession"
.RE
If your distribution does not do this, you can achieve similar results