summaryrefslogtreecommitdiffstats
path: root/bus/dbus-daemon.1.in
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2007-07-26 23:01:14 +0000
committerHavoc Pennington <hp@redhat.com>2007-07-26 23:01:14 +0000
commitbdbab1212390d85a82d4195fa67a5c63ac0678cb (patch)
tree25f905d227f1a703bec0d64dcb6c8916cfed5f8b /bus/dbus-daemon.1.in
parentba38a9b12ffee5d07f1e4a2a9585805695795219 (diff)
2007-07-26 Havoc Pennington <hp@redhat.com>
* bus/config-parser-trivial.c (check_return_values): disable a test that hardcoded the bus user's name * bus/dispatch.c (bus_dispatch_test_conf): remove the "if (!use_launcher)" around the tests, they were only failing because we didn't pass through all the expected errors from the helper. * bus/activation-exit-codes.h (BUS_SPAWN_EXIT_CODE_CHILD_SIGNALED): add a code for child segfaulting (BUS_SPAWN_EXIT_CODE_GENERIC_FAILURE): make "1" be a generic failure code, so if a third party launch helper were written it could just always return 1 on failure.
Diffstat (limited to 'bus/dbus-daemon.1.in')
-rw-r--r--bus/dbus-daemon.1.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/bus/dbus-daemon.1.in b/bus/dbus-daemon.1.in
index 63d97183..e230e513 100644
--- a/bus/dbus-daemon.1.in
+++ b/bus/dbus-daemon.1.in
@@ -232,9 +232,10 @@ Example: <listen>tcp:host=localhost,port=0,family=ipv4</listen>
.PP
A special case is using a port number of zero (or omitting the port),
which means to choose an available port selected by the operating
-system. The port number chosen can be with the --print-address command
-line parameter and will be present in other cases where the server
-reports its own address, such as when DBUS_SESSION_BUS_ADDRESS is set.
+system. The port number chosen can be obtained with the
+--print-address command line parameter and will be present in other
+cases where the server reports its own address, such as when
+DBUS_SESSION_BUS_ADDRESS is set.
.PP
Example: <listen>tcp:host=localhost,port=0</listen>