From e577772a89ba6ba37b3f9bbfebcc037c3711c138 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Thu, 22 Sep 2011 21:34:15 +1000
Subject: [PATCH]    - djm@cvs.openbsd.org 2011/09/05 05:56:13      [scp.1
 sftp.1]      mention ControlPersist and KbdInteractiveAuthentication in the
 -o      verbiage in these pages too (prompted by jmc@)

---
 ChangeLog | 4 ++++
 scp.1     | 6 ++++--
 sftp.1    | 6 ++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c1ef474f3..01822ab3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,10 @@
      [ssh.1]
      Add some missing ssh_config(5) options that can be used in ssh(1)'s
      -o argument. Patch from duclare AT guu.fi
+   - djm@cvs.openbsd.org 2011/09/05 05:56:13
+     [scp.1 sftp.1]
+     mention ControlPersist and KbdInteractiveAuthentication in the -o
+     verbiage in these pages too (prompted by jmc@)
 
 20110909
  - (dtucker) [entropy.h] Bug #1932: remove old definition of init_rng.  From
diff --git a/scp.1 b/scp.1
index 577dd52c1..5237d4719 100644
--- a/scp.1
+++ b/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/sftp.1 b/sftp.1
index eb88014e2..bcb472144 100644
--- a/sftp.1
+++ b/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