X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.journal-fields.xml;h=8a15598e631ed4000a6e25ef64c9dfd96ab53ac4;hb=0a244b8ecb6dfcb381fe831dc2aa9bacb2c12975;hp=ad03282b1ee768dd04f4d3555ad961d5985a04b0;hpb=5199cbe4a4cb0f3e4134e8577dda37c05abf7dc0;p=elogind.git

diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml
index ad03282b1..8a15598e6 100644
--- a/man/systemd.journal-fields.xml
+++ b/man/systemd.journal-fields.xml
@@ -196,6 +196,15 @@
                                 </listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><varname>_CAP_EFFECTIVE=</varname></term>
+                                <listitem>
+                                        <para>The effective <citerefentry><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry> of
+                                        the process the journal entry
+                                        originates from.</para>
+                                </listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><varname>_AUDIT_SESSION=</varname></term>
                                 <term><varname>_AUDIT_LOGINUID=</varname></term>
@@ -214,17 +223,20 @@
                                 <term><varname>_SYSTEMD_UNIT=</varname></term>
                                 <term><varname>_SYSTEMD_USER_UNIT=</varname></term>
                                 <term><varname>_SYSTEMD_OWNER_UID=</varname></term>
+                                <term><varname>_SYSTEMD_SLICE=</varname></term>
 
                                 <listitem>
-                                        <para>The control group path in
-                                        the systemd hierarchy, the
+                                        <para>The control group path
+                                        in the systemd hierarchy, the
                                         systemd session ID (if any),
-                                        the systemd unit name (if any),
-                                        the systemd user session unit name (if any)
-                                        and the owner UID of the
-                                        systemd session (if any) of
-                                        the process the journal entry
-                                        originates from.</para>
+                                        the systemd unit name (if
+                                        any), the systemd user session
+                                        unit name (if any), the owner
+                                        UID of the systemd session (if
+                                        any) and the systemd slice
+                                        unit of the process the
+                                        journal entry originates
+                                        from.</para>
                                 </listitem>
                         </varlistentry>
 
@@ -454,7 +466,7 @@
                 attach <varname>OBJECT_PID=</varname> to a
                 message. This will instruct
                 <command>systemd-journald</command> to attach
-                additional fields on behalf of caller:</para>
+                additional fields on behalf of the caller:</para>
 
                 <variablelist class='journal-directives'>
                         <varlistentry>
@@ -480,7 +492,7 @@
                                 <term><varname>OBJECT_SYSTEMD_UNIT=</varname></term>
                                 <term><varname>OBJECT_SYSTEMD_USER_UNIT=</varname></term>
                                 <listitem>
-                                        <para>Additional fields added automatically
+                                        <para>These are additional fields added automatically
                                         by <command>systemd-journald</command>.
                                         Their meaning is the same as
                                         <varname>_UID=</varname>,
@@ -495,8 +507,8 @@
                                         <varname>_SYSTEMD_UNIT=</varname>,
                                         <varname>_SYSTEMD_USER_UNIT=</varname>, and
                                         <varname>_SYSTEMD_OWNER_UID=</varname>
-                                        described above, except that
-                                        process <replaceable>PID</replaceable>
+                                        as described above, except that the
+                                        process identified by <replaceable>PID</replaceable>
                                         is described, instead of the process
                                         which logged the message.</para>
                                 </listitem>
@@ -516,7 +528,7 @@
                 url="http://www.freedesktop.org/wiki/Software/systemd/json">Journal
                 JSON Format</ulink>, the addresses of journal entries
                 are serialized into fields prefixed with double
-                underscores. Note that these aren't proper fields when
+                underscores. Note that these are not proper fields when
                 stored in the journal but for addressing meta data of
                 entries. They cannot be written as part of structured
                 log entries via calls such as