2003-05-03 Havoc Pennington <hp@pobox.com>

	* dbus/dbus-watch.c (dbus_watch_handle): warn and return if a
	watch is invalid when handled

	* tools/Makefile.am, tools/dbus-launch.c, tools/dbus-launch.1: add
	dbus-launch utility to launch the bus from a shell script.  Didn't
	actually implement dbus-launch yet, it's just a placeholder still.

2 files changed, 8 insertions, 1 deletions

diff --git a/bus/dbus-daemon-1.1.in b/bus/dbus-daemon-1.1.in
index b57d1d35..3339aebc 100644
--- a/bus/dbus-daemon-1.1.in
+++ b/bus/dbus-daemon-1.1.in
@@ -49,6 +49,13 @@ The per-session daemon is used for various interprocess communication
 among desktop applications (however, it is not tied to X or the GUI 
 in any way).
 
+.PP
+There is no way to cause the D-BUS daemon to reload its configuration
+file (HUP will not do so). The reason is that changing configuration
+would break the semantics expected by applications connected to the
+message bus. Thus, changing configuration would require kicking all
+apps off the bus; so you may as well just restart the daemon.
+
 .SH OPTIONS
 The following options are supported:
 .TP
diff --git a/bus/main.c b/bus/main.c
index ef3f013c..de78368b 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -47,7 +47,7 @@ signal_handler (int sig)
 static void
 usage (void)
 {
-  fprintf (stderr, "dbus-daemon-1 [--version] [--session] [--system] [--config-file=FILE] [--print-address[=descriptor]]\n");
+  fprintf (stderr, "dbus-daemon-1 [--version] [--session] [--system] [--config-file=FILE] [--print-address[=DESCRIPTOR]]\n");
   exit (1);
 }