summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmc@openbsd.org <jmc@openbsd.org>2015-09-25 18:19:54 +0000
committerDamien Miller <djm@mindrot.org>2015-10-06 12:21:55 +1100
commitc5f7c0843cb6e6074a93c8ac34e49ce33a6f5546 (patch)
tree4175d40176ce9a9e0d48b5f44951167acffd83de
parent4e44a79a07d4b88b6a4e5e8c1bed5f58c841b1b8 (diff)
downloadopenssh-git-c5f7c0843cb6e6074a93c8ac34e49ce33a6f5546.tar.gz
upstream commit
some certificatefile tweaks; ok djm Upstream-ID: 0e5a7852c28c05fc193419cc7e50e64c1c535af0
-rw-r--r--scp.15
-rw-r--r--sftp.15
-rw-r--r--ssh.16
3 files changed, 9 insertions, 7 deletions
diff --git a/scp.1 b/scp.1
index 279b0d70..54ea352c 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.67 2015/07/10 06:21:53 markus Exp $
+.\" $OpenBSD: scp.1,v 1.68 2015/09/25 18:19:54 jmc Exp $
.\"
-.Dd $Mdocdate: July 10 2015 $
+.Dd $Mdocdate: September 25 2015 $
.Dt SCP 1
.Os
.Sh NAME
@@ -133,6 +133,7 @@ For full details of the options listed below, and their possible values, see
.It CanonicalizeHostname
.It CanonicalizeMaxDots
.It CanonicalizePermittedCNAMEs
+.It CertificateFile
.It ChallengeResponseAuthentication
.It CheckHostIP
.It Cipher
diff --git a/sftp.1 b/sftp.1
index 214f0118..edc5a85e 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.101 2015/01/30 11:43:14 djm Exp $
+.\" $OpenBSD: sftp.1,v 1.102 2015/09/25 18:19:54 jmc 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: January 30 2015 $
+.Dd $Mdocdate: September 25 2015 $
.Dt SFTP 1
.Os
.Sh NAME
@@ -198,6 +198,7 @@ For full details of the options listed below, and their possible values, see
.It CanonicalizeHostname
.It CanonicalizeMaxDots
.It CanonicalizePermittedCNAMEs
+.It CertificateFile
.It ChallengeResponseAuthentication
.It CheckHostIP
.It Cipher
diff --git a/ssh.1 b/ssh.1
index b08fa797..4dd4c3b4 100644
--- a/ssh.1
+++ b/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.363 2015/09/24 06:15:11 djm Exp $
-.Dd $Mdocdate: September 24 2015 $
+.\" $OpenBSD: ssh.1,v 1.364 2015/09/25 18:19:54 jmc Exp $
+.Dd $Mdocdate: September 25 2015 $
.Dt SSH 1
.Os
.Sh NAME
@@ -304,7 +304,7 @@ It is possible to have multiple
.Fl i
options (and multiple identities specified in
configuration files).
-If no certificates have been explicitly specified by
+If no certificates have been explicitly specified by the
.Cm CertificateFile
directive,
.Nm