diff options
| author | naddy@openbsd.org <naddy@openbsd.org> | 2017-05-05 10:41:58 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-05-08 09:18:27 +1000 |
| commit | 2e9c324b3a7f15c092d118c2ac9490939f6228fd (patch) | |
| tree | 55dd6bf4a7d6ea70bc6b4cf20ef6e742b887dde2 /ssh.1 | |
| parent | 744bde79c3361e2153cb395a2ecdcee6c713585d (diff) | |
upstream commit
remove superfluous protocol 2 mentions; ok jmc@
Upstream-ID: 0aaf7567c9f2e50fac5906b6a500a39c33c4664d
Diffstat (limited to 'ssh.1')
| -rw-r--r-- | ssh.1 | 7 |
1 files changed, 3 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.380 2017/05/03 21:49:18 naddy Exp $ | 36 | .\" $OpenBSD: ssh.1,v 1.381 2017/05/05 10:41:58 naddy Exp $ |
| 37 | .Dd $Mdocdate: May 3 2017 $ | 37 | .Dd $Mdocdate: May 5 2017 $ |
| 38 | .Dt SSH 1 | 38 | .Dt SSH 1 |
| 39 | .Os | 39 | .Os |
| 40 | .Sh NAME | 40 | .Sh NAME |
| @@ -271,8 +271,7 @@ The default is | |||
| 271 | .Pa ~/.ssh/id_ecdsa , | 271 | .Pa ~/.ssh/id_ecdsa , |
| 272 | .Pa ~/.ssh/id_ed25519 | 272 | .Pa ~/.ssh/id_ed25519 |
| 273 | and | 273 | and |
| 274 | .Pa ~/.ssh/id_rsa | 274 | .Pa ~/.ssh/id_rsa . |
| 275 | for protocol version 2. | ||
| 276 | Identity files may also be specified on | 275 | Identity files may also be specified on |
| 277 | a per-host basis in the configuration file. | 276 | a per-host basis in the configuration file. |
| 278 | It is possible to have multiple | 277 | It is possible to have multiple |