upstream commit

1. rlogin and rsh are long gone 2. protocol version isn't
 of core relevance here, and v1 is going away

ok markus@, deraadt@

Upstream-ID: 8b46bc94cf1ca7c8c1a75b1c958b2bb38d7579c8

diff --git a/ssh.1 b/ssh.1
index 4dd4c3b4e33fb1cd69d69e1ba8207aa88fea5279..c4b7250a5e463ab8c830dc74945d32567c91155c 100644 (file)
--- 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.364 2015/09/25 18:19:54 jmc Exp $
-.Dd $Mdocdate: September 25 2015 $
+.\" $OpenBSD: ssh.1,v 1.365 2015/11/06 00:31:41 mmcc Exp $
+.Dd $Mdocdate: November 6 2015 $
 .Dt SSH 1
 .Os
 .Sh NAME
@@ -70,8 +70,7 @@
 .Nm
 (SSH client) is a program for logging into a remote machine and for
 executing commands on a remote machine.
-It is intended to replace rlogin and rsh,
-and provide secure encrypted communications between
+It is intended to provide secure encrypted communications between
 two untrusted hosts over an insecure network.
 X11 connections, arbitrary TCP ports and
 .Ux Ns -domain
@@ -85,7 +84,7 @@ connects and logs into the specified
 name).
 The user must prove
 his/her identity to the remote machine using one of several methods
-depending on the protocol version used (see below).
+(see below).
 .Pp
 If
 .Ar command