summaryrefslogtreecommitdiffstats
path: root/ssh_config.0
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ssh_config.038
1 files changed, 20 insertions, 18 deletions
diff --git a/ssh_config.0 b/ssh_config.0
index ef6c093..abb4ac9 100644
--- a/ssh_config.0
+++ b/ssh_config.0
@@ -703,14 +703,15 @@ DESCRIPTION
Include
Include the specified configuration file(s). Multiple pathnames
- may be specified and each pathname may contain glob(7) wildcards
- and, for user configurations, shell-like M-bM-^@M-^X~M-bM-^@M-^Y references to user
- home directories. Wildcards will be expanded and processed in
- lexical order. Files without absolute paths are assumed to be in
- ~/.ssh if included in a user configuration file or /etc/ssh if
- included from the system configuration file. Include directive
- may appear inside a Match or Host block to perform conditional
- inclusion.
+ may be specified and each pathname may contain glob(7) wildcards,
+ tokens as described in the TOKENS section, environment variables
+ as described in the ENVIRONMENT VARIABLES section and, for user
+ configurations, shell-like M-bM-^@M-^X~M-bM-^@M-^Y references to user home
+ directories. Wildcards will be expanded and processed in lexical
+ order. Files without absolute paths are assumed to be in ~/.ssh
+ if included in a user configuration file or /etc/ssh if included
+ from the system configuration file. Include directive may appear
+ inside a Match or Host block to perform conditional inclusion.
IPQoS Specifies the IPv4 type-of-service or DSCP class for connections.
Accepted values are af11, af12, af13, af21, af22, af23, af31,
@@ -740,7 +741,7 @@ DESCRIPTION
KexAlgorithms
Specifies the permitted KEX (Key Exchange) algorithms that will
be used and their preference order. The selected algorithm will
- the the first algorithm in this list that the server also
+ be the first algorithm in this list that the server also
supports. Multiple algorithms must be comma-separated.
If the specified list begins with a M-bM-^@M-^X+M-bM-^@M-^Y character, then the
@@ -754,7 +755,8 @@ DESCRIPTION
The default is:
- sntrup761x25519-sha512@openssh.com,
+ sntrup761x25519-sha512,sntrup761x25519-sha512@openssh.com,
+ mlkem768x25519-sha256,
curve25519-sha256,curve25519-sha256@libssh.org,
ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
diffie-hellman-group-exchange-sha256,
@@ -825,9 +827,9 @@ DESCRIPTION
LogVerbose
Specify one or more overrides to LogLevel. An override consists
- of a pattern lists that matches the source file, function and
- line number to force detailed logging for. For example, an
- override pattern of:
+ of one or more pattern lists that matches the source file,
+ function and line number to force detailed logging for. For
+ example, an override pattern of:
kex.c:*:1000,*:kex_exchange_identification():*,packet.c:*
@@ -1373,7 +1375,7 @@ TOKENS
%t The type of the server host key, e.g. ssh-ed25519.
%u The local username.
- CertificateFile, ControlPath, IdentityAgent, IdentityFile,
+ CertificateFile, ControlPath, IdentityAgent, IdentityFile, Include,
KnownHostsCommand, LocalForward, Match exec, RemoteCommand,
RemoteForward, RevokedHostKeys, and UserKnownHostsFile accept the tokens
%%, %C, %d, %h, %i, %j, %k, %L, %l, %n, %p, %r, and %u.
@@ -1401,9 +1403,9 @@ ENVIRONMENT VARIABLES
the setting for that keyword will be ignored.
The keywords CertificateFile, ControlPath, IdentityAgent, IdentityFile,
- KnownHostsCommand, and UserKnownHostsFile support environment variables.
- The keywords LocalForward and RemoteForward support environment variables
- only for Unix domain socket paths.
+ Include, KnownHostsCommand, and UserKnownHostsFile support environment
+ variables. The keywords LocalForward and RemoteForward support
+ environment variables only for Unix domain socket paths.
FILES
~/.ssh/config
@@ -1428,4 +1430,4 @@ AUTHORS
created OpenSSH. Markus Friedl contributed the support for SSH protocol
versions 1.5 and 2.0.
-OpenBSD 7.5 June 17, 2024 OpenBSD 7.5
+OpenBSD 7.5 September 9, 2024 OpenBSD 7.5