summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/scp.110
-rw-r--r--usr.bin/ssh/sftp.18
-rw-r--r--usr.bin/ssh/ssh.16
3 files changed, 5 insertions, 19 deletions
diff --git a/usr.bin/ssh/scp.1 b/usr.bin/ssh/scp.1
index 0431c7807fa..9b5229ab17e 100644
--- a/usr.bin/ssh/scp.1
+++ b/usr.bin/ssh/scp.1
@@ -8,9 +8,9 @@
.\"
.\" Created: Sun May 7 00:14:37 1995 ylo
.\"
-.\" $OpenBSD: scp.1,v 1.72 2017/04/30 23:28:12 djm Exp $
+.\" $OpenBSD: scp.1,v 1.73 2017/05/02 13:44:51 jmc Exp $
.\"
-.Dd $Mdocdate: April 30 2017 $
+.Dd $Mdocdate: May 2 2017 $
.Dt SCP 1
.Os
.Sh NAME
@@ -128,11 +128,8 @@ For full details of the options listed below, and their possible values, see
.It CertificateFile
.It ChallengeResponseAuthentication
.It CheckHostIP
-.It Cipher
.It Ciphers
.It Compression
-.It CompressionLevel
-.It ConnectionAttempts
.It ConnectTimeout
.It ControlMaster
.It ControlPath
@@ -162,14 +159,11 @@ For full details of the options listed below, and their possible values, see
.It PKCS11Provider
.It Port
.It PreferredAuthentications
-.It Protocol
.It ProxyCommand
.It ProxyJump
.It PubkeyAcceptedKeyTypes
.It PubkeyAuthentication
.It RekeyLimit
-.It RhostsRSAAuthentication
-.It RSAAuthentication
.It SendEnv
.It ServerAliveInterval
.It ServerAliveCountMax
diff --git a/usr.bin/ssh/sftp.1 b/usr.bin/ssh/sftp.1
index 05e008c5284..ec9d6ff67a6 100644
--- a/usr.bin/ssh/sftp.1
+++ b/usr.bin/ssh/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.106 2017/05/02 08:54:19 djm Exp $
+.\" $OpenBSD: sftp.1,v 1.107 2017/05/02 13:44:51 jmc Exp $
.\"
.\" Copyright (c) 2001 Damien Miller. All rights reserved.
.\"
@@ -197,11 +197,8 @@ For full details of the options listed below, and their possible values, see
.It CertificateFile
.It ChallengeResponseAuthentication
.It CheckHostIP
-.It Cipher
.It Ciphers
.It Compression
-.It CompressionLevel
-.It ConnectionAttempts
.It ConnectTimeout
.It ControlMaster
.It ControlPath
@@ -231,13 +228,10 @@ For full details of the options listed below, and their possible values, see
.It PKCS11Provider
.It Port
.It PreferredAuthentications
-.It Protocol
.It ProxyCommand
.It ProxyJump
.It PubkeyAuthentication
.It RekeyLimit
-.It RhostsRSAAuthentication
-.It RSAAuthentication
.It SendEnv
.It ServerAliveInterval
.It ServerAliveCountMax
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1
index 325742f9878..7ef599028a4 100644
--- a/usr.bin/ssh/ssh.1
+++ b/usr.bin/ssh/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