summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--scp.15
-rw-r--r--sftp.15
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1dc4f82e4..2b0f5c045 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -57,6 +57,9 @@
57 - jmc@cvs.openbsd.org 2010/09/23 13:34:43 57 - jmc@cvs.openbsd.org 2010/09/23 13:34:43
58 [sftp.c] 58 [sftp.c]
59 add [-l limit] to usage(); 59 add [-l limit] to usage();
60 - jmc@cvs.openbsd.org 2010/09/23 13:36:46
61 [scp.1 sftp.1]
62 add KexAlgorithms to the -o list;
60 63
6120100910 6420100910
62 - (dtucker) [openbsd-compat/port-linux.c] Check is_selinux_enabled for exact 65 - (dtucker) [openbsd-compat/port-linux.c] Check is_selinux_enabled for exact
diff --git a/scp.1 b/scp.1
index 82da30f4f..13a43f6b4 100644
--- a/scp.1
+++ b/scp.1
@@ -9,9 +9,9 @@
9.\" 9.\"
10.\" Created: Sun May 7 00:14:37 1995 ylo 10.\" Created: Sun May 7 00:14:37 1995 ylo
11.\" 11.\"
12.\" $OpenBSD: scp.1,v 1.51 2010/09/03 11:09:29 jmc Exp $ 12.\" $OpenBSD: scp.1,v 1.52 2010/09/23 13:36:46 jmc Exp $
13.\" 13.\"
14.Dd $Mdocdate: September 3 2010 $ 14.Dd $Mdocdate: September 23 2010 $
15.Dt SCP 1 15.Dt SCP 1
16.Os 16.Os
17.Sh NAME 17.Sh NAME
@@ -148,6 +148,7 @@ For full details of the options listed below, and their possible values, see
148.It IdentityFile 148.It IdentityFile
149.It IdentitiesOnly 149.It IdentitiesOnly
150.It KbdInteractiveDevices 150.It KbdInteractiveDevices
151.It KexAlgorithms
151.It LogLevel 152.It LogLevel
152.It MACs 153.It MACs
153.It NoHostAuthenticationForLocalhost 154.It NoHostAuthenticationForLocalhost
diff --git a/sftp.1 b/sftp.1
index b2a19b72d..0d253cc8f 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: sftp.1,v 1.85 2010/09/22 22:58:51 djm Exp $ 1.\" $OpenBSD: sftp.1,v 1.86 2010/09/23 13:36:46 jmc 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: September 22 2010 $ 25.Dd $Mdocdate: September 23 2010 $
26.Dt SFTP 1 26.Dt SFTP 1
27.Os 27.Os
28.Sh NAME 28.Sh NAME
@@ -202,6 +202,7 @@ For full details of the options listed below, and their possible values, see
202.It IdentityFile 202.It IdentityFile
203.It IdentitiesOnly 203.It IdentitiesOnly
204.It KbdInteractiveDevices 204.It KbdInteractiveDevices
205.It KexAlgorithms
205.It LogLevel 206.It LogLevel
206.It MACs 207.It MACs
207.It NoHostAuthenticationForLocalhost 208.It NoHostAuthenticationForLocalhost