X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-cgls.xml;h=955e0da37c4aee2aaced792977a592e9788851c9;hp=4b6ee93b4e9d9badd56507aae0886dbcdcd7ad3c;hb=89f7c8465cd1ab37347dd0c15920bce31e8225df;hpb=f274ece0f76b5709408821e317e87aef76123db6

diff --git a/man/systemd-cgls.xml b/man/systemd-cgls.xml
index 4b6ee93b4..955e0da37 100644
--- a/man/systemd-cgls.xml
+++ b/man/systemd-cgls.xml
@@ -49,7 +49,9 @@
 
         <refsynopsisdiv>
                 <cmdsynopsis>
-                        <command>systemd-cgls <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt" rep="repeat">CGROUP</arg></command>
+                        <command>systemd-cgls</command>
+                        <arg choice="opt" rep="repeat">OPTIONS</arg>
+                        <arg choice="opt" rep="repeat">CGROUP</arg>
                 </cmdsynopsis>
         </refsynopsisdiv>
 
@@ -58,19 +60,19 @@
 
                 <para><command>systemd-cgls</command> recursively
                 shows the contents of the selected Linux control group
-                hierarchy in a tree. If arguments are specified shows
+                hierarchy in a tree. If arguments are specified, shows
                 all member processes of the specified control groups
                 plus all their subgroups and their members. The
                 control groups may either be specified by their full
                 file paths or are assumed in the systemd control group
                 hierarchy. If no argument is specified and the current
                 working directory is beneath the control group mount
-                point <filename>/sys/fs/cgroup</filename> shows the contents
+                point <filename>/sys/fs/cgroup</filename>, shows the contents
                 of the control group the working directory refers
-                to. Otherwise the full systemd control group hierarchy
+                to. Otherwise, the full systemd control group hierarchy
                 is shown.</para>
 
-                <para>By default empty control groups are not
+                <para>By default, empty control groups are not
                 shown.</para>
         </refsect1>
 
@@ -105,11 +107,20 @@
                         <varlistentry>
                                 <term><option>--all</option></term>
 
-                                <listitem><para>Don't hide empty
+                                <listitem><para>Do not hide empty
                                 control groups in the
                                 output.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><option>-l</option></term>
+                                <term><option>--full</option></term>
+
+                                <listitem><para>Do not ellipsize
+                                process tree members.</para>
+                                </listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><option>-k</option></term>
 
@@ -117,6 +128,16 @@
                                 threads in output.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><option>-M <replaceable>MACHINE</replaceable></option></term>
+                                <term><option>--machine=<replaceable>MACHINE</replaceable></option></term>
+
+                                <listitem><para>Limit control groups shown to
+                                the part corresponding to the
+                                container <replaceable>MACHINE</replaceable>.
+                                </para></listitem>
+                        </varlistentry>
+
                 </variablelist>
 
         </refsect1>
@@ -124,7 +145,7 @@
         <refsect1>
                 <title>Exit status</title>
 
-                <para>On success 0 is returned, a non-zero failure
+                <para>On success, 0 is returned, a non-zero failure
                 code otherwise.</para>
         </refsect1>
 
@@ -134,6 +155,7 @@
                         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>systemd-cgtop</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                         <citerefentry><refentrytitle>ps</refentrytitle><manvolnum>1</manvolnum></citerefentry>
                 </para>
         </refsect1>