meson: bump package and library version

[thirdparty/systemd.git] / man / standard-conf.xml

diff --git a/man/standard-conf.xml b/man/standard-conf.xml
index 40764f525b28fcf63242ddfac333a069d0192ad4..e1cb7d31ed77f64cb60f7a0d41b0c6b1f5881fb1 100644 (file)
--- a/man/standard-conf.xml
+++ b/man/standard-conf.xml
@@ -2,6 +2,11 @@
 <!DOCTYPE refsection PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
           "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 
+<!--
+  SPDX-License-Identifier: LGPL-2.1+
+  Copyright © 2014 Josh Triplett
+-->
+
 <refsection>
   <refsection id='confd'>
     <title>Configuration Directories and Precedence</title>
@@ -54,14 +59,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