Merge pull request #3078 from poettering/get-processes

A variety of fixes and additions

2 files changed, 23 insertions, 8 deletions

diff --git a/man/daemon.xml b/man/daemon.xml
index fed1ca1f49..485c66225e 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -180,14 +180,12 @@
       functionality of the init system, it is recommended not to
       execute them when run as new-style service.</para>
 
-      <para>Note that new-style init systems guarantee execution of
-      daemon processes in a clean process context: it is guaranteed
-      that the environment block is sanitized, that the signal
-      handlers and mask is reset and that no left-over file
-      descriptors are passed. Daemons will be executed in their own
-      session, with standard input/output/error connected to
-      <filename>/dev/null</filename> unless otherwise configured. The
-      umask is reset.
+      <para>Note that new-style init systems guarantee execution of daemon processes in a clean process context: it is
+      guaranteed that the environment block is sanitized, that the signal handlers and mask is reset and that no
+      left-over file descriptors are passed. Daemons will be executed in their own session, with standard input
+      connected to <filename>/dev/null</filename> and standard output/error connected to the
+      <citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+      logging service, unless otherwise configured. The umask is reset.
       </para>
 
       <para>It is recommended for new-style daemons to implement the
diff --git a/man/journalctl.xml b/man/journalctl.xml
index 7a634879cc..3efe6ef62a 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -272,6 +272,16 @@
 
             <varlistentry>
               <term>
+                <option>short-unix</option>
+              </term>
+              <listitem>
+                <para>is very similar, but shows seconds passed since January 1st 1970 UTC instead of wallclock
+                timestamps ("UNIX time"). The time is shown with microsecond accuracy.</para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>
                 <option>verbose</option>
               </term>
               <listitem>
@@ -350,6 +360,13 @@
       </varlistentry>
 
       <varlistentry>
+        <term><option>--no-hostname</option></term>
+
+        <listitem><para>Don't show the hostname field of log messages originating from the local host. This switch only
+        has an effect on the <option>short</option> family of output modes (see above).</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term><option>-x</option></term>
         <term><option>--catalog</option></term>