Updated man/loginctl.xml to fit elogind a bit better.

diff --git a/man/loginctl.xml b/man/loginctl.xml
index 2aae26df2a0de59ef122dfd89178fc517e1e05ae..97ac8d74fbdc9c647b3d7580c3db6e27ffc1aac2 100644 (file)
--- a/man/loginctl.xml
+++ b/man/loginctl.xml
@@ -314,6 +314,7 @@ else -->
         formatted human-readable output.</para></listitem>
       </varlistentry>
 
+      <!-- 0 /// elogind does not spawn a user manager. Mask until lingeringin elogind is clarified.
       <varlistentry>
         <term><command>enable-linger</command> <optional><replaceable>USER</replaceable>…</optional></term>
         <term><command>disable-linger</command> <optional><replaceable>USER</replaceable>…</optional></term>
@@ -330,6 +331,7 @@ else -->
         <citerefentry><refentrytitle>logind.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
         </para></listitem>
       </varlistentry>
+      // 0 -->
 
       <varlistentry>
         <term><command>terminate-user</command> <replaceable>USER</replaceable>…</term>
@@ -487,6 +489,7 @@ else -->
     <example>
       <title>Querying user status</title>
 
+      <!-- 0 /// With elogind no Unit and jurnald output is generated
       <programlisting>$ loginctl user-status
 fatima (1005)
            Since: Sat 2016-04-09 14:23:31 EDT; 54min ago
@@ -498,13 +501,22 @@ fatima (1005)
                   ├─session-3.scope
                     …
                   └─session-5.scope
-                    ├─3473 login -- fatima
+                    ├─3473 login &#x2D;&#x2D; fatima
                     └─3515 -zsh
 
 Apr 09 14:40:30 laptop login[2325]: pam_unix(login:session):
                        session opened for user fatima by LOGIN(uid=0)
 Apr 09 14:40:30 laptop login[2325]: LOGIN ON tty3 BY fatima
 </programlisting>
+      --><!-- else -->
+      <programlisting>$ loginctl user-status
+fatima (1005)
+           Since: Sat 2016-04-09 14:23:31 EDT; 54min ago
+           State: active
+        Sessions: 5 *3
+            Unit: user-1005.slice
+</programlisting>
+      <!-- // 0 -->
 
       <para>There are two sessions, 3 and 5. Session 3 is a graphical session,
       marked with a star. The tree of processing including the two corresponding

diff --git a/man/user-system-options.xml b/man/user-system-options.xml
index 73308b58cc57e0d9fd9534d13ed30ba5d9e5a9f2..1bcafd244334a7af7e981e27e41b290e5a18dc47 100644 (file)
--- a/man/user-system-options.xml
+++ b/man/user-system-options.xml
@@ -25,8 +25,9 @@
 -->
 
 <variablelist>
+  <!-- 0 /// With elogind there is no calling user systemd instance.
   <varlistentry id='user'>
-    <term><option>--user</option></term>
+    <term><option>&#x2D;&#x2D;user</option></term>
 
     <listitem id='user-text'>
       <para>Talk to the service manager of the calling user,
@@ -35,13 +36,14 @@
   </varlistentry>
 
   <varlistentry id='system'>
-    <term><option>--system</option></term>
+    <term><option>&#x2D;&#x2D;system</option></term>
 
     <listitem id='system-text'>
       <para>Talk to the service manager of the system. This is the
       implied default.</para>
     </listitem>
   </varlistentry>
+  <!-- // 0 -->
 
   <varlistentry id='host'>
     <term><option>-H</option></term>