man: don't claim systemd-analyze was documented as part of the man-pages project

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

diff --git a/man/standard-conf.xml b/man/standard-conf.xml
index 123877a0a5a96bb50faf1905ca4a89ef5bbfd768..9c812cec109670299123553c924f982c829fd6ba 100644 (file)
--- a/man/standard-conf.xml
+++ b/man/standard-conf.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0"?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
 <!DOCTYPE refsection PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+
+<!--
+  SPDX-License-Identifier: LGPL-2.1+
+
+  This file is part of systemd.
+
+  Copyright 2015 Zbigniew Jędrzejewski-Szmek
+  Copyright 2014 Josh Triplett
+-->
 
 <refsection>
   <refsection id='confd'>
@@ -33,37 +39,39 @@
     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>&pkgsysconfdir;/</filename> contains commented out entries
+    from those defaults. By default, the configuration file in
+    <filename>/etc/systemd/</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>&rootlibexecdir;/*.conf.d/</filename>. Files in
+    <filename>/usr/lib/systemd/*.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
     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