diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-06-27 11:31:22 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-06-27 11:31:22 +0100 |
| commit | 6ec9900bc121d71b0b91c1d988406155406a38a5 (patch) | |
| tree | 5bc49e429a7e8e9dfc56a30a5e9ab472a160312a /doc | |
| parent | 589ca59b2ffd749d1bf021f688dd54bcf759e5ea (diff) | |
| download | dbus-6ec9900bc121d71b0b91c1d988406155406a38a5.tar.gz | |
Revert "dbus-launch: add --exit-with-x11 option"
This reverts commit fcc656d430f53ad62c25e41d7e7bd880cbb726a0.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/dbus-launch.1 | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/doc/dbus-launch.1 b/doc/dbus-launch.1 index 4902b40a..e4341e54 100644 --- a/doc/dbus-launch.1 +++ b/doc/dbus-launch.1 @@ -7,7 +7,7 @@ dbus\-launch \- Utility to start a message bus from a shell script .SH SYNOPSIS .PP -.B dbus\-launch [\-\-version] [\-\-sh\-syntax] [\-\-csh\-syntax] [\-\-auto\-syntax] [\-\-exit\-with\-session] [\-\-exit\-with\-x11] [\-\-autolaunch=MACHINEID] [\-\-config\-file=FILENAME] [PROGRAM] [ARGS...] +.B dbus\-launch [\-\-version] [\-\-sh\-syntax] [\-\-csh\-syntax] [\-\-auto\-syntax] [\-\-exit\-with\-session] [\-\-autolaunch=MACHINEID] [\-\-config\-file=FILENAME] [PROGRAM] [ARGS...] .SH DESCRIPTION @@ -167,25 +167,11 @@ the \-\-session argument. See the man page for dbus\-daemon Emit csh compatible code to set up environment variables. .TP -.I \-\-exit\-with\-x11 -If this option is provided, a persistent "babysitter" process will be -created, and will connect to the X server. If it cannot do so, launching -fails. If the "babysitter" process loses its X connection, -it kills the message bus daemon, disconnecting all of its clients (which -should exit in response). This avoids having leftover daemon -processes from a user X session, after the X session has ended. - -.TP -.I \-\-exit\-with\-session -If this option is provided, a persistent "babysitter" process will be -created, as if for -.BR \-\-exit\-with\-x11 . -If it cannot connect to the X server, it will monitor the terminal from which -.B dbus-launch -was started instead, and if it gets a HUP on stdin, the message bus daemon -will be killed. This option is not recommended, since it will consume input -from the terminal where it was started; it is mainly provided for -backwards compatibility. +.I "\-\-exit\-with\-session" +If this option is provided, a persistent "babysitter" process will be +created that watches stdin for HUP and tries to connect to the X +server. If this process gets a HUP on stdin or loses its X connection, +it kills the message bus daemon. .TP .I "\-\-autolaunch=MACHINEID" |