Merge remote-tracking branch 'stefanha/trivial-patches' into staging

diff --git a/docs/qapi-code-gen.txt b/docs/qapi-code-gen.txt
index b7befb5e48221dff4ad7429302d13d50ea98c553..f345866f57c4dffc4ed3d1a215fb84e740f54bda 100644 (file)
--- a/docs/qapi-code-gen.txt
+++ b/docs/qapi-code-gen.txt
@@ -229,7 +229,7 @@ in the schema. The following files are generated:
 $(prefix)qmp-marshal.c: command marshal/dispatch functions for each
                         QMP command defined in the schema. Functions
                         generated by qapi-visit.py are used to
-                        convert QObjects recieved from the wire into
+                        convert QObjects received from the wire into
                         function parameters, and uses the same
                         visitor functions to convert native C return
                         values to QObjects from transmission back

diff --git a/hw/pci-stub.c b/hw/pci-stub.c
index c5a0aa89794fe7886650677383865d9e22466b09..1fb105d51c9f6c737ab3c7ce313eaa06af54555e 100644 (file)
--- a/hw/pci-stub.c
+++ b/hw/pci-stub.c
@@ -1,5 +1,5 @@
 /*
- * PCI stubs for plathome that doesn't support pci bus.
+ * PCI stubs for platforms that don't support pci bus.
  *
  * Copyright (c) 2010 Isaku Yamahata <yamahata at valinux co jp>
  *                    VA Linux Systems Japan K.K.

diff --git a/libcacard/vscclient.c b/libcacard/vscclient.c
index a7b38340dcc3ef7976fea6cf8a755ab95572905f..2191f6038c0156284c99f34bb1714ae02e6c5edd 100644 (file)
--- a/libcacard/vscclient.c
+++ b/libcacard/vscclient.c
@@ -585,7 +585,7 @@ main(
                 printf(" recv APDU: ");
                 print_byte_array(pbSendBuffer, mhHeader.length);
             }
-            /* Transmit recieved APDU */
+            /* Transmit received APDU */
             dwSendLength = mhHeader.length;
             dwRecvLength = sizeof(pbRecvBuffer);
             reader = vreader_get_reader_by_id(mhHeader.reader_id);

diff --git a/qemu-ga.c b/qemu-ga.c
index 858d75a361df9f5e39accdee2020ad09496657bf..49320133c6edbe72817aaa1f63f44b9fb6b488db 100644 (file)
--- a/qemu-ga.c
+++ b/qemu-ga.c
@@ -51,7 +51,7 @@ static struct GAState *ga_state;
 
 static void quit_handler(int sig)
 {
-    g_debug("recieved signal num %d, quitting", sig);
+    g_debug("received signal num %d, quitting", sig);
 
     if (g_main_loop_is_running(ga_state->main_loop)) {
         g_main_loop_quit(ga_state->main_loop);