aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Bergling <gbe@FreeBSD.org>2021-04-09 15:28:18 +0000
committerGordon Bergling <gbe@FreeBSD.org>2021-04-13 04:36:32 +0000
commitd33c99d27da24ca23d8e7d6b2b933eef6f9bfce9 (patch)
tree8e058bcb47048b04bbc6ab0b6da6f7a1e483aeb0
parent9abc85d17d0538704641fe2c4d9da1b666f86e4e (diff)
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 Differential Revision: https://reviews.freebsd.org/D29673 (cherry picked from commit 46c99528078ad478f50910110a933abef0b89cde)
-rw-r--r--share/man/man5/sysctl.conf.57
1 files 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