upstream: undo merge error and replace the term "security key"

again

OpenBSD-Commit-ID: 341749062c089cc360a7877e9ee3a887aecde395

diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 125add8f9ee1a77541d83cae7b24d866696e13ae..1827a8feed08598fd18daa6c691e85b5e1014d4d 100644 (file)
--- 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@cs.hut.fi>
 .\" Copyright (c) 1995 Tatu Ylonen <ylo@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 .