diff options
author | Damien Miller <djm@mindrot.org> | 2011-09-22 21:34:15 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-09-22 21:34:15 +1000 |
commit | e577772a89ba6ba37b3f9bbfebcc037c3711c138 (patch) | |
tree | 40185b3f399cede24275359260ea110228b6833b | |
parent | efad7275170c877e5ccb442b6eb99c7d3675622a (diff) |
- 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@)
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | scp.1 | 6 | ||||
-rw-r--r-- | sftp.1 | 6 |
3 files changed, 12 insertions, 4 deletions
@@ -20,6 +20,10 @@ | |||
20 | [ssh.1] | 20 | [ssh.1] |
21 | Add some missing ssh_config(5) options that can be used in ssh(1)'s | 21 | Add some missing ssh_config(5) options that can be used in ssh(1)'s |
22 | -o argument. Patch from duclare AT guu.fi | 22 | -o argument. Patch from duclare AT guu.fi |
23 | - djm@cvs.openbsd.org 2011/09/05 05:56:13 | ||
24 | [scp.1 sftp.1] | ||
25 | mention ControlPersist and KbdInteractiveAuthentication in the -o | ||
26 | verbiage in these pages too (prompted by jmc@) | ||
23 | 27 | ||
24 | 20110909 | 28 | 20110909 |
25 | - (dtucker) [entropy.h] Bug #1932: remove old definition of init_rng. From | 29 | - (dtucker) [entropy.h] Bug #1932: remove old definition of init_rng. From |
@@ -8,9 +8,9 @@ | |||
8 | .\" | 8 | .\" |
9 | .\" Created: Sun May 7 00:14:37 1995 ylo | 9 | .\" Created: Sun May 7 00:14:37 1995 ylo |
10 | .\" | 10 | .\" |
11 | .\" $OpenBSD: scp.1,v 1.56 2010/12/09 14:13:32 jmc Exp $ | 11 | .\" $OpenBSD: scp.1,v 1.57 2011/09/05 05:56:13 djm Exp $ |
12 | .\" | 12 | .\" |
13 | .Dd $Mdocdate: December 9 2010 $ | 13 | .Dd $Mdocdate: September 5 2011 $ |
14 | .Dt SCP 1 | 14 | .Dt SCP 1 |
15 | .Os | 15 | .Os |
16 | .Sh NAME | 16 | .Sh NAME |
@@ -140,6 +140,7 @@ For full details of the options listed below, and their possible values, see | |||
140 | .It ConnectTimeout | 140 | .It ConnectTimeout |
141 | .It ControlMaster | 141 | .It ControlMaster |
142 | .It ControlPath | 142 | .It ControlPath |
143 | .It ControlPersist | ||
143 | .It GlobalKnownHostsFile | 144 | .It GlobalKnownHostsFile |
144 | .It GSSAPIAuthentication | 145 | .It GSSAPIAuthentication |
145 | .It GSSAPIDelegateCredentials | 146 | .It GSSAPIDelegateCredentials |
@@ -152,6 +153,7 @@ For full details of the options listed below, and their possible values, see | |||
152 | .It IdentityFile | 153 | .It IdentityFile |
153 | .It IdentitiesOnly | 154 | .It IdentitiesOnly |
154 | .It IPQoS | 155 | .It IPQoS |
156 | .It KbdInteractiveAuthentication | ||
155 | .It KbdInteractiveDevices | 157 | .It KbdInteractiveDevices |
156 | .It KexAlgorithms | 158 | .It KexAlgorithms |
157 | .It LogLevel | 159 | .It LogLevel |
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: sftp.1,v 1.90 2011/08/07 12:55:30 dtucker Exp $ | 1 | .\" $OpenBSD: sftp.1,v 1.91 2011/09/05 05:56:13 djm Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. | 3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. |
4 | .\" | 4 | .\" |
@@ -22,7 +22,7 @@ | |||
22 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 22 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
23 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 | .\" | 24 | .\" |
25 | .Dd $Mdocdate: August 7 2011 $ | 25 | .Dd $Mdocdate: September 5 2011 $ |
26 | .Dt SFTP 1 | 26 | .Dt SFTP 1 |
27 | .Os | 27 | .Os |
28 | .Sh NAME | 28 | .Sh NAME |
@@ -194,6 +194,7 @@ For full details of the options listed below, and their possible values, see | |||
194 | .It ConnectTimeout | 194 | .It ConnectTimeout |
195 | .It ControlMaster | 195 | .It ControlMaster |
196 | .It ControlPath | 196 | .It ControlPath |
197 | .It ControlPersist | ||
197 | .It GlobalKnownHostsFile | 198 | .It GlobalKnownHostsFile |
198 | .It GSSAPIAuthentication | 199 | .It GSSAPIAuthentication |
199 | .It GSSAPIDelegateCredentials | 200 | .It GSSAPIDelegateCredentials |
@@ -206,6 +207,7 @@ For full details of the options listed below, and their possible values, see | |||
206 | .It IdentityFile | 207 | .It IdentityFile |
207 | .It IdentitiesOnly | 208 | .It IdentitiesOnly |
208 | .It IPQoS | 209 | .It IPQoS |
210 | .It KbdInteractiveAuthentication | ||
209 | .It KbdInteractiveDevices | 211 | .It KbdInteractiveDevices |
210 | .It KexAlgorithms | 212 | .It KexAlgorithms |
211 | .It LogLevel | 213 | .It LogLevel |