diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-10-31 17:01:43 +0100 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-10-31 17:01:43 +0100 |
| commit | ef5cfe5bbd8bb05a51afaf7ab313769eb9ef44b6 (patch) | |
| tree | 4d1361b6ba3a4aaa2d257b16cc947b50fb2effc7 /docs | |
| parent | 1ba1905abd72f34836b153f3348d618da6148f87 (diff) | |
| parent | 203cea22a3d33ac86d170af74f8c655f119c8c62 (diff) | |
| download | qemu-ef5cfe5bbd8bb05a51afaf7ab313769eb9ef44b6.tar.gz | |
Merge remote-tracking branch 'mjt/trivial-patches' into staging
* mjt/trivial-patches:
audio/mixeng_template.h: fix inline declaration
misc: Spelling and grammar fixes in comments
docs/ccid.txt: fix the typo
qapi: fix documentation example
.gitignore: ignore qmp-commands.txt
misc: New spelling fixes in comments
configure: create fsdev/ directory
Message-id: 1382779887-15971-1-git-send-email-mjt@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ccid.txt | 2 | ||||
| -rw-r--r-- | docs/qapi-code-gen.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/ccid.txt b/docs/ccid.txt index 8bbaa940c3..83c174db26 100644 --- a/docs/ccid.txt +++ b/docs/ccid.txt @@ -52,7 +52,7 @@ Configuring and building: Assuming you have a working smartcard on the host with the current user, using NSS, qemu acts as another NSS client using ccid-card-emulated: - qemu -usb -device usb-ccid -device ccid-card-emualated + qemu -usb -device usb-ccid -device ccid-card-emulated 4. Using ccid-card-emulated with certificates diff --git a/docs/qapi-code-gen.txt b/docs/qapi-code-gen.txt index 91f44d01b9..0728f36c65 100644 --- a/docs/qapi-code-gen.txt +++ b/docs/qapi-code-gen.txt @@ -164,7 +164,7 @@ This example allows using both of the following example objects: { "file": "my_existing_block_device_id" } { "file": { "driver": "file", "readonly": false, - 'filename': "/tmp/mydisk.qcow2" } } + "filename": "/tmp/mydisk.qcow2" } } === Commands === |