man: document all the new paths

diff --git a/man/coredump.conf.xml b/man/coredump.conf.xml
index b08d732adb55f44c20310e3864e0798c9dbc776e..29ac35142a3c264cf236dac209fc408280e1daad 100644 (file)
--- a/man/coredump.conf.xml
+++ b/man/coredump.conf.xml
@@ -24,6 +24,8 @@
   <refsynopsisdiv>
     <para><simplelist>
       <member><filename>/etc/systemd/coredump.conf</filename></member>
+      <member><filename>/run/systemd/coredump.conf</filename></member>
+      <member><filename>/usr/lib/systemd/coredump.conf</filename></member>
       <member><filename>/etc/systemd/coredump.conf.d/*.conf</filename></member>
       <member><filename>/run/systemd/coredump.conf.d/*.conf</filename></member>
       <member><filename>/usr/lib/systemd/coredump.conf.d/*.conf</filename></member>

diff --git a/man/homed.conf.xml b/man/homed.conf.xml
index a6c070cb532bd8f938913f25a8255a3183eff728..9dfcfb6296b3be5275393bb7445764817d4b0fe8 100644 (file)
--- a/man/homed.conf.xml
+++ b/man/homed.conf.xml
@@ -24,6 +24,8 @@
   <refsynopsisdiv>
     <para><simplelist>
       <member><filename>/etc/systemd/homed.conf</filename></member>
+      <member><filename>/run/systemd/homed.conf</filename></member>
+      <member><filename>/usr/lib/systemd/homed.conf</filename></member>
       <member><filename>/etc/systemd/homed.conf.d/*.conf</filename></member>
       <member><filename>/run/systemd/homed.conf.d/*.conf</filename></member>
       <member><filename>/usr/lib/systemd/homed.conf.d/*.conf</filename></member>

diff --git a/man/journal-remote.conf.xml b/man/journal-remote.conf.xml
index 1cf18c3cd82c6edd878b175b5ef3a3142c7d3123..44e056ab491ea74a06cfe15768b0eae6fa1ebd64 100644 (file)
--- a/man/journal-remote.conf.xml
+++ b/man/journal-remote.conf.xml
@@ -29,6 +29,8 @@
   <refsynopsisdiv>
     <para><simplelist>
       <member><filename>/etc/systemd/journal-remote.conf</filename></member>
+      <member><filename>/run/systemd/journal-remote.conf</filename></member>
+      <member><filename>/usr/lib/systemd/journal-remote.conf</filename></member>
       <member><filename>/etc/systemd/journal-remote.conf.d/*.conf</filename></member>
       <member><filename>/run/systemd/journal-remote.conf.d/*.conf</filename></member>
       <member><filename>/usr/lib/systemd/journal-remote.conf.d/*.conf</filename></member>

diff --git a/man/journal-upload.conf.xml b/man/journal-upload.conf.xml
index 66ea0dca6c8663c1b2013d1cf5a2be047810a0b0..7d3f22f96b49c707189b8d27a427a5efa56e4171 100644 (file)
--- a/man/journal-upload.conf.xml
+++ b/man/journal-upload.conf.xml
@@ -23,6 +23,8 @@
 
   <refsynopsisdiv>
     <para><filename>/etc/systemd/journal-upload.conf</filename></para>
+    <para><filename>/run/systemd/journal-upload.conf</filename></para>
+    <para><filename>/usr/lib/systemd/journal-upload.conf</filename></para>
     <para><filename>/etc/systemd/journal-upload.conf.d/*.conf</filename></para>
     <para><filename>/run/systemd/journal-upload.conf.d/*.conf</filename></para>
     <para><filename>/usr/lib/systemd/journal-upload.conf.d/*.conf</filename></para>

diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index d74c9b410fd3973aa4911780cd534b79ac1afcfc..ec1605906594b19556a8adeb3e2b64d641691e07 100644 (file)
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -27,6 +27,8 @@
   <refsynopsisdiv>
     <para><simplelist>
       <member><filename>/etc/systemd/logind.conf</filename></member>
+      <member><filename>/run/systemd/logind.conf</filename></member>
+      <member><filename>/usr/lib/systemd/logind.conf</filename></member>
       <member><filename>/etc/systemd/logind.conf.d/*.conf</filename></member>
       <member><filename>/run/systemd/logind.conf.d/*.conf</filename></member>
       <member><filename>/usr/lib/systemd/logind.conf.d/*.conf</filename></member>

diff --git a/man/networkd.conf.xml b/man/networkd.conf.xml
index 9477bfe5afd9293cf236c1247a19c3809714c323..b5b825b8b8aaf66a314e00e15360c20b89a0ed9b 100644 (file)
--- a/man/networkd.conf.xml
+++ b/man/networkd.conf.xml
@@ -29,6 +29,8 @@
   <refsynopsisdiv>
     <para><simplelist>
       <member><filename>/etc/systemd/networkd.conf</filename></member>
+      <member><filename>/run/systemd/networkd.conf</filename></member>
+      <member><filename>/usr/lib/systemd/networkd.conf</filename></member>
       <member><filename>/etc/systemd/networkd.conf.d/*.conf</filename></member>
       <member><filename>/usr/lib/systemd/networkd.conf.d/*.conf</filename></member>
     </simplelist></para>

diff --git a/man/oomd.conf.xml b/man/oomd.conf.xml
index 1c25996498ff9b21c35fd40d22231b7f79af83b1..b099f8f5461531d5aa92e6ce4d20c1dd0c5f7452 100644 (file)
--- a/man/oomd.conf.xml
+++ b/man/oomd.conf.xml
@@ -24,7 +24,10 @@
   <refsynopsisdiv>
     <para><simplelist>
       <member><filename>/etc/systemd/oomd.conf</filename></member>
+      <member><filename>/run/systemd/oomd.conf</filename></member>
+      <member><filename>/usr/lib/systemd/oomd.conf</filename></member>
       <member><filename>/etc/systemd/oomd.conf.d/*.conf</filename></member>
+      <member><filename>/run/systemd/oomd.conf.d/*.conf</filename></member>
       <member><filename>/usr/lib/systemd/oomd.conf.d/*.conf</filename></member>
     </simplelist></para>
   </refsynopsisdiv>

diff --git a/man/pstore.conf.xml b/man/pstore.conf.xml
index 3216a4c27bb92cb4995ba188254b1f9025278e48..d6b6c4b1d7897cda5e025bedfaf2352c1fe7fea1 100644 (file)
--- a/man/pstore.conf.xml
+++ b/man/pstore.conf.xml
@@ -22,10 +22,14 @@
   </refnamediv>
 
   <refsynopsisdiv>
-    <para>
-    <filename>/etc/systemd/pstore.conf</filename>
-    <filename>/etc/systemd/pstore.conf.d/*</filename>
-    </para>
+    <para><simplelist>
+      <member><filename>/etc/systemd/pstore.conf</filename></member>
+      <member><filename>/run/systemd/pstore.conf</filename></member>
+      <member><filename>/usr/lib/systemd/pstore.conf</filename></member>
+      <member><filename>/etc/systemd/pstore.conf.d/*.conf</filename></member>
+      <member><filename>/run/systemd/pstore.conf.d/*.conf</filename></member>
+      <member><filename>/usr/lib/systemd/pstore.conf.d/*.conf</filename></member>
+    </simplelist></para>
   </refsynopsisdiv>
 
   <refsect1>

diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml
index 24cf3e427cbe60b3d13c92174a663a4a456c44af..084256cf05da258b2bab0d7745c642c86ba79f6a 100644 (file)
--- a/man/resolved.conf.xml
+++ b/man/resolved.conf.xml
@@ -27,6 +27,8 @@
   <refsynopsisdiv>
     <para><simplelist>
       <member><filename>/etc/systemd/resolved.conf</filename></member>
+      <member><filename>/run/systemd/resolved.conf</filename></member>
+      <member><filename>/usr/lib/systemd/resolved.conf</filename></member>
       <member><filename>/etc/systemd/resolved.conf.d/*.conf</filename></member>
       <member><filename>/run/systemd/resolved.conf.d/*.conf</filename></member>
       <member><filename>/usr/lib/systemd/resolved.conf.d/*.conf</filename></member>

diff --git a/man/standard-conf.xml b/man/standard-conf.xml
index c3cebdac5f9460d6253febd21bc034a3899178ee..f54475f30669747ff42a9e814f28af1ab828b2dc 100644 (file)
--- a/man/standard-conf.xml
+++ b/man/standard-conf.xml
@@ -50,14 +50,19 @@
     <title>Configuration Directories and Precedence</title>
 
     <para>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
-    <filename>/usr/lib/systemd/</filename> or <filename>/etc/systemd/</filename> 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 <filename>/etc/</filename> if it's shipped in <filename>/usr/</filename>) however using drop-ins for
-    local configuration is recommended over modifications to the main configuration file.</para>
+    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:
+    <filename>/etc/systemd/</filename>,
+    <filename>/run/systemd/</filename>,
+    <filename>/usr/local/lib/systemd/</filename>,
+    <filename>/usr/lib/systemd/</filename>.
+    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 <filename>/etc/</filename> if it's
+    shipped under <filename>/usr/</filename>), however using drop-ins for local configuration is recommended
+    over modifications to the main configuration file.</para>
 
-    <para>In addition to the "main" configuration file, drop-in configuration snippets are read from
+    <para>In addition to the main configuration file, drop-in configuration snippets are read from
     <filename>/usr/lib/systemd/*.conf.d/</filename>, <filename>/usr/local/lib/systemd/*.conf.d/</filename>,
     and <filename>/etc/systemd/*.conf.d/</filename>. Those drop-ins have higher precedence and override the
     main configuration file. Files in the <filename>*.conf.d/</filename> configuration subdirectories are

diff --git a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml
index 1abec4f34fdfcf00be851f663efaee764d97520b..411577d519c9592d31d1f0629550f219479177fd 100644 (file)
--- a/man/systemd-sleep.conf.xml
+++ b/man/systemd-sleep.conf.xml
@@ -24,6 +24,8 @@
   <refsynopsisdiv>
     <para><simplelist>
       <member><filename>/etc/systemd/sleep.conf</filename></member>
+      <member><filename>/run/systemd/sleep.conf</filename></member>
+      <member><filename>/usr/lib/systemd/sleep.conf</filename></member>
       <member><filename>/etc/systemd/sleep.conf.d/*.conf</filename></member>
       <member><filename>/run/systemd/sleep.conf.d/*.conf</filename></member>
       <member><filename>/usr/lib/systemd/sleep.conf.d/*.conf</filename></member>

diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 31b642139956bfc21dd096b2fed7d3438997d47b..e6611d04e7a26d01eb557c09c11d0c579ffa11b7 100644 (file)
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -28,12 +28,16 @@
 
   <refsynopsisdiv>
     <para><filename>/etc/systemd/system.conf</filename>,
+    <filename>/run/systemd/system.conf</filename>,
+    <filename>/usr/lib/systemd/system.conf</filename>,
     <filename>/etc/systemd/system.conf.d/*.conf</filename>,
     <filename>/run/systemd/system.conf.d/*.conf</filename>,
     <filename>/usr/lib/systemd/system.conf.d/*.conf</filename></para>
 
     <para><filename>~/.config/systemd/user.conf</filename>,
     <filename>/etc/systemd/user.conf</filename>,
+    <filename>/run/systemd/user.conf</filename>,
+    <filename>/usr/lib/systemd/user.conf</filename>,
     <filename>/etc/systemd/user.conf.d/*.conf</filename>,
     <filename>/run/systemd/user.conf.d/*.conf</filename>,
     <filename>/usr/lib/systemd/user.conf.d/*.conf</filename></para>
@@ -44,9 +48,10 @@
 
     <para>When run as a system instance, <command>systemd</command> interprets the configuration file
     <filename>system.conf</filename> and the files in <filename>system.conf.d</filename> directories; when
-    run as a user instance, it interprets the configuration file <filename>user.conf</filename> (either in
-    the home directory of the user, or if not found, under <filename>/etc/systemd/</filename>) and the files
-    in <filename>user.conf.d</filename> directories. These configuration files contain a few settings
+    run as a user instance, it interprets the configuration file <filename>user.conf</filename> (in order of
+    priority, in the home directory of the user and under <filename>/etc/systemd/</filename>,
+    <filename>/run/systemd/</filename>, and <filename>/usr/lib/systemd/</filename>) and the files in
+    <filename>user.conf.d</filename> directories. These configuration files contain a few settings
     controlling basic manager operations.</para>
 
     <para>See

diff --git a/man/timesyncd.conf.xml b/man/timesyncd.conf.xml
index 498bfa330beff0388d3f1135a13ba0023e255a93..248fd88b773214bd2bf00ffd671c3ac781c0f121 100644 (file)
--- a/man/timesyncd.conf.xml
+++ b/man/timesyncd.conf.xml
@@ -24,6 +24,8 @@
   <refsynopsisdiv>
     <para><simplelist>
       <member><filename>/etc/systemd/timesyncd.conf</filename></member>
+      <member><filename>/run/systemd/timesyncd.conf</filename></member>
+      <member><filename>/usr/lib/systemd/timesyncd.conf</filename></member>
       <member><filename>/etc/systemd/timesyncd.conf.d/*.conf</filename></member>
       <member><filename>/run/systemd/timesyncd.conf.d/*.conf</filename></member>
       <member><filename>/usr/lib/systemd/timesyncd.conf.d/*.conf</filename></member>