sync with OpenBSD -current

This commit is contained in:
purplerain 2023-11-25 18:12:55 +00:00
parent 57dff5a13c
commit 7a404394cf
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
16 changed files with 166 additions and 75 deletions

View file

@ -1,4 +1,4 @@
.\" $OpenBSD: hosts.5,v 1.26 2022/03/31 17:27:23 naddy Exp $
.\" $OpenBSD: hosts.5,v 1.27 2023/11/25 08:14:43 florian Exp $
.\" $NetBSD: hosts.5,v 1.4 1994/11/30 19:31:20 jtc Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
@ -30,7 +30,7 @@
.\"
.\" @(#)hosts.5 8.2 (Berkeley) 12/11/93
.\"
.Dd $Mdocdate: March 31 2022 $
.Dd $Mdocdate: November 25 2023 $
.Dt HOSTS 5
.Os
.Sh NAME
@ -76,6 +76,9 @@ dot notation (IPv4) or colon separated notation (IPv6) as described in
.Xr inet_pton 3 .
Host names may contain any printable character other than a field delimiter,
newline, or comment character.
.Pp
The host "localhost" and all names underneath the localhost domain will
always resolve to the loopback addresses 127.0.0.1 or ::1.
.Sh FILES
.Bl -tag -width /etc/hosts -compact
.It Pa /etc/hosts

View file

@ -1,4 +1,4 @@
.\" $OpenBSD: resolv.conf.5,v 1.64 2021/11/23 06:58:36 jmc Exp $
.\" $OpenBSD: resolv.conf.5,v 1.65 2023/11/25 08:14:43 florian Exp $
.\" $NetBSD: resolv.conf.5,v 1.7 1996/03/06 18:22:16 scottr Exp $
.\"
.\" Copyright (c) 1986, 1991 The Regents of the University of California.
@ -30,7 +30,7 @@
.\"
.\" @(#)resolver.5 5.12 (Berkeley) 5/10/91
.\"
.Dd $Mdocdate: November 23 2021 $
.Dd $Mdocdate: November 25 2023 $
.Dt RESOLV.CONF 5
.Os
.Sh NAME
@ -50,6 +50,9 @@ file does not exist, only the local host file
will be consulted,
i.e. the Domain Name System will not be used to resolve hosts.
.Pp
The host "localhost" and all names underneath the localhost domain will
always resolve to the loopback addresses 127.0.0.1 or ::1.
.Pp
The file is designed to be human readable and contains a list of
keywords with values that provide various types of resolver information.
A resolv.conf file is not required for some setups, so this file is optional.