man: clarify what "microsoft" and "oracle" stand for

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

diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
index f21493df643ee9cdf71c334c89f83131956b363a..d3969e1f8215f54c9f31228f5d7072686e96edfd 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>


@@ -67,18 +68,20 @@
                 virtualization technology. The following technologies
                 are currently identified: <varname>qemu</varname>,
                 <varname>kvm</varname>, <varname>vmware</varname>,
                 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>uml</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>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
                 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>


@@ -89,21 +92,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>


@@ -131,6 +119,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>


@@ -138,7 +128,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>