1 files changed, 30 insertions, 17 deletions
diff --git a/upstream/debian-unstable/man5/journal-remote.conf.5 b/upstream/debian-unstable/man5/journal-remote.conf.5
index a2619006..4bfe1487 100644
--- a/upstream/debian-unstable/man5/journal-remote.conf.5
+++ b/upstream/debian-unstable/man5/journal-remote.conf.5
@@ -1,5 +1,5 @@
 '\" t
-.TH "JOURNAL\-REMOTE\&.CONF" "5" "" "systemd 255" "journal-remote.conf"
+.TH "JOURNAL\-REMOTE\&.CONF" "5" "" "systemd 256~rc3" "journal-remote.conf"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -23,13 +23,24 @@
 journal-remote.conf, journal-remote.conf.d \- Configuration files for the service accepting remote journal uploads
 .SH "SYNOPSIS"
 .PP
+.RS 4
 /etc/systemd/journal\-remote\&.conf
-.PP
+.RE
+.RS 4
+/run/systemd/journal\-remote\&.conf
+.RE
+.RS 4
+/usr/lib/systemd/journal\-remote\&.conf
+.RE
+.RS 4
 /etc/systemd/journal\-remote\&.conf\&.d/*\&.conf
-.PP
+.RE
+.RS 4
 /run/systemd/journal\-remote\&.conf\&.d/*\&.conf
-.PP
+.RE
+.RS 4
 /usr/lib/systemd/journal\-remote\&.conf\&.d/*\&.conf
+.RE
 .SH "DESCRIPTION"
 .PP
 These files configure various parameters of
@@ -38,16 +49,16 @@ These files configure various parameters of
 for a general description of the syntax\&.
 .SH "CONFIGURATION DIRECTORIES AND PRECEDENCE"
 .PP
-The default configuration is set during compilation, so configuration is only needed when it is necessary to deviate from those defaults\&. The main configuration file is either in
-/usr/lib/systemd/
-or
-/etc/systemd/
-and contains commented out entries showing the defaults as a guide to the administrator\&. Local overrides can be created by creating drop\-ins, as described below\&. The main configuration file can also be edited for this purpose (or a copy in
+The default configuration is set during compilation, so configuration is only needed when it is necessary to deviate from those defaults\&. The main configuration file is loaded from one of the listed directories in order of priority, only the first file found is used:
+/etc/systemd/,
+/run/systemd/,
+/usr/local/lib/systemd/,
+/usr/lib/systemd/\&. The vendor version of the file contains commented out entries showing the defaults as a guide to the administrator\&. Local overrides can also be created by creating drop\-ins, as described below\&. The main configuration file can also be edited for this purpose (or a copy in
 /etc/
-if it\*(Aqs shipped in
-/usr/) however using drop\-ins for local configuration is recommended over modifications to the main configuration file\&.
+if it\*(Aqs shipped under
+/usr/), however using drop\-ins for local configuration is recommended over modifications to the main configuration file\&.
 .PP
-In addition to the "main" configuration file, drop\-in configuration snippets are read from
+In addition to the main configuration file, drop\-in configuration snippets are read from
 /usr/lib/systemd/*\&.conf\&.d/,
 /usr/local/lib/systemd/*\&.conf\&.d/, and
 /etc/systemd/*\&.conf\&.d/\&. Those drop\-ins have higher precedence and override the main configuration file\&. Files in the
@@ -57,7 +68,12 @@ configuration subdirectories are sorted by their filename in lexicographic order
 When packages need to customize the configuration, they can install drop\-ins under
 /usr/\&. Files in
 /etc/
-are reserved for the local administrator, who may use this logic to override the configuration files installed by vendor packages\&. Drop\-ins have to be used to override package drop\-ins, since the main configuration file has lower precedence\&. It is recommended to prefix all filenames in those subdirectories with a two\-digit number and a dash, to simplify the ordering of the files\&. This also defined a concept of drop\-in priority to allow distributions to ship drop\-ins within a specific range lower than the range used by users\&. This should lower the risk of package drop\-ins overriding accidentally drop\-ins defined by users\&.
+are reserved for the local administrator, who may use this logic to override the configuration files installed by vendor packages\&. Drop\-ins have to be used to override package drop\-ins, since the main configuration file has lower precedence\&. It is recommended to prefix all filenames in those subdirectories with a two\-digit number and a dash, to simplify the ordering of the files\&. This also defines a concept of drop\-in priorities to allow OS vendors to ship drop\-ins within a specific range lower than the range used by users\&. This should lower the risk of package drop\-ins overriding accidentally drop\-ins defined by users\&. It is recommended to use the range 10\-40 for drop\-ins in
+/usr/
+and the range 60\-90 for drop\-ins in
+/etc/
+and
+/run/, to make sure that local and transient drop\-ins take priority over drop\-ins shipped by the OS vendor\&.
 .PP
 To disable a configuration file supplied by the vendor, the recommended way is to place a symlink to
 /dev/null
@@ -134,7 +150,4 @@ Added in version 253\&.
 .RE
 .SH "SEE ALSO"
 .PP
-\fBjournald.conf\fR(5),
-\fBsystemd\fR(1),
-\fBsystemd-journal-remote.service\fR(8),
-\fBsystemd-journald.service\fR(8)
+\fBjournald.conf\fR(5), \fBsystemd\fR(1), \fBsystemd-journal-remote.service\fR(8), \fBsystemd-journald.service\fR(8)