summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmc@openbsd.org <jmc@openbsd.org>2019-06-12 05:53:21 +0000
committerDamien Miller <djm@mindrot.org>2019-06-14 13:01:28 +1000
commit76af9c57387243556d38935555c227d0b34062c5 (patch)
tree640291d2b987a27d8ff5dc0293a2c7dd5a6d94b8
parentd1bbfdd932db9b9b799db865ee1ff50060dfc895 (diff)
upstream: deraadt noticed some inconsistency in the way we denote
the "Hostname" and "X11UseLocalhost" keywords; this makes things consistent (effectively reversing my commit of yesterday); ok deraadt markus djm OpenBSD-Commit-ID: 255c02adb29186ac91dcf47dfad7adb1b1e54667
-rw-r--r--ssh_config.514
-rw-r--r--sshd_config.56
2 files changed, 10 insertions, 10 deletions
diff --git a/ssh_config.5 b/ssh_config.5
index 9601ce46..4e72d2ea 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -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_config.5,v 1.294 2019/06/11 13:39:40 jmc Exp $
-.Dd $Mdocdate: June 11 2019 $
+.\" $OpenBSD: ssh_config.5,v 1.295 2019/06/12 05:53:21 jmc Exp $
+.Dd $Mdocdate: June 12 2019 $
.Dt SSH_CONFIG 5
.Os
.Sh NAME
@@ -203,7 +203,7 @@ The criteria for the
.Cm host
keyword are matched against the target hostname, after any substitution
by the
-.Cm HostName
+.Cm Hostname
or
.Cm CanonicalizeHostname
options.
@@ -845,16 +845,16 @@ real host name when looking up or saving the host key
in the host key database files and when validating host certificates.
This option is useful for tunneling SSH connections
or for multiple servers running on a single host.
-.It Cm HostName
+.It Cm Hostname
Specifies the real host name to log into.
This can be used to specify nicknames or abbreviations for hosts.
Arguments to
-.Cm HostName
+.Cm Hostname
accept the tokens described in the
.Sx TOKENS
section.
Numeric IP addresses are also permitted (both on the command line and in
-.Cm HostName
+.Cm Hostname
specifications).
The default is the name given on the command line.
.It Cm IdentitiesOnly
@@ -1785,7 +1785,7 @@ accepts the tokens %%, %d, %h, %i, %l, %r, and %u.
.Cm ControlPath
accepts the tokens %%, %C, %h, %i, %L, %l, %n, %p, %r, and %u.
.Pp
-.Cm HostName
+.Cm Hostname
accepts the tokens %% and %h.
.Pp
.Cm IdentityAgent
diff --git a/sshd_config.5 b/sshd_config.5
index 9f59584f..fd83bcef 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -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: sshd_config.5,v 1.285 2019/05/14 12:47:17 schwarze Exp $
-.Dd $Mdocdate: May 14 2019 $
+.\" $OpenBSD: sshd_config.5,v 1.286 2019/06/12 05:53:21 jmc Exp $
+.Dd $Mdocdate: June 12 2019 $
.Dt SSHD_CONFIG 5
.Os
.Sh NAME
@@ -1155,7 +1155,7 @@ Available keywords are
.Cm X11DisplayOffset ,
.Cm X11Forwarding
and
-.Cm X11UseLocalHost .
+.Cm X11UseLocalhost .
.It Cm MaxAuthTries
Specifies the maximum number of authentication attempts permitted per
connection.