diff options
author | markm <markm@FreeBSD.org> | 2001-08-20 12:21:31 +0000 |
---|---|---|
committer | markm <markm@FreeBSD.org> | 2001-08-20 12:21:31 +0000 |
commit | 83e59be2f658dd3a79d19c79cb5e76b14fd75880 (patch) | |
tree | 2f63b7bcc01aa932c0e8fa96a3233683c096ad91 /usr.bin/telnet/telnet.1 | |
parent | 162b7bf01cdec6fdf0f84d400df0f67c2a0d35c0 (diff) | |
download | FreeBSD-src-83e59be2f658dd3a79d19c79cb5e76b14fd75880.zip FreeBSD-src-83e59be2f658dd3a79d19c79cb5e76b14fd75880.tar.gz |
Code merge and diff reduction between this and crypto telnet.
Also remove useless AUTHENTICATION code. We have never compiled this
here, and it is doubtful that it even works without crypto.
Diffstat (limited to 'usr.bin/telnet/telnet.1')
-rw-r--r-- | usr.bin/telnet/telnet.1 | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1 index 042b139..7e06a0b 100644 --- a/usr.bin/telnet/telnet.1 +++ b/usr.bin/telnet/telnet.1 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)telnet.1 8.5 (Berkeley) 3/1/94 +.\" @(#)telnet.1 8.6 (Berkeley) 6/1/94 .\" $FreeBSD$ .\" .Dd January 27, 2000 @@ -42,7 +42,7 @@ protocol .Sh SYNOPSIS .Nm -.Op Fl 468EFKLNacdfrux +.Op Fl 468EFKLNacdfruxy .Op Fl S Ar tos .Op Fl X Ar authtype .Op Fl e Ar escapechar @@ -209,6 +209,8 @@ addresses only (e.g., domain sockets, accessed with a file path). .It Fl x Turns on encryption of the data stream if possible. +.It Fl y +Suppresses encryption of the data stream. .It Ar host Indicates the official name, an alias, or the Internet address of a remote host. @@ -435,7 +437,7 @@ commands. The .Ic environ command is used to manipulate the -variables that my be sent through the +variables that may be sent through the .Dv TELNET ENVIRON option. The initial set of variables is taken from the users @@ -1046,10 +1048,10 @@ Displays the legal .Pq Ic unset commands. .El -.It Ic skey Ar sequence challenge +.It Ic opie Ar sequence challenge The -.Ic skey -command computes a response to the S/Key challenge. +.Ic opie +command computes a response to the OPIE challenge. .It Ic slc Ar state The .Ic slc |