From nobody Fri Oct 11 22:11:26 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XQLSH0Z8Sz5ZTjr; Fri, 11 Oct 2024 22:11:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQLSG5cCmz4VLj; Fri, 11 Oct 2024 22:11:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728684686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8VU3fpkOCGH4JJVvtn3Oxi2Vpa6kJgAhVLEkJ+HJtmI=; b=hc4M8ERPt1Weu+etF2NnEi49WUACj/W0KyZM7ERtIrKN9mhBi4KwlvEsBptrceppTZxtDX Dc/rWigdrWwka1jSwk/FJsAuFD2L8lCb4kn0w5/E7foKDeK+M3yriHxm6ZcGE+zKyyjvyo YINgrDldo7LPePv0ojFV2hOuecgMUinY3Q7fCCnRscPPM5EPZKNq30iN6Yi2IjwkubrQUX p+476DuCUQ0Yp5MfUS6+2B6aul2qH/YXAs/X7AyjE42uPzPgHU7yfiHENzhNIo2HbCA93O KnqWBd0dJsYlUuF1PxUtr3oo5XVJTnPiJHJoIyH6Ft94IeFJrOp+w0fTNX4EcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728684686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8VU3fpkOCGH4JJVvtn3Oxi2Vpa6kJgAhVLEkJ+HJtmI=; b=tKtWq3TvTFR5XCWoFvyQuLccTiGZpU7uDIj95qRaL73ceyhLg/jkXCsoGrvjDoMTN4iypM j0u0xfm6hn65E4+w7SzMdVWkwgH5DikiROGMn6Cu9s2lz2jpj8YpzhCFV8bp7AH2WCkHca VLdvjpQljMQ99uC5L1loIq7m/69TQskxkw6VyT31BBCFcdmpeS4XT0XU+WSEvndHXs+CqY T2CNrfcVhM2XSL+3QBb4p119vepbDh1OF67PfAZGcNo2CVDsOfYlIdc7Zq4biNniiJUOjr IqmQWEpdzX9lezPK+jJx42z933wuPMnFb0eL7IjiC7ufp47DCzje07ob21kOLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728684686; a=rsa-sha256; cv=none; b=N66lD0kR48NDvCQLT4742Gc/Qg85ZPJFjaHqaSXo8gRT28Ue5lVOyIO9Tio+cEMpg07iSV TYgjdys1tGLFKLLF4kFZ4j1EAbvLuXQqC7X0+kUK9pks4uirWT48PGRnq0GDZPf/oJKg00 BvBXPet/hm2/6E8545wDLGGfFSAeQ7ma2vpxIqb2cHNwyndw6LCdTuFzCpOHgSWADMdGTj Nb+OjYJhVQpiJyfdd81MQgbP5FnLBNdNceiPGGap12zvLddoi3vyzQ7PcU8aocvSzmdYwa cwHxJzHguSZtFj4XspDn3SnpztsRj9PXPansk7kzijFMdAzQ4xKTFp5iFvuvsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XQLSG4Pwyz105B; Fri, 11 Oct 2024 22:11:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BMBQWv028971; Fri, 11 Oct 2024 22:11:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BMBQHS028968; Fri, 11 Oct 2024 22:11:26 GMT (envelope-from git) Date: Fri, 11 Oct 2024 22:11:26 GMT Message-Id: <202410112211.49BMBQHS028968@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 5439ebff8512 - stable/14 - jail.conf.5: minor cleanup (spdx, macros, xrefs) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5439ebff8512fcbbce0ce77b6f050edecfc5c78d Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5439ebff8512fcbbce0ce77b6f050edecfc5c78d commit 5439ebff8512fcbbce0ce77b6f050edecfc5c78d Author: Alexander Ziaee AuthorDate: 2024-08-07 19:14:38 +0000 Commit: Warner Losh CommitDate: 2024-10-11 22:10:22 +0000 jail.conf.5: minor cleanup (spdx, macros, xrefs) + expand see also section with other relevant pages and the handbook + tag paths with the path macro so they can be searched with apropos + tag spdx, one sentance per line MFC after: 3 days Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1371 (cherry picked from commit 944c74b7d93c60709b966a5a522110e4fe1038b2) --- usr.sbin/jail/jail.conf.5 | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/usr.sbin/jail/jail.conf.5 b/usr.sbin/jail/jail.conf.5 index 0b82a972020c..dda2c0366dd1 100644 --- a/usr.sbin/jail/jail.conf.5 +++ b/usr.sbin/jail/jail.conf.5 @@ -1,3 +1,6 @@ +.\"- +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2012 James Gritton .\" All rights reserved. .\" @@ -22,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 5, 2023 +.Dd September 21, 2024 .Dt JAIL.CONF 5 .Os .Sh NAME @@ -169,17 +172,17 @@ A line of the form .Pp will include another file (or files) in the configuration. The filename should be either absolute, or relative to the -configuration file's directory. It cannot contain variable -expansions, but may contain +configuration file's directory. +It cannot contain variable expansions, but may contain .Xr glob 3 patterns. .Pp The included file must exist, though a filename glob may match zero or -more files. This allows inclusion of any/all files in a directory, -such as -.Dq /etc/jail.conf.d/*.conf , +more files. +This allows inclusion of any/all files in a directory, such as +.Dq Pa /etc/jail.conf.d/*.conf , or conditional inclusion of a single file, such as -.Dq jail.foo[.]conf . +.Dq Pa jail.foo[.]conf . .Ss Comments The configuration file may contain comments in the common C, C++, and shell formats: @@ -238,10 +241,19 @@ bar { \[char46]include "/usr/local/etc/jail.*.conf"; .Ed .Sh SEE ALSO -.Xr jail_set 2 , +.Xr jail 2 , +.Xr jail 3 , +.Xr jail 3lua , .Xr rc.conf 5 , .Xr jail 8 , -.Xr jls 8 +.Xr jexec 8 , +.Xr jls 8 , +.Xr zfs-jail 8 +.Pp +The +.Dq Jails and Containers +chapter of the +.%B FreeBSD Handbook . .Sh HISTORY The .Xr jail 8