From nobody Wed Mar 26 16:44:56 2025 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 4ZNCLw34YKz5s92Q; Wed, 26 Mar 2025 16:44:56 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZNCLw2LjMz41yT; Wed, 26 Mar 2025 16:44:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743007496; 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=RC8kVe2WoSO5xZniuyE4s4G/GYPesXB/1+rcfBvV3c8=; b=jFbZjA+9ajN9hiOC2Q+JyJX85Veya8MdsEHILYTeIap1/Fe8SlpqtAlUIam56c6025BN7t rz3vevB64aJsMxU3emcttG4AIrDfl/GXnA1P3RHES6US04noVK2N0DA6uKgR4RRkvcu2sr qhB8m442pyt68cXJhKjhTWJKsrAQM1IUUHPl5ru3s3/+lkcqW10zpZ2eej3KdbdUAxlRxC k10gM2Z9LlyvAuSGqKcaxZuXPLmiH17EFNEv4kERIIB6sQ7wolVPWbugT7LGRmlpqJv1b6 o44jTTUce/WdndZE7psk+uOxDLrOM2GQqV+oG1Dj+NrrJWaiEb3nupPLeFtiHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743007496; a=rsa-sha256; cv=none; b=Xaxb67xkE8hRU9nEBLWLxQ4BjyO+chMsKXiLiCr7sARJEjNI5+F7+SqV4Brmsh+Kxu8BNf lhWBoAkgC+bjbFv3fMcQpM4XaqKaq8X/WTjuN82ynjRtdrAGoM5lXoDBSesoAgQqkCLxZh jeZ3K4InDqWmvgW6xV9vXBReYEkpg7ar6mAjdlXmRH1276rBRy/Kg0JznolHaH2s0tGdUG p7Qp98LJBxovUgTppZjZg7F47qSEw0pREUmPT0+uNFXUFzqSQ09WPW1tj7qybiM0WSM4HD k8c2YKOszGTRkraXgyXBhiFcxzlYTPSyKpMM/06wfTVxQZQcvm3/KcuZqM/k4w== 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=1743007496; 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=RC8kVe2WoSO5xZniuyE4s4G/GYPesXB/1+rcfBvV3c8=; b=uKhV7VQxsVkgydE1a/P4j9mZy+aTwo//oIOEDZeVOYxvc+buZjokU1uMNXtMTJSNZb5ft/ oySoYLxPcCyl9tlteO1baIK6jjWf8TRXyD3iKkPoGVyp5R/vGbE9JC4pBbPj9+mIzT8t+g 0BXkt9J/9hNJObPv7bmD4bA17oo8Q9Q8hE2Pq3YBWPnJJ5YCkKRCKm+oHMTXsjI6yiff6B qLiet3eeOrR3XA3D5+EHeRO8PjGa4P5fiFH7FknAdVp6qhDrS/hWvfOXZeWhxu/+sRbnRi Cl+Mgn0sgI0SV18aU9Sya9fI6EXjNHTGCXr98Wj4U3J9N+y1hqMHgqx6VqjNgA== 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 4ZNCLw1Yf1z3Jc; Wed, 26 Mar 2025 16:44:56 +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 52QGiuWN065100; Wed, 26 Mar 2025 16:44:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52QGiugi065097; Wed, 26 Mar 2025 16:44:56 GMT (envelope-from git) Date: Wed, 26 Mar 2025 16:44:56 GMT Message-Id: <202503261644.52QGiugi065097@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 8d65152cbfc8 - main - intro.5: Add local to files, minor maintenence 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d65152cbfc8861f6920846dea6f540c673ab7b6 Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=8d65152cbfc8861f6920846dea6f540c673ab7b6 commit 8d65152cbfc8861f6920846dea6f540c673ab7b6 Author: Alexander Ziaee AuthorDate: 2024-11-17 17:07:34 +0000 Commit: Alexander Ziaee CommitDate: 2025-03-26 16:43:54 +0000 intro.5: Add local to files, minor maintenence New users are sometimes confused about the difference between /etc/ and /usr/local/etc. Explain this in the manual as we did in intro(1). Link hier(7) which now lists base system configuration files in /etc/. Add a section number to HISTORY for clarity. PR: 248562 MFC after: 3 days Approved by: mhorne (mentor) Reviewed by: imp, mhorne, Lexi Winter Pull Request: https://github.com/freebsd/freebsd-src/pull/1534 --- share/man/man5/intro.5 | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/share/man/man5/intro.5 b/share/man/man5/intro.5 index 78e147975e81..1c746f37a399 100644 --- a/share/man/man5/intro.5 +++ b/share/man/man5/intro.5 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-3-Clause +.\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -25,25 +28,28 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 16, 1997 +.Dd November 17, 2024 .Dt INTRO 5 .Os .Sh NAME .Nm intro -.Nd "introduction to file formats" +.Nd introduction to file formats .Sh DESCRIPTION This section contains information about file formats. .Sh FILES -.Bl -tag -width /etc/shells -compact -.It Pa /etc -location of most system configuration files +.Bl -tag -width "/usr/local/etc/" -compact +.It Pa /etc/ +base system software configuration files +.It Pa /usr/local/etc/ +locally installed software configuration files .El .Sh SEE ALSO .Xr apropos 1 , .Xr intro 1 , +.Xr hier 7 , .Xr intro 8 .Sh HISTORY The -.Nm -section manual page appeared in +.Nm Ns Pq 5 +manual page first appeared in .Fx 2.2 .