man/sd_watchdog_enabled: correct minor typos (#4632)

[elogind.git] / man / standard-conf.xml

diff --git a/man/standard-conf.xml b/man/standard-conf.xml
index 36af45927d4f59f3f7eac4d1bbba6a2a441208c5..807702493c7c92e9fe319fbf04fd779d7cd01ab8 100644 (file)
--- a/man/standard-conf.xml
+++ b/man/standard-conf.xml
@@ -30,23 +30,25 @@
     the vendor, the recommended way is to place a symlink to
     <filename>/dev/null</filename> in the configuration directory in
     <filename>/etc/</filename>, with the same filename as the vendor
-    configuration file.</para>
+    configuration file. If the vendor configuration file is included in
+    the initrd image, the image has to be regenerated.</para>
+
   </refsection>
 
   <refsection id='main-conf'>
     <title>Configuration Directories and Precedence</title>
 
-    <para>Default configuration is defined during compilation, so a
+    <para>The default configuration is defined during compilation, so a
     configuration file is only needed when it is necessary to deviate
-    from those defaults. By default the configuration file in
-    <filename>/etc/systemd/</filename> contains commented out entries
+    from those defaults. By default, the configuration file in
+    <filename>/etc/elogind/</filename> contains commented out entries
     showing the defaults as a guide to the administrator. This file
     can be edited to create local overrides.
     </para>
 
     <para>When packages need to customize the configuration, they can
     install configuration snippets in
-    <filename>/usr/lib/systemd/*.conf.d/</filename>. Files in
+    <filename>/usr/lib/elogind/*.conf.d/</filename>. Files in
     <filename>/etc/</filename> are reserved for the local
     administrator, who may use this logic to override the
     configuration files installed by vendor packages. The main
@@ -54,7 +56,7 @@
     directories, and has the lowest precedence; entries in a file in
     any configuration directory override entries in the single
     configuration file. Files in the
-    <filename>logind.conf.d/</filename> configuration subdirectories
+    <filename>*.conf.d/</filename> configuration subdirectories
     are sorted by their filename in lexicographic order, regardless of
     which of the subdirectories they reside in. If multiple files
     specify the same option, the entry in the file with the