man: document logind's IdleAction= and IdleActionSec=

[elogind.git] / man / systemd-journal-gatewayd.service.xml

diff --git a/man/systemd-journal-gatewayd.service.xml b/man/systemd-journal-gatewayd.service.xml
index 9b0fce60979b1c68ba55084fc83f1fe0bdfa7504..562d22186b732da3ab4f3d5f0b14f4c730f87cc5 100644 (file)
--- a/man/systemd-journal-gatewayd.service.xml
+++ b/man/systemd-journal-gatewayd.service.xml
@@ -61,7 +61,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
     <para><command>systemd-journal-gatewayd</command> serves journal
     events over the network. Clients must connect using
-    HTTP, to port 19531 by default.</para>
+    HTTP. The server listens on port 19531 by default.</para>
 
     <para>The program is started by
     <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>
@@ -101,6 +101,31 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
         returned. Supported parameters are described below.</para>
         </listitem>
       </varlistentry>
+
+      <varlistentry>
+        <term><option>/machine</option></term>
+
+        <listitem><para>Return a JSON structure describing the machine.</para>
+
+        <para>Example:
+        <programlisting>
+{ "machine_id" : "8cf7ed9d451ea194b77a9f118f3dc446",
+  "boot_id" : "3d3c9efaf556496a9b04259ee35df7f7",
+  "hostname" : "fedora",
+  "os_pretty_name" : "Fedora 19 (Rawhide)",
+  "virtualization" : "kvm",
+  ...}
+        </programlisting>
+        </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>/fields/</option><replaceable>FIELD_NAME</replaceable></term>
+
+        <listitem><para>Return a list of values of this field present in the logs.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
 
@@ -108,7 +133,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     <title>Accept header</title>
 
     <para>
-      <option>Accept: &lt;format&gt;</option>
+      <option>Accept: </option><replaceable>format</replaceable>
     </para>
 
     <para>Recognized formats:</para>