summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2011-09-05 05:56:14 +0000
committerDamien Miller <djm@cvs.openbsd.org>2011-09-05 05:56:14 +0000
commit8f945125fe42d61444c799723629bf21394ec263 (patch)
treeb81c275ea91e54106876ac67faabfd2b6651e0e7 /usr.bin
parente043a33b0fadbe0dadae4bfa47b7c3b1f9acb0be (diff)
mention ControlPersist and KbdInteractiveAuthentication in the -o
verbiage in these pages too (prompted by jmc@)
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/scp.16
-rw-r--r--usr.bin/ssh/sftp.16
2 files changed, 8 insertions, 4 deletions
diff --git a/usr.bin/ssh/scp.1 b/usr.bin/ssh/scp.1
index 577dd52c1dd..5237d4719df 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.56 2010/12/09 14:13:32 jmc Exp $
+.\" $OpenBSD: scp.1,v 1.57 2011/09/05 05:56:13 djm Exp $
.\"
-.Dd $Mdocdate: December 9 2010 $
+.Dd $Mdocdate: September 5 2011 $
.Dt SCP 1
.Os
.Sh NAME
@@ -140,6 +140,7 @@ For full details of the options listed below, and their possible values, see
.It ConnectTimeout
.It ControlMaster
.It ControlPath
+.It ControlPersist
.It GlobalKnownHostsFile
.It GSSAPIAuthentication
.It GSSAPIDelegateCredentials
@@ -152,6 +153,7 @@ For full details of the options listed below, and their possible values, see
.It IdentityFile
.It IdentitiesOnly
.It IPQoS
+.It KbdInteractiveAuthentication
.It KbdInteractiveDevices
.It KexAlgorithms
.It LogLevel
diff --git a/usr.bin/ssh/sftp.1 b/usr.bin/ssh/sftp.1
index eb88014e201..bcb4721449f 100644
--- a/usr.bin/ssh/sftp.1
+++ b/usr.bin/ssh/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.90 2011/08/07 12:55:30 dtucker Exp $
+.\" $OpenBSD: sftp.1,v 1.91 2011/09/05 05:56:13 djm Exp $
.\"
.\" Copyright (c) 2001 Damien Miller. All rights reserved.
.\"
@@ -22,7 +22,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: August 7 2011 $
+.Dd $Mdocdate: September 5 2011 $
.Dt SFTP 1
.Os
.Sh NAME
@@ -194,6 +194,7 @@ For full details of the options listed below, and their possible values, see
.It ConnectTimeout
.It ControlMaster
.It ControlPath
+.It ControlPersist
.It GlobalKnownHostsFile
.It GSSAPIAuthentication
.It GSSAPIDelegateCredentials
@@ -206,6 +207,7 @@ For full details of the options listed below, and their possible values, see
.It IdentityFile
.It IdentitiesOnly
.It IPQoS
+.It KbdInteractiveAuthentication
.It KbdInteractiveDevices
.It KexAlgorithms
.It LogLevel