summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-15 11:55:31 +1100
committerDamien Miller <djm@mindrot.org>2006-03-15 11:55:31 +1100
commit1faa7133233075776c83a71b427d19e35790280e (patch)
tree949f039e871a86e7689a93a78be36101bd2f59f3
parentc7d5b5e4662b5c4d78639b9bfed642917f775da4 (diff)
downloadopenssh-git-1faa7133233075776c83a71b427d19e35790280e.tar.gz
- jmc@cvs.openbsd.org 2006/02/24 20:22:16
[ssh-keysign.8 ssh_config.5 sshd_config.5] some consistency fixes;
-rw-r--r--ChangeLog5
-rw-r--r--ssh-keysign.810
-rw-r--r--ssh_config.54
-rw-r--r--sshd_config.56
4 files changed, 14 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index b5f623a8..730634ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -163,6 +163,9 @@
- jmc@cvs.openbsd.org 2006/02/24 10:39:52
[sshd.8]
signpost to PATTERNS section;
+ - jmc@cvs.openbsd.org 2006/02/24 20:22:16
+ [ssh-keysign.8 ssh_config.5 sshd_config.5]
+ some consistency fixes;
20060313
- (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -4064,4 +4067,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4185 2006/03/15 00:55:08 djm Exp $
+$Id: ChangeLog,v 1.4186 2006/03/15 00:55:31 djm Exp $
diff --git a/ssh-keysign.8 b/ssh-keysign.8
index a17e8d5c..4cdcb7a4 100644
--- a/ssh-keysign.8
+++ b/ssh-keysign.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-keysign.8,v 1.7 2003/06/10 09:12:11 jmc Exp $
+.\" $OpenBSD: ssh-keysign.8,v 1.8 2006/02/24 20:22:16 jmc Exp $
.\"
.\" Copyright (c) 2002 Markus Friedl. All rights reserved.
.\"
@@ -27,7 +27,7 @@
.Os
.Sh NAME
.Nm ssh-keysign
-.Nd ssh helper program for hostbased authentication
+.Nd ssh helper program for host-based authentication
.Sh SYNOPSIS
.Nm
.Sh DESCRIPTION
@@ -35,7 +35,7 @@
is used by
.Xr ssh 1
to access the local host keys and generate the digital signature
-required during hostbased authentication with SSH protocol version 2.
+required during host-based authentication with SSH protocol version 2.
.Pp
.Nm
is disabled by default and can only be enabled in the
@@ -53,7 +53,7 @@ See
.Xr ssh 1
and
.Xr sshd 8
-for more information about hostbased authentication.
+for more information about host-based authentication.
.Sh FILES
.Bl -tag -width Ds
.It Pa /etc/ssh/ssh_config
@@ -67,7 +67,7 @@ They should be owned by root, readable only by root, and not
accessible to others.
Since they are readable only by root,
.Nm
-must be set-uid root if hostbased authentication is used.
+must be set-uid root if host-based authentication is used.
.El
.Sh SEE ALSO
.Xr ssh 1 ,
diff --git a/ssh_config.5 b/ssh_config.5
index a334e57d..5905d4c9 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,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.
.\"
-.\" $OpenBSD: ssh_config.5,v 1.81 2006/02/24 10:37:07 jmc Exp $
+.\" $OpenBSD: ssh_config.5,v 1.82 2006/02/24 20:22:16 jmc Exp $
.Dd September 25, 1999
.Dt SSH_CONFIG 5
.Os
@@ -178,7 +178,7 @@ Note that this option does not work if
is set to
.Dq yes .
.It Cm ChallengeResponseAuthentication
-Specifies whether to use challenge response authentication.
+Specifies whether to use challenge-response authentication.
The argument to this keyword must be
.Dq yes
or
diff --git a/sshd_config.5 b/sshd_config.5
index e0768230..caeddf60 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,7 +34,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.
.\"
-.\" $OpenBSD: sshd_config.5,v 1.49 2006/02/24 10:33:54 jmc Exp $
+.\" $OpenBSD: sshd_config.5,v 1.50 2006/02/24 20:22:16 jmc Exp $
.Dd September 25, 1999
.Dt SSHD_CONFIG 5
.Os
@@ -153,7 +153,7 @@ authentication is allowed.
This option is only available for protocol version 2.
By default, no banner is displayed.
.It Cm ChallengeResponseAuthentication
-Specifies whether challenge response authentication is allowed.
+Specifies whether challenge-response authentication is allowed.
All authentication styles from
.Xr login.conf 5
are supported.
@@ -291,7 +291,7 @@ Note that this option applies to protocol version 2 only.
.It Cm HostbasedAuthentication
Specifies whether rhosts or /etc/hosts.equiv authentication together
with successful public key client host authentication is allowed
-(hostbased authentication).
+(host-based authentication).
This option is similar to
.Cm RhostsRSAAuthentication
and applies to protocol version 2 only.