From nobody Sat Mar 29 01:33:47 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 4ZPg0C6DPLz5rmMZ; Sat, 29 Mar 2025 01:33:47 +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 4ZPg0C2mGpz3Cky; Sat, 29 Mar 2025 01:33:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743212027; 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=Vx8drtuCLNAIsE8Xw2ANNgcxMKvY9iGi5HoNTcKHF9o=; b=qgb4h8zrpe5BrjkaI+hcPgCb6GNNdorPy6VDKcQOAUmzAh/bx7+mPs8F1IHEbAofSBYO6v 000Du1dlBCXkthc8XUGDv9RQfWGFyXHK+giQ0ZoRfHYUihvn2nRrC4ccGdceTXLjGvlfgE u//5WL78s7s7wCwctNtN+IBRzkQyl7yv/hymljoIZtqoLlCT7ZZRC6+e6c8huQiSTOkC5f RhiL+rtHceZZW4Fgbli/hpsVtXiPOmC5JZpnnwZbxVPT9s5MVJn8HMXaOcr+S/AgIt0eCn jd6Ua8ZIz8LjtkZJARb6JBs2BDl6O/bkmcn76in2A3sCzBoK74VF9swW0jSsLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743212027; a=rsa-sha256; cv=none; b=JQGUk8yEDIU3iXp7H9FzQNo2SxALts336etaWjDAghtm8XX0K6/c1vghq7kUSJP0zmZJ7/ JpETnRitD3s88doRGVrPLVmfdnaAGJQBqFZH0sgkAzgHU6UO9v1+6VggusKOwmjFtz8TwX HS+yQMVaQpj3bRqqVqGumMQigeYOMDST4qyxywDgVhlFtvB0ozhZZeo+eTY9a7NuzCi1To gucK766Ag2uVVTcKT5hYbCgMHsAAsm2vr72lNNjfVF0L4Jjhz6J0dP3vADd7cj2k6AQ5Vb wLuWTdqE/i0dVT1khWv0HYjk0DHpEJt9Vqjj3EZfo1pKH1BdUNElHvI3PqGKpw== 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=1743212027; 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=Vx8drtuCLNAIsE8Xw2ANNgcxMKvY9iGi5HoNTcKHF9o=; b=tcIzw0JeHo6Q0/gv+A5bSxReo3Pkb6uiHIXXOJ+0b/hmyY5OL0VTYSXlIFt5I/9wOqf6lg OzD9pc1bincQFSiBhJC176zPoow6B/4ZBXZW1h/5C4hptMQL+nepw01DtAiFmgDveb4Qj0 1kJb3eq9W/wG+7u/h/CcLcFdpJTJM3vz9+H14La2ETSvQOoKEWXrgvO80Ul6kEDLUJGR/U nvBvBstIJztoLSForP6aa1UO2E/TUS6cdvZdzTPZQXzymUEgXTaIZuuUBaUFpgja2GOXwj PjtxauufWSQhXEupmQYXXFdwp5+hPkd/dYFWhfBo3h5CLfILBzgVpOPMIOmY6A== 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 4ZPg0C2Mdtz16t3; Sat, 29 Mar 2025 01:33:47 +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 52T1XlCC052426; Sat, 29 Mar 2025 01:33:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52T1XlZ1052423; Sat, 29 Mar 2025 01:33:47 GMT (envelope-from git) Date: Sat, 29 Mar 2025 01:33:47 GMT Message-Id: <202503290133.52T1XlZ1052423@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Ziaee Subject: git: 342fa740cbc6 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 342fa740cbc653909e7bc4197453b0da74d2f2ba Auto-Submitted: auto-generated The branch stable/14 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=342fa740cbc653909e7bc4197453b0da74d2f2ba commit 342fa740cbc653909e7bc4197453b0da74d2f2ba Author: Alexander Ziaee AuthorDate: 2024-11-17 17:07:34 +0000 Commit: Alexander Ziaee CommitDate: 2025-03-29 01:31:48 +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 (cherry picked from commit 8d65152cbfc8861f6920846dea6f540c673ab7b6) --- 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 .