git: 46c99528078a - main - sysctl.conf(5): Mention sysctl.conf.local in the sysctl.conf(5) manual page

[Gordon Bergling]

The branch main has been updated by gbe (doc committer):

URL: https://cgit.FreeBSD.org/src/commit/?id=46c99528078ad478f50910110a933abef0b89cde

commit 46c99528078ad478f50910110a933abef0b89cde
Author:     Gordon Bergling <gbe at FreeBSD.org>
AuthorDate: 2021-04-09 15:28:18 +0000
Commit:     Gordon Bergling <gbe at FreeBSD.org>
CommitDate: 2021-04-09 15:28:18 +0000

    sysctl.conf(5): Mention sysctl.conf.local in the sysctl.conf(5) manual page
    
    The possibility of using a sysctl.conf.local on a machine that has a shared
    sysctl.conf(5) isn't documented. So mention the sysctl.conf.local in the
    manual page.
    
    PR:     254901
    Submitted by:   Jose Luis Duran <jlduran at gmail dot com>
    Reported by:    Jose Luis Duran <jlduran at gmail dot com>
    Reviewed by:    markj
    MFC after:      3 days
    Differential Revision:  https://reviews.freebsd.org/D29673
---
 share/man/man5/sysctl.conf.5 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/share/man/man5/sysctl.conf.5 b/share/man/man5/sysctl.conf.5
index 664eee8080fc..99df8b794d83 100644
--- a/share/man/man5/sysctl.conf.5
+++ b/share/man/man5/sysctl.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 21, 2018
+.Dd April 8, 2021
 .Dt SYSCTL.CONF 5
 .Os
 .Sh NAME
@@ -52,10 +52,13 @@ as seen in the
 .Sx EXAMPLES
 section, below.
 .Sh FILES
-.Bl -tag -width /etc/sysctl.conf -compact
+.Bl -tag -width /etc/sysctl.conf.local -compact
 .It Pa /etc/sysctl.conf
 Initial settings for
 .Xr sysctl 8 .
+.It Pa /etc/sysctl.conf.local
+Machine-specific settings for sites with a common
+.Pa /etc/sysctl.conf .
 .El
 .Sh EXAMPLES
 To turn off logging of programs that exit due to fatal signals you may use