From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 10 Jun 2011 15:45:34 +0000 (+0100)
Subject: Fix spelling/grammatical mistakes detected by Debian's lintian(1)
X-Git-Tag: dbus-1.4.14~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=638828526a9e7e4ff790c8949c65f3ee80a2cc79;p=thirdparty%2Fdbus.git

Fix spelling/grammatical mistakes detected by Debian's lintian(1)

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38284
Reviewed-by: Lennart Poettering <lennart@poettering.net>
---

diff --git a/README.cygwin b/README.cygwin
index 754b3e081..93e403ad8 100755
--- a/README.cygwin
+++ b/README.cygwin
@@ -1,7 +1,7 @@
 The cygwin dbus port is included in master branch of
 dbus git repository since 1.3.1.
 
-See cygwin/README for more informations about
+See cygwin/README for more information about
 the cygwin dbus port.
 
 The cygwin port of dbus is maintained by:
diff --git a/README.win b/README.win
index a871f96a7..eb26fa5c9 100644
--- a/README.win
+++ b/README.win
@@ -14,9 +14,9 @@ test not running yet and there is help needed to get them running.
 
 Building
 --------
-DBus could be build on windows using automake or cmake. See the
-file README for more informations.
-Special cmake build instructions could be found in cmake/readme-cmake.txt
+DBus can be built on windows using automake or cmake. See the
+file README for more information.
+Special cmake build instructions can be found in cmake/readme-cmake.txt
 
 
 windbus and dbus4win Ports
@@ -78,7 +78,7 @@ FAQ
 
 - Do you have any clue if dbus-win32 can run in a Windows CE environment?
 
-  dbus has been ported to wince, see README.wince for more informations
+  dbus has been ported to wince, see README.wince for more information
 
 - Do you know if the C++ binding made by OpenWengo will be easily portable to Windows?
 
diff --git a/bus/config-parser-trivial.c b/bus/config-parser-trivial.c
index f37b4fb4f..6ef50f8ea 100644
--- a/bus/config-parser-trivial.c
+++ b/bus/config-parser-trivial.c
@@ -188,7 +188,7 @@ bus_config_parser_start_element (BusConfigParser   *parser,
     default:
       {
         /* we really don't care about the others... */
-        _dbus_verbose (" START We dont care about '%s' type '%i'\n", element_name, parser->type);
+        _dbus_verbose (" START We don't care about '%s' type '%i'\n", element_name, parser->type);
         break;
       }
     }
@@ -289,7 +289,7 @@ bus_config_parser_content (BusConfigParser   *parser,
     default:
       {
         /* we don't care about the others... really */
-        _dbus_verbose (" CONTENTS We dont care '%s' type '%i'\n", _dbus_string_get_const_data (&content_sane), parser->type);
+        _dbus_verbose (" CONTENTS We don't care about '%s' type '%i'\n", _dbus_string_get_const_data (&content_sane), parser->type);
         break;
       }
     }
diff --git a/dbus/dbus-auth.c b/dbus/dbus-auth.c
index 270d85e41..d2c37a7a0 100644
--- a/dbus/dbus-auth.c
+++ b/dbus/dbus-auth.c
@@ -2067,7 +2067,7 @@ handle_client_state_waiting_for_agree_unix_fd(DBusAuth         *auth,
     case DBUS_AUTH_COMMAND_AGREE_UNIX_FD:
       _dbus_assert(auth->unix_fd_possible);
       auth->unix_fd_negotiated = TRUE;
-      _dbus_verbose("Sucessfully negotiated UNIX FD passing\n");
+      _dbus_verbose("Successfully negotiated UNIX FD passing\n");
       return send_begin (auth);
 
     case DBUS_AUTH_COMMAND_ERROR:
@@ -2794,7 +2794,7 @@ _dbus_auth_set_unix_fd_possible(DBusAuth *auth, dbus_bool_t b)
 }
 
 /**
- * Queries whether unix fd passing was sucessfully negotiated.
+ * Queries whether unix fd passing was successfully negotiated.
  *
  * @param auth the auth conversion
  * @returns #TRUE when unix fd passing was negotiated.
diff --git a/tools/dbus-launch-x11.c b/tools/dbus-launch-x11.c
index 0f344abea..c7e33309b 100644
--- a/tools/dbus-launch-x11.c
+++ b/tools/dbus-launch-x11.c
@@ -248,7 +248,7 @@ init_x_atoms (Display *display)
   user = getpwuid (getuid ());
   if (user == NULL)
     {
-      verbose ("Could not determine the user informations; aborting X11 integration.\n");
+      verbose ("Could not determine user information; aborting X11 integration.\n");
       return FALSE;
     }
   user_name = xstrdup(user->pw_name);