summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaddy@openbsd.org <naddy@openbsd.org>2020-01-18 15:45:41 +0000
committerDamien Miller <djm@mindrot.org>2020-01-21 18:09:09 +1100
commit84911da1beeb6ed258a43468efb316cd39fb6855 (patch)
treea049e6ae0d79a5a303555ccdf2af47e7930c0b79
parente8c06c4ee708720efec12cd1a6f78a3c6d76b7f0 (diff)
upstream: undo merge error and replace the term "security key"
again OpenBSD-Commit-ID: 341749062c089cc360a7877e9ee3a887aecde395
-rw-r--r--ssh-keygen.16
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 125add8f9..1827a8fee 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.191 2020/01/14 15:07:30 naddy Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.192 2020/01/18 15:45:41 naddy Exp $
2.\" 2.\"
3.\" Author: Tatu Ylonen <ylo@cs.hut.fi> 3.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -35,7 +35,7 @@
35.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 35.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
36.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 36.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37.\" 37.\"
38.Dd $Mdocdate: January 14 2020 $ 38.Dd $Mdocdate: January 18 2020 $
39.Dt SSH-KEYGEN 1 39.Dt SSH-KEYGEN 1
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -923,7 +923,7 @@ Allows X11 forwarding.
923.It Ic no-touch-required 923.It Ic no-touch-required
924Do not require signatures made using this key require demonstration 924Do not require signatures made using this key require demonstration
925of user presence (e.g. by having the user touch the key). 925of user presence (e.g. by having the user touch the key).
926This option only makes sense for the Security Key algorithms 926This option only makes sense for the FIDO authenticator algorithms
927.Cm ecdsa-sk 927.Cm ecdsa-sk
928and 928and
929.Cm ed25519-sk . 929.Cm ed25519-sk .