summaryrefslogtreecommitdiff
path: root/ssh.1
diff options
context:
space:
mode:
authornaddy@openbsd.org <naddy@openbsd.org>2017-05-05 10:41:58 +0000
committerDamien Miller <djm@mindrot.org>2017-05-08 09:18:27 +1000
commit2e9c324b3a7f15c092d118c2ac9490939f6228fd (patch)
tree55dd6bf4a7d6ea70bc6b4cf20ef6e742b887dde2 /ssh.1
parent744bde79c3361e2153cb395a2ecdcee6c713585d (diff)
downloadopenssh-git-2e9c324b3a7f15c092d118c2ac9490939f6228fd.tar.gz
upstream commit
remove superfluous protocol 2 mentions; ok jmc@ Upstream-ID: 0aaf7567c9f2e50fac5906b6a500a39c33c4664d
Diffstat (limited to 'ssh.1')
-rw-r--r--ssh.17
1 files changed, 3 insertions, 4 deletions
diff --git a/ssh.1 b/ssh.1
index 1c5ad741..10633d92 100644
--- a/ssh.1
+++ b/ssh.1
@@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: ssh.1,v 1.380 2017/05/03 21:49:18 naddy Exp $
-.Dd $Mdocdate: May 3 2017 $
+.\" $OpenBSD: ssh.1,v 1.381 2017/05/05 10:41:58 naddy Exp $
+.Dd $Mdocdate: May 5 2017 $
.Dt SSH 1
.Os
.Sh NAME
@@ -271,8 +271,7 @@ The default is
.Pa ~/.ssh/id_ecdsa ,
.Pa ~/.ssh/id_ed25519
and
-.Pa ~/.ssh/id_rsa
-for protocol version 2.
+.Pa ~/.ssh/id_rsa .
Identity files may also be specified on
a per-host basis in the configuration file.
It is possible to have multiple