From nobody Sat Sep 21 13:00:06 2024 X-Original-To: dev-commits-src-all@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 4X9q9L4rlVz5WM5w; Sat, 21 Sep 2024 13:00:06 +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 4X9q9L4BRDz43X5; Sat, 21 Sep 2024 13:00:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726923606; 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=LkAEO51I5uVw/cKJsfPDXOb91TLVbyzps5Ku5VxTRqA=; b=ChoEhUmwn3LghF1EH6YgILGQQVWoxtEeV2UN5osnL9UC21ytfZYQ68ZOrepR9LRsWmckOQ HQff7I5V5fTnhQ9TaGuBAWo74DpxHe9HMghh1YI2BaLhdaHJF1XVdOoz05eBqGNMfXk3Aa fgwz648wZ9PzMl+iiVqvUVDr9zPBbq/YoFX+jTbBAXEJRJyf41XWxFDjC81Cy8NKrg5fie A6e4KtpPOzG28ZjJWmhyqhjNY+FAY84dfa/FooRQ+TWryyyYsC8npIgM+oFo0l733g8aRD v8vdpUOOaVoa/StgUDvINniUvI0n/keJ6U6qVBsPBBfIn//TBsE/E4qaCc4KIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726923606; a=rsa-sha256; cv=none; b=euHMQKsBHE6Fpfoz3I0vLAn0Bl2IHEU1+0OvogNMYogipdRQXvg2WcrSPpV4a9g6TWBh5I SBebh4c0r1JG9QtMD6jO56ZYD9+JngLrJcROwX7T5sdJwE6bA2g9WLjFm0c8EGapebxJ4W +Uv4dBkVehYqku86KMIBYZc0WSV4b1U2+vyub1BCUhcqUknFoaUXHgtK//Ch72uYm+2S/b UZINm/at7jSX2MhqhgZn2u3mKGld3fNt1CCRvnlFXZWmjdl3cin8aquWolzEjLAXAvI7kj +1k0nNIe0iV599/cwr6L5Hq2YITn+J8n2mdSo3AzWdaDVbo+A/GJBsdIbWGBwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726923606; 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=LkAEO51I5uVw/cKJsfPDXOb91TLVbyzps5Ku5VxTRqA=; b=fnVsfuEFgE8NW/3ufNJl7ZTkE8rE8Kpv9ZjCoYQuZhBgTRgatzc4FBB9MBh8eb6m+VwTdW 7qfOOhe513EPU07ltAcbFq0a936YJx1s1dQCrUAA1Now9QSMt1IicNVthjefDIRzZxiyIT tiMkSdsqqDB8CWfnoIQ+Jn7xkd/NwY112+wUlOyKf5mENCT+YtePv+WKJ879ODd4H4uimF Px/l/uBf6cvTtGe1imKbhenehsTwQcKS2n+2tT2T+veWi2JL2cXEbb5byvb5PD9usmWiYV F6pe4J0/LehqARk8Z4jma4tZBcDypacKsQRTlEl757EtEKI3aBafxshYKsYuBw== 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 4X9q9L3nyHzYx2; Sat, 21 Sep 2024 13:00:06 +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 48LD06Pu097042; Sat, 21 Sep 2024 13:00:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48LD06ch097038; Sat, 21 Sep 2024 13:00:06 GMT (envelope-from git) Date: Sat, 21 Sep 2024 13:00:06 GMT Message-Id: <202409211300.48LD06ch097038@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 944c74b7d93c - main - jail.conf.5: minor cleanup (spdx, macros, xrefs) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 944c74b7d93c60709b966a5a522110e4fe1038b2 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=944c74b7d93c60709b966a5a522110e4fe1038b2 commit 944c74b7d93c60709b966a5a522110e4fe1038b2 Author: Alexander Ziaee AuthorDate: 2024-08-07 19:14:38 +0000 Commit: Warner Losh CommitDate: 2024-09-21 12:41:50 +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 --- 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