service: add FailureAction= option

[elogind.git] / man / systemd-detect-virt.xml

diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
index 75cc714f52ae44c88665a1642816e2b633f9b6b6..bdf220eb28ce0df05123a8bf0ee0ff1d64ac4ff5 100644 (file)
--- a/man/systemd-detect-virt.xml
+++ b/man/systemd-detect-virt.xml
@@ -21,7 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 

-<refentry id="systemd-detect-virt">
+<refentry id="systemd-detect-virt"
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 
         <refentryinfo>
                 <title>systemd-detect-virt</title>
 
         <refentryinfo>
                 <title>systemd-detect-virt</title>


@@ -58,7 +59,7 @@
 
                 <para><command>systemd-detect-virt</command> detects
                 execution in a virtualized environment. It identifies
 
                 <para><command>systemd-detect-virt</command> detects
                 execution in a virtualized environment. It identifies

-                the virtualization technology and can distuingish full
+                the virtualization technology and can distinguish full

                 VM virtualization from container
                 virtualization.</para>
 
                 VM virtualization from container
                 virtualization.</para>
 


@@ -70,14 +71,15 @@
                 <varname>microsoft</varname>,
                 <varname>oracle</varname>, <varname>xen</varname>,
                 <varname>bochs</varname>, <varname>chroot</varname>,
                 <varname>microsoft</varname>,
                 <varname>oracle</varname>, <varname>xen</varname>,
                 <varname>bochs</varname>, <varname>chroot</varname>,

+                <varname>uml</varname>,

                 <varname>openvz</varname>, <varname>lxc</varname>,
                 <varname>lxc-libvirt</varname>,
                 <varname>systemd-nspawn</varname>.</para>
 
                 <varname>openvz</varname>, <varname>lxc</varname>,
                 <varname>lxc-libvirt</varname>,
                 <varname>systemd-nspawn</varname>.</para>
 

-                <para>If multiple virtualization solutions are used
+                <para>If multiple virtualization solutions are used,

                 only the "innermost" is detected and identified. That
                 means if both VM virtualization and container
                 only the "innermost" is detected and identified. That
                 means if both VM virtualization and container

-                virtualization are used in conjunction only the latter
+                virtualization are used in conjunction, only the latter

                 will be identified (unless <option>--vm</option> is
                 passed).</para>
         </refsect1>
                 will be identified (unless <option>--vm</option> is
                 passed).</para>
         </refsect1>


@@ -88,21 +90,6 @@
                 <para>The following options are understood:</para>
 
                 <variablelist>
                 <para>The following options are understood:</para>
 
                 <variablelist>

-                        <varlistentry>
-                                <term><option>-h</option></term>
-                                <term><option>--help</option></term>
-
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--version</option></term>
-
-                                <listitem><para>Prints a short version
-                                string and exits.</para></listitem>
-                        </varlistentry>
-

                         <varlistentry>
                                 <term><option>-c</option></term>
                                 <term><option>--container</option></term>
                         <varlistentry>
                                 <term><option>-c</option></term>
                                 <term><option>--container</option></term>


@@ -130,6 +117,8 @@
                                 identifier.</para></listitem>
                         </varlistentry>
 
                                 identifier.</para></listitem>
                         </varlistentry>
 

+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />

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


@@ -137,7 +126,7 @@
         <refsect1>
                 <title>Exit status</title>
 
         <refsect1>
                 <title>Exit status</title>
 

-                <para>If a virtualization technology is detected 0 is
+                <para>If a virtualization technology is detected, 0 is

                 returned, a non-zero code otherwise.</para>
         </refsect1>
 
                 returned, a non-zero code otherwise.</para>
         </refsect1>