From 09af9b16613fd2bf3456da3847e2beb29ff5fdde Mon Sep 17 00:00:00 2001 From: Riyaz Faizullabhoy Date: Wed, 20 Apr 2016 23:07:54 -0700 Subject: [PATCH] Update docs with yubikey info for docker 1.11 Signed-off-by: Riyaz Faizullabhoy --- docs/advanced_usage.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/advanced_usage.md b/docs/advanced_usage.md index 10a07bbe8e..cad7342267 100644 --- a/docs/advanced_usage.md +++ b/docs/advanced_usage.md @@ -106,8 +106,7 @@ Notary can be used with Yubikey 4 keys, via a PKCS11 interface when the Yubikey has CCID mode enabled. The Yubikey will be prioritized to store root keys, and will require user touch-input for signing. - ->**Note**: Yubikey support for signing docker images is only supported in the experimental branch. +Note that Yubikey support is included with the Docker Engine 1.11 client for use with Docker Content Trust. Yubikey support requires Yubico PIV libraries