From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 27 Jun 2012 10:32:29 +0000 (+0100)
Subject: Still recommend --exit-with-session in documentation, --exit-with-x11 was reverted
X-Git-Tag: dbus-1.6.2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27a7eb41f6a363cbae71c47e3c6ed7e732bdf43c;p=thirdparty%2Fdbus.git

Still recommend --exit-with-session in documentation, --exit-with-x11 was reverted
---

diff --git a/doc/dbus-launch.1 b/doc/dbus-launch.1
index e4341e54c..e22a3be0d 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