X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fbootchart.conf.xml;h=e11ccb52f669cb123307fefb25c753c09d1fdb3b;hb=9c0a72f961e00b0447767973e7117e131bea5b5d;hp=1e440eb2cc19c6f1917d3e89cfacc814e81688fb;hpb=e57b477183259eac2d56c5f9d9820170afb1a5e6;p=elogind.git

diff --git a/man/bootchart.conf.xml b/man/bootchart.conf.xml
index 1e440eb2c..e11ccb52f 100644
--- a/man/bootchart.conf.xml
+++ b/man/bootchart.conf.xml
@@ -25,7 +25,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="bootchart.conf" conditional='ENABLE_BOOTCHART'>
+<refentry id="bootchart.conf" conditional='ENABLE_BOOTCHART'
+          xmlns:xi="http://www.w3.org/2001/XInclude">
         <refentryinfo>
                 <title>bootchart.conf</title>
                 <productname>systemd</productname>
@@ -47,23 +48,31 @@
 
         <refnamediv>
                 <refname>bootchart.conf</refname>
-                <refpurpose>Boot performance analysis graphing tool configuration file</refpurpose>
+                <refname>bootchart.conf.d</refname>
+                <refpurpose>Boot performance analysis graphing tool configuration files</refpurpose>
         </refnamediv>
 
         <refsynopsisdiv>
                 <para><filename>/etc/systemd/bootchart.conf</filename></para>
+                <para><filename>/etc/systemd/bootchart.conf.d/*.conf</filename></para>
+                <para><filename>/run/systemd/bootchart.conf.d/*.conf</filename></para>
+                <para><filename>/usr/lib/systemd/bootchart.conf.d/*.conf</filename></para>
         </refsynopsisdiv>
 
         <refsect1>
                 <title>Description</title>
 
                 <para>When starting, systemd-bootchart will read the
-                configuration file <filename>bootchart.conf</filename>.
-                This configuration file determines logging parameters and
-                graph output.</para>
-
+                configuration file
+                <filename>/etc/systemd/bootchart.conf</filename>, followed by
+                the files in the <filename>bootchart.conf.d</filename>
+                directories.  These configuration files determine logging
+                parameters and graph output.</para>
         </refsect1>
 
+        <xi:include href="standard-conf.xml" xpointer="confd" />
+        <xi:include href="standard-conf.xml" xpointer="conf" />
+
         <refsect1>
                 <title>Options</title>
 
@@ -72,7 +81,7 @@
                         <varlistentry>
                                 <term><varname>Samples=500</varname></term>
                                 <listitem><para>Configure the amount of samples to
-                                record total before bootchart exits. Each sample will
+                                record in total before bootchart exits. Each sample will
                                 record at intervals defined by Frequency=.</para></listitem>
                         </varlistentry>
 
@@ -87,7 +96,7 @@
                         <varlistentry>
                                 <term><varname>Relative=no</varname></term>
                                 <listitem><para>Configures whether the left axis of the
-                                output graph equals time=0.0 (CLOCK_MONOTONIC start). This
+                                output graph equals time=0.0 (<constant>CLOCK_MONOTONIC</constant> start). This
                                 is useful for using bootchart at post-boot time to profile
                                 an already booted system, otherwise the graph would become
                                 extremely large. If set to yes, the horizontal axis starts
@@ -107,7 +116,7 @@
 
                         <varlistentry>
                                 <term><varname>Output=[path]</varname></term>
-                                <listitem><para>Configures the output folder for writing
+                                <listitem><para>Configures the output directory for writing
                                 the graphs. By default, bootchart writes the graphs to
                                 <filename>/run/log</filename>.</para></listitem>
                         </varlistentry>
@@ -115,7 +124,7 @@
                         <varlistentry>
                                 <term><varname>Init=[path]</varname></term>
                                 <listitem><para>Configures bootchart to run a non-standard
-                                binary instead of <filename>/sbin/init</filename>. This
+                                binary instead of <filename>/usr/lib/systemd/systemd</filename>. This
                                 option is only relevant if bootchart was invoked from the
                                 kernel command line with
                                 init=/usr/lib/systemd/systemd-bootchart.</para></listitem>
@@ -124,7 +133,7 @@
                         <varlistentry>
                                 <term><varname>PlotMemoryUsage=no</varname></term>
                                 <listitem><para>If set to yes, enables logging and graphing
-                                of processes PSS memory consumption.</para></listitem>
+                                of processes' PSS memory consumption.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -145,6 +154,11 @@
                                 graph components.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><varname>ControlGroup=no</varname></term>
+                                <listitem><para>Display process control group.</para></listitem>
+                        </varlistentry>
+
                 </variablelist>
         </refsect1>