X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-detect-virt.xml;h=d3969e1f8215f54c9f31228f5d7072686e96edfd;hp=762b6ab992a3f89aec4b1e74780275d8b72a0ea6;hb=b3a2a7ceb7b0db3003c205bc49853fd62df155dc;hpb=f274ece0f76b5709408821e317e87aef76123db6

diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
index 762b6ab99..d3969e1f8 100644
--- 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/>.
 -->
 
-<refentry id="systemd-detect-virt">
+<refentry id="systemd-detect-virt"
+          xmlns:xi="http://www.w3.org/2001/XInclude">
 
         <refentryinfo>
                 <title>systemd-detect-virt</title>
@@ -67,17 +68,20 @@
                 virtualization technology. The following technologies
                 are currently identified: <varname>qemu</varname>,
                 <varname>kvm</varname>, <varname>vmware</varname>,
-                <varname>microsoft</varname>,
-                <varname>oracle</varname>, <varname>xen</varname>,
-                <varname>bochs</varname>, <varname>chroot</varname>,
+                <varname>microsoft</varname> (Hyper-V, also known as
+                Viridian or Windows Server Virtualization),
+                <varname>oracle</varname> (VirtualBox),
+                <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>systemd-nspawn</varname>,
+                <varname>docker</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
-                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>
@@ -88,21 +92,6 @@
                 <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>
@@ -130,6 +119,8 @@
                                 identifier.</para></listitem>
                         </varlistentry>
 
+                        <xi:include href="standard-options.xml" xpointer="help" />
+                        <xi:include href="standard-options.xml" xpointer="version" />
                 </variablelist>
 
         </refsect1>
@@ -137,7 +128,7 @@
         <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>