From: Eric Blake <eblake@redhat.com>
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, wenchaoqemu@gmail.com, armbru@redhat.com,
lcapitulino@redhat.com
Subject: [Qemu-devel] [PATCH v2 for-2.1 1/5] docs: grammar fixes to qmp-events
Date: Wed, 23 Jul 2014 06:26:14 -0600 [thread overview]
Message-ID: <1406118378-11217-2-git-send-email-eblake@redhat.com> (raw)
In-Reply-To: <1406118378-11217-1-git-send-email-eblake@redhat.com>
When converting to qmp events, commits 7cfadb6b and a6330785
fixed some grammar as part of moving text between files. But
since dfab4892 later restored this file to the state prior to
qmp events, we have to do it again.
* docs/qmp/qmp-events.txt (RESET, SPICE_INITIALIZED): Tweak.
Signed-off-by: Eric Blake <eblake@redhat.com>
---
docs/qmp/qmp-events.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/qmp/qmp-events.txt b/docs/qmp/qmp-events.txt
index 4a6c2a2..524eadf 100644
--- a/docs/qmp/qmp-events.txt
+++ b/docs/qmp/qmp-events.txt
@@ -285,7 +285,7 @@ Example:
RESET
-----
-Emitted when the Virtual Machine is reseted.
+Emitted when the Virtual Machine is reset.
Data: None.
@@ -366,7 +366,7 @@ SPICE_INITIALIZED
-----------------
Emitted after initial handshake and authentication takes place (if any)
-and the SPICE channel is up'n'running
+and the SPICE channel is up and running
Data:
--
1.9.3
next prev parent reply other threads:[~2014-07-23 12:26 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-23 12:26 [Qemu-devel] [PATCH v2 for-2.1 0/5] docs: document remaining QMP events Eric Blake
2014-07-23 12:26 ` Eric Blake [this message]
2014-07-23 12:26 ` [Qemu-devel] [PATCH v2 for-2.1 2/5] docs: split SPICE_* event docs Eric Blake
2014-07-23 12:26 ` [Qemu-devel] [PATCH v2 for-2.1 3/5] docs: document missing SPICE_MIGRATE_COMPLETED event Eric Blake
2014-07-23 13:43 ` Markus Armbruster
2014-07-23 12:26 ` [Qemu-devel] [PATCH v2 for-2.1 4/5] docs: document missing POWERDOWN event Eric Blake
2014-07-23 14:11 ` Wenchao Xia
2014-07-23 12:26 ` [Qemu-devel] [PATCH v2 for-2.1 5/5] docs: document missing VSERPORT_CHANGE event Eric Blake
2014-07-23 13:44 ` [Qemu-devel] [PATCH v2 for-2.1 0/5] docs: document remaining QMP events Markus Armbruster
2014-07-23 14:12 ` Wenchao Xia
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1406118378-11217-2-git-send-email-eblake@redhat.com \
--to=eblake@redhat.com \
--cc=armbru@redhat.com \
--cc=lcapitulino@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=wenchaoqemu@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).