X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fstandard-conf.xml;h=15268030f8648d5feff3605e6ddba1d02680f5e9;hb=6f5cab404dbf4a19ac9e882e37b1cb86fd0614d4;hp=b87d7e955bf82844dc066fe9b961018dc2ba5c66;hpb=d3fae78fe86f1dfcdb07fd613ccbb3adf547a617;p=elogind.git
diff --git a/man/standard-conf.xml b/man/standard-conf.xml
index b87d7e955..15268030f 100644
--- a/man/standard-conf.xml
+++ b/man/standard-conf.xml
@@ -30,16 +30,44 @@
the vendor, the recommended way is to place a symlink to
/dev/null in the configuration directory in
/etc/, with the same filename as the vendor
- configuration file.
+ configuration file. If the vendor configuration file is included in
+ the initrd image, the image has to be regenerated.
+
-
- Configuration File
+
+ Configuration Directories and Precedence
+
+ 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
+ /etc/elogind/ contains commented out entries
+ showing the defaults as a guide to the administrator. This file
+ can be edited to create local overrides.
+
- Configuration is also read from a single configuration file in
- /etc/. This file is read before any of the
- configuration directories, and has the lowest precedence; entries in a file
- in any configuration directory override entries in the single configuration
- file.
+ When packages need to customize the configuration, they can
+ install configuration snippets in
+ /usr/lib/elogind/*.conf.d/. Files in
+ /etc/ are reserved for the local
+ administrator, who may use this logic to override the
+ configuration files installed by vendor packages. The main
+ configuration file is read before any of the configuration
+ directories, and has the lowest precedence; entries in a file in
+ any configuration directory override entries in the single
+ configuration file. Files in the
+ *.conf.d/ 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
+ lexicographically latest name takes 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.
+
+ To disable a configuration file supplied by the vendor, the
+ recommended way is to place a symlink to
+ /dev/null in the configuration directory in
+ /etc/, with the same filename as the vendor
+ configuration file.