logind: implement delay inhibitor locks in addition to block inhibitor locks

[elogind.git] / man / systemd.journal-fields.xml

diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml
index 5f2a32cb00e29a2b44d6a10964be2bf9cfc6b2dd..c523ab090817db92eda913159db7de77a386b0f3 100644 (file)
--- a/man/systemd.journal-fields.xml
+++ b/man/systemd.journal-fields.xml
@@ -8,16 +8,16 @@
   Copyright 2010 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
   Copyright 2010 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it

-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or

   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

-  General Public License for more details.
+  Lesser General Public License for more details.

 
 

-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License

   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 


@@ -226,9 +226,10 @@
                                         timestamp of the message, if
                                         any is known that is different
                                         from the reception time of the
                                         timestamp of the message, if
                                         any is known that is different
                                         from the reception time of the

-                                        journal. The time in usec
-                                        since the epoch formatted as
-                                        decimal string.</para>
+                                        journal. This is the time in
+                                        usec since the epoch UTC
+                                        formatted as decimal
+                                        string.</para>

                                 </listitem>
                         </varlistentry>
 
                                 </listitem>
                         </varlistentry>
 


@@ -260,6 +261,31 @@
                                         originating host.</para>
                                 </listitem>
                         </varlistentry>
                                         originating host.</para>
                                 </listitem>
                         </varlistentry>

+
+                        <varlistentry>
+                                <term>_TRANSPORT=</term>
+                                <listitem>
+                                        <para>How the entry was
+                                        received by the journal
+                                        service. One of
+                                        <literal>driver</literal>,
+                                        <literal>syslog</literal>,
+                                        <literal>journal</literal>,
+                                        <literal>stdout</literal>,
+                                        <literal>kernel</literal> for
+                                        internally generated messages,
+                                        for those received via the
+                                        local syslog socket with the
+                                        syslog protocol, for those
+                                        received via the native
+                                        journal protocol, for the
+                                        those read from a services'
+                                        standard output or error
+                                        output, and for those read
+                                        from the kernel, resp.
+                                        </para>
+                                </listitem>
+                        </varlistentry>

                 </variablelist>
         </refsect1>
 
                 </variablelist>
         </refsect1>
 


@@ -293,7 +319,9 @@
                                         <para>The wallclock time
                                         (CLOCK_REALTIME) at the point
                                         in time the entry was received
                                         <para>The wallclock time
                                         (CLOCK_REALTIME) at the point
                                         in time the entry was received

-                                        by the journal. This has
+                                        by the journal, in usec since
+                                        the epoch UTC formatted as
+                                        decimal string. This has

                                         different properties from
                                         <literal>_SOURCE_REALTIME_TIMESTAMP=</literal>
                                         as it is usually a bit later
                                         different properties from
                                         <literal>_SOURCE_REALTIME_TIMESTAMP=</literal>
                                         as it is usually a bit later


@@ -308,10 +336,12 @@
                                         <para>The monotonic time
                                         (CLOCK_MONOTONIC) at the point
                                         in time the entry was received
                                         <para>The monotonic time
                                         (CLOCK_MONOTONIC) at the point
                                         in time the entry was received

-                                        by the journal. To be useful
-                                        as an address for the entry
-                                        this should be combined with
-                                        with boot ID in
+                                        by the journal in usec
+                                        formatted as decimal
+                                        string. To be useful as an
+                                        address for the entry this
+                                        should be combined with with
+                                        boot ID in

                                         <literal>_BOOT_ID=</literal>.</para>
                                 </listitem>
                         </varlistentry>
                                         <literal>_BOOT_ID=</literal>.</para>
                                 </listitem>
                         </varlistentry>