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

36 files changed, 77 insertions, 77 deletions

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 5ceb89d2..088b6e36 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -110,7 +110,7 @@ DBUS_SHARED_SOURCES=				\
 
 ### source code that is generic utility functionality used
 ### by the bus daemon or test apps, but is NOT included
-### in the D-BUS client library (all symbols in here 
+### in the D-Bus client library (all symbols in here 
 ### should be underscore-prefixed but don't really need 
 ### to be unless they move to DBUS_SHARED_SOURCES later)
 DBUS_UTIL_SOURCES=				\
diff --git a/dbus/dbus-address.c b/dbus/dbus-address.c
index b6bea780..7dc33e3e 100644
--- a/dbus/dbus-address.c
+++ b/dbus/dbus-address.c
@@ -32,7 +32,7 @@
 /**
  * @defgroup DBusAddressInternals Address parsing
  * @ingroup  DBusInternals
- * @brief Implementation of parsing addresses of D-BUS servers.
+ * @brief Implementation of parsing addresses of D-Bus servers.
  *
  * @{
  */
@@ -83,7 +83,7 @@ dbus_address_entry_free (DBusAddressEntry *entry)
 /**
  * @defgroup DBusAddress Address parsing
  * @ingroup  DBus
- * @brief Parsing addresses of D-BUS servers.
+ * @brief Parsing addresses of D-Bus servers.
  *
  * @{
  */
@@ -177,7 +177,7 @@ dbus_address_entry_get_value (DBusAddressEntry *entry,
 
 /**
  * Appends an escaped version of one string to another string,
- * using the D-BUS address escaping mechanism
+ * using the D-Bus address escaping mechanism
  *
  * @param escaped the string to append to
  * @param unescaped the string to escape
@@ -257,7 +257,7 @@ append_unescaped_value (DBusString       *unescaped,
           if ((p + 2) > end)
             {
               dbus_set_error (error, DBUS_ERROR_BAD_ADDRESS,
-                              "In D-BUS address, percent character was not followed by two hex digits");
+                              "In D-Bus address, percent character was not followed by two hex digits");
               goto out;
             }
             
@@ -276,7 +276,7 @@ append_unescaped_value (DBusString       *unescaped,
           if (hex_end != 2)
             {
               dbus_set_error (error, DBUS_ERROR_BAD_ADDRESS,
-                              "In D-BUS address, percent character was followed by characters other than hex digits");
+                              "In D-Bus address, percent character was followed by characters other than hex digits");
               goto out;
             }
         }
@@ -284,7 +284,7 @@ append_unescaped_value (DBusString       *unescaped,
         {
           /* Error, should have been escaped */
           dbus_set_error (error, DBUS_ERROR_BAD_ADDRESS,
-                          "In D-BUS address, character '%c' should have been escaped\n",
+                          "In D-Bus address, character '%c' should have been escaped\n",
                           *p);
           goto out;
         }
@@ -308,7 +308,7 @@ append_unescaped_value (DBusString       *unescaped,
  *
  * method:key=value,key=value;method:key=value
  *
- * See the D-BUS specification for complete docs on the format.
+ * See the D-Bus specification for complete docs on the format.
  * 
  * @param address the address.
  * @param entry return location to an array of entries.
@@ -524,7 +524,7 @@ dbus_parse_address (const char         *address,
 
 /**
  * Escapes the given string as a value in a key=value pair
- * for a D-BUS address.
+ * for a D-Bus address.
  *
  * @param value the unescaped value
  * @returns newly-allocated escaped value or #NULL if no memory
@@ -556,7 +556,7 @@ dbus_address_escape_value (const char *value)
 
 /**
  * Unescapes the given string as a value in a key=value pair
- * for a D-BUS address.
+ * for a D-Bus address.
  *
  * @param value the escaped value
  * @param error error to set if the unescaping fails
diff --git a/dbus/dbus-auth-script.c b/dbus/dbus-auth-script.c
index 10bf7038..3cb86d0f 100644
--- a/dbus/dbus-auth-script.c
+++ b/dbus/dbus-auth-script.c
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-auth-script.c Test DBusAuth using a special script file (internal to D-BUS implementation)
+/* dbus-auth-script.c Test DBusAuth using a special script file (internal to D-Bus implementation)
  * 
  * Copyright (C) 2003 Red Hat, Inc.
  *
diff --git a/dbus/dbus-auth-script.h b/dbus/dbus-auth-script.h
index 1c7c5c70..a296c2b2 100644
--- a/dbus/dbus-auth-script.h
+++ b/dbus/dbus-auth-script.h
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-auth-script.h Test DBusAuth using a special script file (internal to D-BUS implementation)
+/* dbus-auth-script.h Test DBusAuth using a special script file (internal to D-Bus implementation)
  * 
  * Copyright (C) 2003 Red Hat, Inc.
  *
diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c
index 2c14ea81..e4966a41 100644
--- a/dbus/dbus-bus.c
+++ b/dbus/dbus-bus.c
@@ -670,7 +670,7 @@ dbus_bus_get_unix_user (DBusConnection *connection,
 /**
  * Asks the bus to assign the given name to this connection by invoking
  * the RequestName method on the bus. This method is fully documented
- * in the D-BUS specification. For quick reference, the flags and
+ * in the D-Bus specification. For quick reference, the flags and
  * result codes are discussed here, but the specification is the
  * canonical version of this information.
  *
@@ -797,7 +797,7 @@ dbus_bus_request_name (DBusConnection *connection,
 /**
  * Asks the bus to unassign the given name to this connection by invoking
  * the ReleaseName method on the bus. This method is fully documented
- * in the D-BUS specification.
+ * in the D-Bus specification.
  *
  * @param connection the connection
  * @param name the name to remove 
@@ -1047,7 +1047,7 @@ send_no_return_values (DBusConnection *connection,
  * but that would require blocking always to determine
  * the return value.
  *
- * The AddMatch method is fully documented in the D-BUS 
+ * The AddMatch method is fully documented in the D-Bus 
  * specification. For quick reference, the format of the 
  * match rules is discussed here, but the specification 
  * is the canonical version of this information.
diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index 3fa798f4..73888d41 100644
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -105,7 +105,7 @@
  * dbus_connection_set_dispatch_status_function() allows
  * you to set a function to be used to monitor the dispatch status.
  *
- * If you're using GLib or Qt add-on libraries for D-BUS, there are
+ * If you're using GLib or Qt add-on libraries for D-Bus, there are
  * special convenience APIs in those libraries that hide
  * all the details of dispatch and watch/timeout monitoring.
  * For example, dbus_connection_setup_with_g_main().
diff --git a/dbus/dbus-errors.c b/dbus/dbus-errors.c
index a53041e7..d8f8aa60 100644
--- a/dbus/dbus-errors.c
+++ b/dbus/dbus-errors.c
@@ -111,7 +111,7 @@ message_from_error (const char *error)
  * Types and functions related to reporting errors.
  *
  *
- * In essence D-BUS error reporting works as follows:
+ * In essence D-Bus error reporting works as follows:
  *
  * @code
  * DBusError error;
@@ -124,7 +124,7 @@ message_from_error (const char *error)
  *   }
  * @endcode
  *
- * There are some rules. An error passed to a D-BUS function must
+ * There are some rules. An error passed to a D-Bus function must
  * always be unset; you can't pass in an error that's already set.  If
  * a function has a return code indicating whether an error occurred,
  * and also a #DBusError parameter, then the error will always be set
@@ -192,7 +192,7 @@ dbus_error_free (DBusError *error)
  * Assigns an error name and message to a DBusError.  Does nothing if
  * error is #NULL. The message may be NULL, which means a default
  * message will be deduced from the name. If the error name is unknown
- * to D-BUS the default message will be totally useless, though.
+ * to D-Bus the default message will be totally useless, though.
  *
  * @param error the error.
  * @param name the error name (not copied!!!)
@@ -298,7 +298,7 @@ dbus_error_is_set (const DBusError *error)
  * Does nothing if error is #NULL.
  *
  * The format may be NULL, which means a default message will be
- * deduced from the name. If the error name is unknown to D-BUS the
+ * deduced from the name. If the error name is unknown to D-Bus the
  * default message will be totally useless, though.
  *
  * If no memory can be allocated for the error message, 
diff --git a/dbus/dbus-hash.c b/dbus/dbus-hash.c
index 8eca2bd8..c86472fb 100644
--- a/dbus/dbus-hash.c
+++ b/dbus/dbus-hash.c
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-hash.c Generic hash table utility (internal to D-BUS implementation)
+/* dbus-hash.c Generic hash table utility (internal to D-Bus implementation)
  * 
  * Copyright (C) 2002  Red Hat, Inc.
  * Copyright (c) 1991-1993 The Regents of the University of California.
@@ -7,7 +7,7 @@
  * 
  * Hash table implementation based on generic/tclHash.c from the Tcl
  * source code. The original Tcl license applies to portions of the
- * code from tclHash.c; the Tcl license follows this standad D-BUS
+ * code from tclHash.c; the Tcl license follows this standad D-Bus 
  * license information.
  *
  * Licensed under the Academic Free License version 2.1
diff --git a/dbus/dbus-hash.h b/dbus/dbus-hash.h
index 3eb82d04..0d1e322b 100644
--- a/dbus/dbus-hash.h
+++ b/dbus/dbus-hash.h
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-hash.h Generic hash table utility (internal to D-BUS implementation)
+/* dbus-hash.h Generic hash table utility (internal to D-Bus implementation)
  * 
  * Copyright (C) 2002  Red Hat, Inc.
  *
diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c
index c964fec1..b140da84 100644
--- a/dbus/dbus-internals.c
+++ b/dbus/dbus-internals.c
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-internals.c  random utility stuff (internal to D-BUS implementation)
+/* dbus-internals.c  random utility stuff (internal to D-Bus implementation)
  *
  * Copyright (C) 2002, 2003  Red Hat, Inc.
  *
@@ -33,8 +33,8 @@
 #include <stdlib.h>
 
 /**
- * @defgroup DBusInternals D-BUS internal implementation details
- * @brief Documentation useful when developing or debugging D-BUS itself.
+ * @defgroup DBusInternals D-Bus internal implementation details
+ * @brief Documentation useful when developing or debugging D-Bus itself.
  * 
  */
 
@@ -447,7 +447,7 @@ _dbus_header_field_to_string (int header_field)
 /** String used in _dbus_return_if_fail macro */
 const char _dbus_return_if_fail_warning_format[] =
 "%lu: arguments to %s() were incorrect, assertion \"%s\" failed in file %s line %d.\n"
-"This is normally a bug in some application using the D-BUS library.\n";
+"This is normally a bug in some application using the D-Bus library.\n";
 #endif
 
 #ifndef DBUS_DISABLE_ASSERT
diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h
index 88530947..5d0d2498 100644
--- a/dbus/dbus-internals.h
+++ b/dbus/dbus-internals.h
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-internals.h  random utility stuff (internal to D-BUS implementation)
+/* dbus-internals.h  random utility stuff (internal to D-Bus implementation)
  *
  * Copyright (C) 2002, 2003  Red Hat, Inc.
  *
diff --git a/dbus/dbus-list.c b/dbus/dbus-list.c
index 438ccb85..394db5f5 100644
--- a/dbus/dbus-list.c
+++ b/dbus/dbus-list.c
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-list.c Generic linked list utility (internal to D-BUS implementation)
+/* dbus-list.c Generic linked list utility (internal to D-Bus implementation)
  * 
  * Copyright (C) 2002  Red Hat, Inc.
  *
diff --git a/dbus/dbus-list.h b/dbus/dbus-list.h
index c1c43a65..77e878ce 100644
--- a/dbus/dbus-list.h
+++ b/dbus/dbus-list.h
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-list.h Generic linked list utility (internal to D-BUS implementation)
+/* dbus-list.h Generic linked list utility (internal to D-Bus implementation)
  * 
  * Copyright (C) 2002, 2003 Red Hat, Inc.
  *
diff --git a/dbus/dbus-macros.h b/dbus/dbus-macros.h
index 51288e48..abcb12a3 100644
--- a/dbus/dbus-macros.h
+++ b/dbus/dbus-macros.h
@@ -64,14 +64,14 @@
 /**
  * @def DBUS_BEGIN_DECLS
  *
- * Macro used prior to declaring functions in the D-BUS header
+ * Macro used prior to declaring functions in the D-Bus header
  * files. Expands to "extern "C"" when using a C++ compiler,
  * and expands to nothing when using a C compiler.
  */
 /**
  * @def DBUS_END_DECLS
  *
- * Macro used after declaring functions in the D-BUS header
+ * Macro used after declaring functions in the D-Bus header
  * files. Expands to "}" when using a C++ compiler,
  * and expands to nothing when using a C compiler.
  */
diff --git a/dbus/dbus-marshal-recursive.c b/dbus/dbus-marshal-recursive.c
index 1427a803..8a8525f0 100644
--- a/dbus/dbus-marshal-recursive.c
+++ b/dbus/dbus-marshal-recursive.c
@@ -1441,7 +1441,7 @@ reader_set_basic_fixed_length (DBusTypeReader *reader,
  * type and value strings and set_basic would be a method on that
  * object... this would also make DBusTypeReader the same thing as
  * DBusTypeMark. But since DBusMessage is effectively that object for
- * D-BUS it doesn't seem worth creating some random object.)
+ * D-Bus it doesn't seem worth creating some random object.)
  *
  * @todo optimize this by only rewriting until the old and new values
  * are at the same alignment. Frequently this should result in only
@@ -1564,7 +1564,7 @@ _dbus_type_reader_greater_than (const DBusTypeReader  *lhs,
 
 /**
  * Initialize a write iterator, which is used to write out values in
- * serialized D-BUS format.
+ * serialized D-Bus format.
  *
  * The type_pos passed in is expected to be inside an already-valid,
  * though potentially empty, type signature. This means that the byte
diff --git a/dbus/dbus-marshal-validate.c b/dbus/dbus-marshal-validate.c
index 11131060..f263d3a8 100644
--- a/dbus/dbus-marshal-validate.c
+++ b/dbus/dbus-marshal-validate.c
@@ -693,7 +693,7 @@ _dbus_validate_body_with_reason (const DBusString *expected_signature,
 
 /**
  * Checks that the given range of the string is a valid object path
- * name in the D-BUS protocol. Part of the validation ensures that
+ * name in the D-Bus protocol. Part of the validation ensures that
  * the object path contains only ASCII.
  *
  * @todo this is inconsistent with most of DBusString in that
@@ -761,7 +761,7 @@ _dbus_validate_path (const DBusString  *str,
 
 /**
  * Checks that the given range of the string is a valid interface name
- * in the D-BUS protocol. This includes a length restriction and an
+ * in the D-Bus protocol. This includes a length restriction and an
  * ASCII subset, see the specification.
  *
  * @todo this is inconsistent with most of DBusString in that
@@ -837,7 +837,7 @@ _dbus_validate_interface (const DBusString  *str,
 
 /**
  * Checks that the given range of the string is a valid member name
- * in the D-BUS protocol. This includes a length restriction, etc.,
+ * in the D-Bus protocol. This includes a length restriction, etc.,
  * see the specification.
  *
  * @todo this is inconsistent with most of DBusString in that
@@ -898,7 +898,7 @@ _dbus_validate_member (const DBusString  *str,
 
 /**
  * Checks that the given range of the string is a valid error name
- * in the D-BUS protocol. This includes a length restriction, etc.,
+ * in the D-Bus protocol. This includes a length restriction, etc.,
  * see the specification.
  *
  * @todo this is inconsistent with most of DBusString in that
@@ -939,7 +939,7 @@ _dbus_validate_error_name (const DBusString  *str,
 
 /**
  * Checks that the given range of the string is a valid bus name in
- * the D-BUS protocol. This includes a length restriction, etc., see
+ * the D-Bus protocol. This includes a length restriction, etc., see
  * the specification.
  *
  * @todo this is inconsistent with most of DBusString in that
@@ -1039,7 +1039,7 @@ _dbus_validate_bus_name (const DBusString  *str,
 
 /**
  * Checks that the given range of the string is a valid message type
- * signature in the D-BUS protocol.
+ * signature in the D-Bus protocol.
  *
  * @todo this is inconsistent with most of DBusString in that
  * it allows a start,len range that extends past the string end.
diff --git a/dbus/dbus-md5.c b/dbus/dbus-md5.c
index 9f025c51..079b1cc0 100644
--- a/dbus/dbus-md5.c
+++ b/dbus/dbus-md5.c
@@ -54,7 +54,7 @@
  * The implementation of MD5 (see http://www.ietf.org/rfc/rfc1321.txt).
  * This MD5 implementation was written by L. Peter Deutsch and
  * is not derived from the RSA reference implementation in the
- * RFC. The version included in D-BUS comes from the Ghostscript
+ * RFC. The version included in D-Bus comes from the Ghostscript
  * 7.05 distribution.
  *
  * @{
diff --git a/dbus/dbus-memory.c b/dbus/dbus-memory.c
index c36601ae..fbc02c1e 100644
--- a/dbus/dbus-memory.c
+++ b/dbus/dbus-memory.c
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-memory.c  D-BUS memory handling
+/* dbus-memory.c  D-Bus memory handling
  *
  * Copyright (C) 2002, 2003  Red Hat Inc.
  *
@@ -741,14 +741,14 @@ _dbus_register_shutdown_func (DBusShutdownFunction  func,
  */
 
 /**
- * The D-BUS library keeps some internal global variables, for example
+ * The D-Bus library keeps some internal global variables, for example
  * to cache the username of the current process.  This function is
  * used to free these global variables.  It is really useful only for
  * leak-checking cleanliness and the like. WARNING: this function is
  * NOT thread safe, it must be called while NO other threads are using
- * D-BUS. You cannot continue using D-BUS after calling this function,
+ * D-Bus. You cannot continue using D-Bus after calling this function,
  * as it does things like free global mutexes created by
- * dbus_threads_init(). To use a D-BUS function after calling
+ * dbus_threads_init(). To use a D-Bus function after calling
  * dbus_shutdown(), you have to start over from scratch, e.g. calling
  * dbus_threads_init() again.
  */
diff --git a/dbus/dbus-memory.h b/dbus/dbus-memory.h
index 9982d2f1..7f6c275d 100644
--- a/dbus/dbus-memory.h
+++ b/dbus/dbus-memory.h
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-memory.h  D-BUS memory handling
+/* dbus-memory.h  D-Bus memory handling
  *
  * Copyright (C) 2002  Red Hat Inc.
  *
diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index 06c75b06..f032f82a 100644
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -769,7 +769,7 @@ dbus_message_new (int message_type)
  * Constructs a new message to invoke a method on a remote
  * object. Returns #NULL if memory can't be allocated for the
  * message. The destination may be #NULL in which case no destination
- * is set; this is appropriate when using D-BUS in a peer-to-peer
+ * is set; this is appropriate when using D-Bus in a peer-to-peer
  * context (no message bus). The interface may be #NULL, which means
  * that if multiple methods with the given name exist it is undefined
  * which one will be invoked.
@@ -2871,7 +2871,7 @@ _dbus_message_has_type_interface_member (DBusMessage *message,
  * interface and member fields.  If the message is not
  * #DBUS_MESSAGE_TYPE_METHOD_CALL, or has a different interface or
  * member field, returns #FALSE. If the interface field is missing,
- * then it will be assumed equal to the provided interface.  The D-BUS
+ * then it will be assumed equal to the provided interface.  The D-Bus
  * protocol allows method callers to leave out the interface name.
  *
  * @param message the message
@@ -3684,7 +3684,7 @@ dbus_message_get_data (DBusMessage   *message,
 
 /**
  * Utility function to convert a machine-readable (not translated)
- * string into a D-BUS message type.
+ * string into a D-Bus message type.
  *
  * @code
  *   "method_call"    -> DBUS_MESSAGE_TYPE_METHOD_CALL
@@ -3711,7 +3711,7 @@ dbus_message_type_from_string (const char *type_str)
 }
 
 /**
- * Utility function to convert a D-BUS message type into a
+ * Utility function to convert a D-Bus message type into a
  * machine-readable string (not translated).
  *
  * @code
diff --git a/dbus/dbus-server-protected.h b/dbus/dbus-server-protected.h
index 7d09f64b..09eeb3bd 100644
--- a/dbus/dbus-server-protected.h
+++ b/dbus/dbus-server-protected.h
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-server-protected.h Used by subclasses of DBusServer object (internal to D-BUS implementation)
+/* dbus-server-protected.h Used by subclasses of DBusServer object (internal to D-Bus implementation)
  *
  * Copyright (C) 2002  Red Hat Inc.
  *
diff --git a/dbus/dbus-signature.c b/dbus/dbus-signature.c
index 8902b4ad..2adb665e 100644
--- a/dbus/dbus-signature.c
+++ b/dbus/dbus-signature.c
@@ -37,7 +37,7 @@ typedef struct
 /**
  * @defgroup DBusSignature Type signature parsing
  * @ingroup  DBus
- * @brief Parsing D-BUS type signatures
+ * @brief Parsing D-Bus type signatures
  * @{
  */
 
diff --git a/dbus/dbus-signature.h b/dbus/dbus-signature.h
index 5ebb59c0..f7dbb60b 100644
--- a/dbus/dbus-signature.h
+++ b/dbus/dbus-signature.h
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-signatures.h utility functions for D-BUS types
+/* dbus-signatures.h utility functions for D-Bus types
  *
  * Copyright (C) 2005 Red Hat Inc.
  *
diff --git a/dbus/dbus-string-private.h b/dbus/dbus-string-private.h
index d26aabe1..fbdde70a 100644
--- a/dbus/dbus-string-private.h
+++ b/dbus/dbus-string-private.h
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-string-private.h String utility class (internal to D-BUS implementation)
+/* dbus-string-private.h String utility class (internal to D-Bus implementation)
  * 
  * Copyright (C) 2002, 2003  Red Hat, Inc.
  *
diff --git a/dbus/dbus-string.c b/dbus/dbus-string.c
index 6bd3d57b..287fe1cc 100644
--- a/dbus/dbus-string.c
+++ b/dbus/dbus-string.c
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-string.c String utility class (internal to D-BUS implementation)
+/* dbus-string.c String utility class (internal to D-Bus implementation)
  * 
  * Copyright (C) 2002, 2003, 2004, 2005 Red Hat, Inc.
  *
@@ -2549,7 +2549,7 @@ _dbus_string_validate_utf8  (const DBusString *str,
   _dbus_assert (len >= 0);
 
   /* we are doing _DBUS_UNLIKELY() here which might be
-   * dubious in a generic library like GLib, but in D-BUS
+   * dubious in a generic library like GLib, but in D-Bus
    * we know we're validating messages and that it would
    * only be evil/broken apps that would have invalid
    * UTF-8. Also, this function seems to be a performance
@@ -2572,7 +2572,7 @@ _dbus_string_validate_utf8  (const DBusString *str,
         break;
       
       /* Special-case ASCII; this makes us go a lot faster in
-       * D-BUS profiles where we are typically validating
+       * D-Bus profiles where we are typically validating
        * function names and such. We have to know that
        * all following checks will pass for ASCII though,
        * comments follow ...
diff --git a/dbus/dbus-string.h b/dbus/dbus-string.h
index 522a99b7..854ed941 100644
--- a/dbus/dbus-string.h
+++ b/dbus/dbus-string.h
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-string.h String utility class (internal to D-BUS implementation)
+/* dbus-string.h String utility class (internal to D-Bus implementation)
  * 
  * Copyright (C) 2002, 2003 Red Hat, Inc.
  *
diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
index e935dfa9..e28ea667 100644
--- a/dbus/dbus-sysdeps.c
+++ b/dbus/dbus-sysdeps.c
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-sysdeps.c Wrappers around system/libc features (internal to D-BUS implementation)
+/* dbus-sysdeps.c Wrappers around system/libc features (internal to D-Bus implementation)
  * 
  * Copyright (C) 2002, 2003  Red Hat, Inc.
  * Copyright (C) 2003 CodeFactory AB
@@ -2653,7 +2653,7 @@ _dbus_disable_sigpipe (void)
 /**
  * Sets the file descriptor to be close
  * on exec. Should be called for all file
- * descriptors in D-BUS code.
+ * descriptors in D-Bus code.
  *
  * @param fd the file descriptor
  */
@@ -2876,7 +2876,7 @@ _dbus_print_backtrace (void)
 
   free (syms);
 #else
-  _dbus_verbose ("  D-BUS not compiled with backtrace support\n");
+  _dbus_verbose ("  D-Bus not compiled with backtrace support\n");
 #endif
 }
 #endif /* asserts or tests enabled */
diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h
index 04d7cd58..03ed28ec 100644
--- a/dbus/dbus-sysdeps.h
+++ b/dbus/dbus-sysdeps.h
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-sysdeps.h Wrappers around system/libc features (internal to D-BUS implementation)
+/* dbus-sysdeps.h Wrappers around system/libc features (internal to D-Bus implementation)
  * 
  * Copyright (C) 2002, 2003  Red Hat, Inc.
  * Copyright (C) 2003 CodeFactory AB
diff --git a/dbus/dbus-threads-internal.h b/dbus/dbus-threads-internal.h
index b90eea40..8cc3a7ac 100644
--- a/dbus/dbus-threads-internal.h
+++ b/dbus/dbus-threads-internal.h
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-threads-internal.h  D-BUS thread primitives
+/* dbus-threads-internal.h  D-Bus thread primitives
  *
  * Copyright (C) 2002, 2005 Red Hat Inc.
  *
diff --git a/dbus/dbus-threads.c b/dbus/dbus-threads.c
index fc83682d..f22d0a68 100644
--- a/dbus/dbus-threads.c
+++ b/dbus/dbus-threads.c
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-threads.h  D-BUS threads handling
+/* dbus-threads.h  D-Bus threads handling
  *
  * Copyright (C) 2002, 2003 Red Hat Inc.
  *
@@ -289,10 +289,10 @@ init_global_locks (void)
 /**
  * 
  * Initializes threads. If this function is not called,
- * the D-BUS library will not lock any data structures.
- * If it is called, D-BUS will do locking, at some cost
+ * the D-Bus library will not lock any data structures.
+ * If it is called, D-Bus will do locking, at some cost
  * in efficiency. Note that this function must be called
- * BEFORE using any other D-BUS functions.
+ * BEFORE using any other D-Bus functions.
  *
  * This function may be called more than once, as long
  * as you pass in the same functions each time. If it's
diff --git a/dbus/dbus-threads.h b/dbus/dbus-threads.h
index cf1c01d2..f5c3332a 100644
--- a/dbus/dbus-threads.h
+++ b/dbus/dbus-threads.h
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-threads.h  D-BUS threads handling
+/* dbus-threads.h  D-Bus threads handling
  *
  * Copyright (C) 2002  Red Hat Inc.
  *
@@ -67,7 +67,7 @@ typedef enum
 } DBusThreadFunctionsMask;
 
 /**
- * Functions that must be implemented to make the D-BUS
+ * Functions that must be implemented to make the D-Bus
  * library thread-aware. 
  */
 typedef struct
diff --git a/dbus/dbus-timeout.c b/dbus/dbus-timeout.c
index e684131e..72784660 100644
--- a/dbus/dbus-timeout.c
+++ b/dbus/dbus-timeout.c
@@ -142,7 +142,7 @@ _dbus_timeout_set_interval (DBusTimeout *timeout,
  * Changes the timeout's enabled-ness. Note that you should use
  * _dbus_connection_toggle_timeout_unlocked() etc. instead, if
  * the timeout is passed out to an application main loop.
- * i.e. you can't use this function in the D-BUS library, it's
+ * i.e. you can't use this function in the D-Bus library, it's
  * only used in the message bus daemon implementation.
  *
  * @param timeout the timeout
diff --git a/dbus/dbus-transport-protected.h b/dbus/dbus-transport-protected.h
index f3ad3370..b60151ef 100644
--- a/dbus/dbus-transport-protected.h
+++ b/dbus/dbus-transport-protected.h
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-transport-protected.h Used by subclasses of DBusTransport object (internal to D-BUS implementation)
+/* dbus-transport-protected.h Used by subclasses of DBusTransport object (internal to D-Bus implementation)
  *
  * Copyright (C) 2002, 2004  Red Hat Inc.
  *
diff --git a/dbus/dbus-transport.c b/dbus/dbus-transport.c
index cfc86e4a..ca5f747d 100644
--- a/dbus/dbus-transport.c
+++ b/dbus/dbus-transport.c
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-transport.c DBusTransport object (internal to D-BUS implementation)
+/* dbus-transport.c DBusTransport object (internal to D-Bus implementation)
  *
  * Copyright (C) 2002, 2003  Red Hat Inc.
  *
diff --git a/dbus/dbus-watch.c b/dbus/dbus-watch.c
index dbc0fb48..019b8b1c 100644
--- a/dbus/dbus-watch.c
+++ b/dbus/dbus-watch.c
@@ -566,7 +566,7 @@ dbus_watch_get_enabled (DBusWatch *watch)
 
 
 /**
- * Called to notify the D-BUS library when a previously-added watch is
+ * Called to notify the D-Bus library when a previously-added watch is
  * ready for reading or writing, or has an exception such as a hangup.
  * 
  * If this function returns #FALSE, then the file descriptor may still
diff --git a/dbus/dbus.h b/dbus/dbus.h
index 2cec0751..4e11f7b8 100644
--- a/dbus/dbus.h
+++ b/dbus/dbus.h
@@ -27,7 +27,7 @@
 #define DBUS_INSIDE_DBUS_H 1
 
 #ifndef DBUS_API_SUBJECT_TO_CHANGE
-#error "Please define DBUS_API_SUBJECT_TO_CHANGE to acknowledge your understanding that D-BUS hasn't reached 1.0 and is subject to protocol and API churn. See the README for a full explanation."
+#error "Please define DBUS_API_SUBJECT_TO_CHANGE to acknowledge your understanding that D-Bus hasn't reached 1.0 and is subject to protocol and API churn. See the README for a full explanation."
 #endif
 
 #include <dbus/dbus-arch-deps.h>
@@ -48,11 +48,11 @@
 #undef DBUS_INSIDE_DBUS_H
 
 /**
- * @defgroup DBus D-BUS low-level public API
- * @brief The low-level public API of the D-BUS library
+ * @defgroup DBus D-Bus low-level public API
+ * @brief The low-level public API of the D-Bus library
  *
  * libdbus provides a low-level API intended primarily for use by
- * bindings to specific object systems and languages.  D-BUS is most
+ * bindings to specific object systems and languages.  D-Bus is most
  * convenient when used with the GLib bindings, Python bindings, Qt
  * bindings, Mono bindings, and so forth.  This low-level API has a
  * lot of complexity useful only for bindings.