summaryrefslogtreecommitdiff
path: root/ssh.1
diff options
context:
space:
mode:
authorjmc@openbsd.org <jmc@openbsd.org>2017-05-02 13:44:51 +0000
committerDamien Miller <djm@mindrot.org>2017-05-08 09:18:04 +1000
commitd852603214defd93e054de2877b20cc79c19d0c6 (patch)
tree865fd1d9b2d7623a24b9c90c982038afa2e71e18 /ssh.1
parent8b60ce8d8111e604c711c4cdd9579ffe0edced74 (diff)
downloadopenssh-git-d852603214defd93e054de2877b20cc79c19d0c6.tar.gz
upstream commit
remove now obsolete protocol1 options from the -o lists; Upstream-ID: 828e478a440bc5f9947672c392420510a362b3dd
Diffstat (limited to 'ssh.1')
-rw-r--r--ssh.16
1 files changed, 2 insertions, 4 deletions
diff --git a/ssh.1 b/ssh.1
index 325742f9..7ef59902 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.377 2017/04/30 23:18:22 djm Exp $
-.Dd $Mdocdate: April 30 2017 $
+.\" $OpenBSD: ssh.1,v 1.378 2017/05/02 13:44:51 jmc Exp $
+.Dd $Mdocdate: May 2 2017 $
.Dt SSH 1
.Os
.Sh NAME
@@ -466,11 +466,9 @@ For full details of the options listed below, and their possible values, see
.It CertificateFile
.It ChallengeResponseAuthentication
.It CheckHostIP
-.It Cipher
.It Ciphers
.It ClearAllForwardings
.It Compression
-.It ConnectionAttempts
.It ConnectTimeout
.It ControlMaster
.It ControlPath