diff options
author | jmc@openbsd.org <jmc@openbsd.org> | 2017-05-03 06:32:02 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-08 09:18:05 +1000 |
commit | 2b6f799e9b230cf13a7eefc05ecead7d8569d6b5 (patch) | |
tree | c0abc7946a2e79b528d4e2e8b59520b686d6c4ac /ssh.1 | |
parent | f10c0d32cde2084d2a0b19bc47d80cb93e85a093 (diff) |
upstream commit
more protocol 1 stuff to go; ok djm
Upstream-ID: 307a30441d2edda480fd1661d998d36665671e47
Diffstat (limited to 'ssh.1')
-rw-r--r-- | ssh.1 | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: ssh.1,v 1.378 2017/05/02 13:44:51 jmc Exp $ | 36 | .\" $OpenBSD: ssh.1,v 1.379 2017/05/03 06:32:02 jmc Exp $ |
37 | .Dd $Mdocdate: May 2 2017 $ | 37 | .Dd $Mdocdate: May 3 2017 $ |
38 | .Dt SSH 1 | 38 | .Dt SSH 1 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -1441,7 +1441,6 @@ Contains additional definitions for environment variables; see | |||
1441 | .Sx ENVIRONMENT , | 1441 | .Sx ENVIRONMENT , |
1442 | above. | 1442 | above. |
1443 | .Pp | 1443 | .Pp |
1444 | .It Pa ~/.ssh/identity | ||
1445 | .It Pa ~/.ssh/id_dsa | 1444 | .It Pa ~/.ssh/id_dsa |
1446 | .It Pa ~/.ssh/id_ecdsa | 1445 | .It Pa ~/.ssh/id_ecdsa |
1447 | .It Pa ~/.ssh/id_ed25519 | 1446 | .It Pa ~/.ssh/id_ed25519 |
@@ -1456,7 +1455,6 @@ It is possible to specify a passphrase when | |||
1456 | generating the key which will be used to encrypt the | 1455 | generating the key which will be used to encrypt the |
1457 | sensitive part of this file using 3DES. | 1456 | sensitive part of this file using 3DES. |
1458 | .Pp | 1457 | .Pp |
1459 | .It Pa ~/.ssh/identity.pub | ||
1460 | .It Pa ~/.ssh/id_dsa.pub | 1458 | .It Pa ~/.ssh/id_dsa.pub |
1461 | .It Pa ~/.ssh/id_ecdsa.pub | 1459 | .It Pa ~/.ssh/id_ecdsa.pub |
1462 | .It Pa ~/.ssh/id_ed25519.pub | 1460 | .It Pa ~/.ssh/id_ed25519.pub |