aboutsummaryrefslogtreecommitdiff
path: root/docs/ccid.txt
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2013-04-13 13:50:34 +0200
committerAurelien Jarno <aurelien@aurel32.net>2013-04-13 13:50:34 +0200
commit396a14a3be17edbcdf33ad2c94d6e1069464f9e0 (patch)
tree5a094259c3450e656a061d61fc980f3b93881d25 /docs/ccid.txt
parent0a9c2341de2e735166084538d000ed80182ff404 (diff)
parentc30d1aea1478cd55e8cfdf866afa39cd00bb4ea1 (diff)
Merge branch 'trivial-patches' of git://github.com/stefanha/qemu
* 'trivial-patches' of git://github.com/stefanha/qemu: cpu-exec: Allow "-d exec" in non-debug builds (drop CONFIG_DEBUG_EXEC) Typo, spelling and grammatical fixes linux-user: pass correct host flags to eventfd2 call target-moxie: Fix VMState registration
Diffstat (limited to 'docs/ccid.txt')
-rw-r--r--docs/ccid.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/ccid.txt b/docs/ccid.txt
index 450a66ad99..8bbaa940c3 100644
--- a/docs/ccid.txt
+++ b/docs/ccid.txt
@@ -24,7 +24,7 @@ information see the specification:
Revision 1.1
April 22rd, 2005
-Smartcard are used for authentication, single sign on, decryption in
+Smartcards are used for authentication, single sign on, decryption in
public/private schemes and digital signatures. A smartcard reader on the client
cannot be used on a guest with simple usb passthrough since it will then not be
available on the client, possibly locking the computer when it is "removed". On