Adding upstream version 4.23.0.upstream/4.23.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 14 insertions, 10 deletions

diff --git a/upstream/fedora-rawhide/man5/sysctl.d.5 b/upstream/fedora-rawhide/man5/sysctl.d.5
index 9b232b02..43455ab4 100644
--- a/upstream/fedora-rawhide/man5/sysctl.d.5
+++ b/upstream/fedora-rawhide/man5/sysctl.d.5
@@ -1,5 +1,5 @@
 '\" t
-.TH "SYSCTL\&.D" "5" "" "systemd 255" "sysctl.d"
+.TH "SYSCTL\&.D" "5" "" "systemd 256~rc3" "sysctl.d"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -23,11 +23,15 @@
 sysctl.d \- Configure kernel parameters at boot
 .SH "SYNOPSIS"
 .PP
+.RS 4
 /etc/sysctl\&.d/*\&.conf
-.PP
+.RE
+.RS 4
 /run/sysctl\&.d/*\&.conf
-.PP
+.RE
+.RS 4
 /usr/lib/sysctl\&.d/*\&.conf
+.RE
 .sp
 .nf
 key\&.name\&.under\&.proc\&.sys = some value
@@ -122,7 +126,12 @@ Packages should install their configuration files in
 /usr/local/lib/
 (local installs)\&. Files in
 /etc/
-are reserved for the local administrator, who may use this logic to override the configuration files installed by vendor packages\&. It is recommended to prefix all filenames with a two\-digit number and a dash, to simplify the ordering of the files\&.
+are reserved for the local administrator, who may use this logic to override the configuration files installed by vendor packages\&. It is recommended to prefix all filenames with a two\-digit number and a dash, to simplify the ordering of the files\&. It is recommended to use the range 10\-40 for configuration files in
+/usr/
+and the range 60\-90 for configuration files in
+/etc/
+and
+/run/, to make sure that local and transient configuration files will always take priority over configuration files shipped by the OS vendor\&.
 .PP
 If the administrator wants to disable a configuration file supplied by the vendor, the recommended way is to place a symlink to
 /dev/null
@@ -237,9 +246,4 @@ will get this value (this also covers any interfaces detected while we\*(Aqre ru
 net\&.ipv4\&.conf\&.all\&.rp_filter, which we don\*(Aqt want to set at all, so it is explicitly excluded\&. And "hub0" is excluded from the glob because it has an explicit setting\&.
 .SH "SEE ALSO"
 .PP
-\fBsystemd\fR(1),
-\fBsystemd-sysctl.service\fR(8),
-\fBsystemd-delta\fR(1),
-\fBsysctl\fR(8),
-\fBsysctl.conf\fR(5),
-\fBmodprobe\fR(8)
+\fBsystemd\fR(1), \fBsystemd-sysctl.service\fR(8), \fBsystemd-delta\fR(1), \fBsysctl\fR(8), \fBsysctl.conf\fR(5), \fBmodprobe\fR(8)