man: explain precedence for options which take a list (#7010)

Hopefully finally fixes #6639.

diff --git a/TODO b/TODO
index e4846f0..81f0099 100644 (file)
--- a/TODO
+++ b/TODO
@@ -736,6 +736,8 @@ Features:
 
 * create /sbin/init symlinks from the build system
 
+* add a dependency on standard-conf.xml and other included files to man pages
+
 * MountFlags=shared acts as MountFlags=slave right now.
 
 * properly handle loop back mounts via fstab, especially regards to fsck/passno

diff --git a/man/standard-conf.xml b/man/standard-conf.xml
index 40764f5..2836afc 100644 (file)
--- a/man/standard-conf.xml
+++ b/man/standard-conf.xml
@@ -54,14 +54,15 @@
     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
-    <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
-    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.</para>
+    configuration file. Files in the <filename>*.conf.d/</filename>
+    configuration subdirectories are sorted by their filename in lexicographic
+    order, regardless of which of the subdirectories they reside in. When
+    multiple files specify the same option, for options which accept just a
+    single value, the entry in the file with the lexicographically latest name
+    takes precedence. For options which accept a list of values, entries are
+    collected as they occur in files sorted lexicographically. 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.</para>
 
     <para>To disable a configuration file supplied by the vendor, the
     recommended way is to place a symlink to