* s/D-BUS/D-Bus/g

8 files changed, 16 insertions, 16 deletions

diff --git a/tools/dbus-cleanup-sockets.1 b/tools/dbus-cleanup-sockets.1
index 3f125dcc..e093ab0f 100644
--- a/tools/dbus-cleanup-sockets.1
+++ b/tools/dbus-cleanup-sockets.1
@@ -12,7 +12,7 @@ dbus-cleanup-sockets \- clean up leftover sockets in a directory
 .SH DESCRIPTION
 
 The \fIdbus-cleanup-sockets\fP command cleans up sockets used for
-D-BUS connections. See http://www.freedesktop.org/software/dbus/ for
+D-Bus connections. See http://www.freedesktop.org/software/dbus/ for
 more information about the big picture.
 
 .PP
@@ -26,5 +26,5 @@ dbus-cleanup-sockets was adapted by Havoc Pennington from
 linc-cleanup-sockets written by Michael Meeks.
 
 .SH BUGS
-Please send bug reports to the D-BUS mailing list or bug tracker,
+Please send bug reports to the D-Bus mailing list or bug tracker,
 see http://www.freedesktop.org/software/dbus/
diff --git a/tools/dbus-cleanup-sockets.c b/tools/dbus-cleanup-sockets.c
index 1cd9b3cd..b4555fce 100644
--- a/tools/dbus-cleanup-sockets.c
+++ b/tools/dbus-cleanup-sockets.c
@@ -364,7 +364,7 @@ usage (int ecode)
 static void
 version (void)
 {
-  printf ("D-BUS Socket Cleanup Utility %s\n"
+  printf ("D-Bus Socket Cleanup Utility %s\n"
           "Copyright (C) 2003 Red Hat, Inc.\n"
           "Copyright (C) 2002 Michael Meeks\n"
           "This is free software; see the source for copying conditions.\n"
diff --git a/tools/dbus-launch.1 b/tools/dbus-launch.1
index 33f0d239..a3180f69 100644
--- a/tools/dbus-launch.1
+++ b/tools/dbus-launch.1
@@ -40,7 +40,7 @@ know which shell your script is written in.
 
 .PP
 See http://www.freedesktop.org/software/dbus/ for more information
-about D-BUS. See also the man page for \fIdbus-daemon\fP.
+about D-Bus. See also the man page for \fIdbus-daemon\fP.
 
 .PP
 Here is an example of how to use \fIdbus-launch\fP with an 
@@ -51,7 +51,7 @@ sh-compatible shell to start the per-session bus daemon:
   if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
       ## if not found, launch a new one
       eval `dbus-launch --sh-syntax --exit-with-session`
-      echo "D-BUS per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS"
+      echo "D-Bus per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS"
   fi
 
 .fi
@@ -101,5 +101,5 @@ Print the version of dbus-launch
 See http://www.freedesktop.org/software/dbus/doc/AUTHORS
 
 .SH BUGS
-Please send bug reports to the D-BUS mailing list or bug tracker,
+Please send bug reports to the D-Bus mailing list or bug tracker,
 see http://www.freedesktop.org/software/dbus/
diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
index 477a0778..757e833e 100644
--- a/tools/dbus-launch.c
+++ b/tools/dbus-launch.c
@@ -87,7 +87,7 @@ usage (int ecode)
 static void
 version (void)
 {
-  printf ("D-BUS Message Bus Launcher %s\n"
+  printf ("D-Bus Message Bus Launcher %s\n"
           "Copyright (C) 2003 Red Hat, Inc.\n"
           "This is free software; see the source for copying conditions.\n"
           "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n",
diff --git a/tools/dbus-monitor.1 b/tools/dbus-monitor.1
index 6a8a2126..faeaa5e0 100644
--- a/tools/dbus-monitor.1
+++ b/tools/dbus-monitor.1
@@ -14,7 +14,7 @@ dbus-monitor \- debug probe to print message bus messages
 .SH DESCRIPTION
 
 The \fIdbus-monitor\fP command is used to monitor messages going
-through a D-BUS message bus.  See
+through a D-Bus message bus.  See
 http://www.freedesktop.org/software/dbus/ for more information about
 the big picture.
 
@@ -56,5 +56,5 @@ monitor to say things
 dbus-monitor was written by Philip Blundell.
 
 .SH BUGS
-Please send bug reports to the D-BUS mailing list or bug tracker,
+Please send bug reports to the D-Bus mailing list or bug tracker,
 see http://www.freedesktop.org/software/dbus/
diff --git a/tools/dbus-send.1 b/tools/dbus-send.1
index 0b846045..0dad6e8f 100644
--- a/tools/dbus-send.1
+++ b/tools/dbus-send.1
@@ -13,7 +13,7 @@ dbus-send \- Send a message to a message bus
 
 .SH DESCRIPTION
 
-The \fIdbus-send\fP command is used to send a message to a D-BUS message
+The \fIdbus-send\fP command is used to send a message to a D-Bus message
 bus. See http://www.freedesktop.org/software/dbus/ for more 
 information about the big picture.
 
@@ -35,7 +35,7 @@ The object path and the name of the message to send must always be
 specified. Following arguments, if any, are the message contents
 (message arguments).  These are given as a type name, a colon, and
 then the value of the argument. The possible type names are: string,
-int32, uint32, double, byte, boolean.  (D-BUS supports more types than
+int32, uint32, double, byte, boolean.  (D-Bus supports more types than
 these, but \fIdbus-send\fP currently does not.)
 
 .PP
@@ -75,5 +75,5 @@ Specify "method_call" or "signal" (defaults to "signal").
 dbus-send was written by Philip Blundell.
 
 .SH BUGS
-Please send bug reports to the D-BUS mailing list or bug tracker,
+Please send bug reports to the D-Bus mailing list or bug tracker,
 see http://www.freedesktop.org/software/dbus/
diff --git a/tools/dbus-send.c b/tools/dbus-send.c
index 375fadd9..a87d204a 100644
--- a/tools/dbus-send.c
+++ b/tools/dbus-send.c
@@ -339,7 +339,7 @@ main (int argc, char *argv[])
 
   if (message == NULL)
     {
-      fprintf (stderr, "Couldn't allocate D-BUS message\n");
+      fprintf (stderr, "Couldn't allocate D-Bus message\n");
       exit (1);
     }
 
diff --git a/tools/dbus-viewer.c b/tools/dbus-viewer.c
index 2ff3267f..0457eabd 100644
--- a/tools/dbus-viewer.c
+++ b/tools/dbus-viewer.c
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-viewer.c Graphical D-BUS frontend utility
+/* dbus-viewer.c Graphical D-Bus frontend utility
  *
  * Copyright (C) 2003 Red Hat, Inc.
  *
@@ -408,7 +408,7 @@ tree_window_new (DBusGConnection *connection,
   w = g_new0 (TreeWindow, 1);
   w->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
-  gtk_window_set_title (GTK_WINDOW (w->window), "D-BUS Viewer");
+  gtk_window_set_title (GTK_WINDOW (w->window), "D-Bus Viewer");
   gtk_window_set_default_size (GTK_WINDOW (w->window), 400, 500);
 
   g_signal_connect (w->window, "destroy", G_CALLBACK (window_closed_callback),
@@ -473,7 +473,7 @@ usage (int ecode)
 static void
 version (void)
 {
-  printf ("D-BUS Message Bus Viewer %s\n"
+  printf ("D-Bus Message Bus Viewer %s\n"
           "Copyright (C) 2003 Red Hat, Inc.\n"
           "This is free software; see the source for copying conditions.\n"
           "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n",