sync with OpenBSD -current

This commit is contained in:
purplerain 2024-09-03 18:50:36 +00:00
parent 676afb990b
commit 39bad15604
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
65 changed files with 14096 additions and 1714 deletions

View file

@ -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.399 2024/08/22 23:11:30 djm Exp $
.Dd $Mdocdate: August 22 2024 $
.\" $OpenBSD: ssh_config.5,v 1.401 2024/09/03 06:17:48 jmc Exp $
.Dd $Mdocdate: September 3 2024 $
.Dt SSH_CONFIG 5
.Os
.Sh NAME
@ -1182,7 +1182,12 @@ to unknown options that appear before it.
Include the specified configuration file(s).
Multiple pathnames may be specified and each pathname may contain
.Xr glob 7
wildcards and, for user configurations, shell-like
wildcards,
tokens as described in the
.Sx TOKENS
section, environment variables as described in the
.Sx ENVIRONMENT VARIABLES
section and, for user configurations, shell-like
.Sq ~
references to user home directories.
Wildcards will be expanded and processed in lexical order.
@ -2271,6 +2276,7 @@ The local username.
.Cm ControlPath ,
.Cm IdentityAgent ,
.Cm IdentityFile ,
.Cm Include ,
.Cm KnownHostsCommand ,
.Cm LocalForward ,
.Cm Match exec ,
@ -2319,6 +2325,7 @@ The keywords
.Cm ControlPath ,
.Cm IdentityAgent ,
.Cm IdentityFile ,
.Cm Include ,
.Cm KnownHostsCommand ,
and
.Cm UserKnownHostsFile