[openssh-commits] [openssh] 05/10: upstream: undo merge error and replace the term "security key"

git+noreply at mindrot.org git+noreply at mindrot.org
Tue Jan 21 18:09:43 AEDT 2020


This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 84911da1beeb6ed258a43468efb316cd39fb6855
Author: naddy at openbsd.org <naddy at openbsd.org>
Date:   Sat Jan 18 15:45:41 2020 +0000

    upstream: undo merge error and replace the term "security key"
    
    again
    
    OpenBSD-Commit-ID: 341749062c089cc360a7877e9ee3a887aecde395
---
 ssh-keygen.1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 125add8f..1827a8fe 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ssh-keygen.1,v 1.191 2020/01/14 15:07:30 naddy Exp $
+.\"	$OpenBSD: ssh-keygen.1,v 1.192 2020/01/18 15:45:41 naddy Exp $
 .\"
 .\" Author: Tatu Ylonen <ylo at cs.hut.fi>
 .\" Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -35,7 +35,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: January 14 2020 $
+.Dd $Mdocdate: January 18 2020 $
 .Dt SSH-KEYGEN 1
 .Os
 .Sh NAME
@@ -923,7 +923,7 @@ Allows X11 forwarding.
 .It Ic no-touch-required
 Do not require signatures made using this key require demonstration
 of user presence (e.g. by having the user touch the key).
-This option only makes sense for the Security Key algorithms
+This option only makes sense for the FIDO authenticator algorithms
 .Cm ecdsa-sk
 and
 .Cm ed25519-sk .

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.


More information about the openssh-commits mailing list