Merging upstream version 4.23.0.

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

1 files changed, 14 insertions, 8 deletions

diff --git a/upstream/debian-unstable/man5/modules-load.d.5 b/upstream/debian-unstable/man5/modules-load.d.5
index 1570e788..1b0af433 100644
--- a/upstream/debian-unstable/man5/modules-load.d.5
+++ b/upstream/debian-unstable/man5/modules-load.d.5
@@ -1,5 +1,5 @@
 '\" t
-.TH "MODULES\-LOAD\&.D" "5" "" "systemd 255" "modules-load.d"
+.TH "MODULES\-LOAD\&.D" "5" "" "systemd 256~rc3" "modules-load.d"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -23,11 +23,15 @@
 modules-load.d \- Configure kernel modules to load at boot
 .SH "SYNOPSIS"
 .PP
+.RS 4
 /etc/modules\-load\&.d/*\&.conf
-.PP
+.RE
+.RS 4
 /run/modules\-load\&.d/*\&.conf
-.PP
+.RE
+.RS 4
 /usr/lib/modules\-load\&.d/*\&.conf
+.RE
 .SH "DESCRIPTION"
 .PP
 \fBsystemd-modules-load.service\fR(8)
@@ -62,7 +66,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
@@ -84,7 +93,4 @@ virtio\-net
 .\}
 .SH "SEE ALSO"
 .PP
-\fBsystemd\fR(1),
-\fBsystemd-modules-load.service\fR(8),
-\fBsystemd-delta\fR(1),
-\fBmodprobe\fR(8)
+\fBsystemd\fR(1), \fBsystemd-modules-load.service\fR(8), \fBsystemd-delta\fR(1), \fBmodprobe\fR(8)