Index: /trunk/doc/manual/Makefile.kmk
===================================================================
--- /trunk/doc/manual/Makefile.kmk	(revision 56567)
+++ /trunk/doc/manual/Makefile.kmk	(revision 56568)
@@ -877,7 +877,7 @@
 	$$(QUIET)$$(VBOX_XSLTPROC_WITH_CAT) --output $$@ \
 		$$(VBOX_PATH_MANUAL_SRC)/docbook-refentry-to-manpage-preprocessing.xsl $$<
-# ifdef VBOX_HAVE_XMLLINT
-#	$$(VBOX_XMLLINT_WITH_CAT) --dtdvalid $$(VBOX_PATH_DOCBOOK_DTD)/docbookx.dtd $$@
-# endif
+if defined(VBOX_HAVE_XMLLINT) && "$(USER)" == "bird" # Effing stuff happends on build servers, probably kmk related...
+	$$(VBOX_XMLLINT_WITH_CAT) --dtdvalid $$(VBOX_PATH_DOCBOOK_DTD)/docbookx.dtd $$@
+endif
 
 $$(VBOX_PATH_MANUAL_OUTBASE)/$(1)/$(patsubst man_%,%.1,$(basename $(2))): \
Index: /trunk/doc/manual/docbook-refentry-to-C-help.xsl
===================================================================
--- /trunk/doc/manual/docbook-refentry-to-C-help.xsl	(revision 56567)
+++ /trunk/doc/manual/docbook-refentry-to-C-help.xsl	(revision 56568)
@@ -28,4 +28,6 @@
   <xsl:output method="text" version="1.0" encoding="utf-8" indent="yes"/>
   <xsl:strip-space elements="*"/>
+
+  <xsl:param name="g_fDebugText" select="0"/>
 
   <xsl:variable name="g_sUnderlineRefSect1">
@@ -332,6 +334,6 @@
 
   <xsl:template match="varlistentry/listitem">
-    <xsl:if test="text() or *[not(self::para or self::itemizedlist)]">
-      <xsl:message terminate="yes">Expected varlistentry/listitem to only contain para elements</xsl:message>
+    <xsl:if test="text() or *[not(self::para or self::itemizedlist or self::orderedlist)]">
+      <xsl:message terminate="yes">Expected varlistentry/listitem to only contain para, itemizedlist and orderedlist elements</xsl:message>
     </xsl:if>
     <xsl:apply-templates select="*"/>
@@ -340,12 +342,12 @@
 
   <!--
-    itemizedlist
-    -->
-  <xsl:template match="itemizedlist">
+    itemizedlist and orderedlist
+    -->
+  <xsl:template match="itemizedlist|orderedlist">
     <xsl:if test="*[not(self::listitem)]|text()">
-      <xsl:message terminate="yes">Only listitem elements are supported in itemizedlist.</xsl:message>
+      <xsl:message terminate="yes">Only listitem elements are supported in <xsl:value-of select="name()"/>.</xsl:message>
     </xsl:if>
     <xsl:if test="parent::para">
-      <xsl:message terminate="yes">itemizedlist inside a para is current not supported. <!-- no newline
+      <xsl:message terminate="yes"><xsl:value-of select="name()"/> inside a para is current not supported. <!-- no newline
         -->Close the para before the list, it makes no difference to html and latex/pdf output.</xsl:message>
     </xsl:if>
@@ -359,7 +361,7 @@
   </xsl:template>
 
-  <xsl:template match="itemizedlist/listitem">
+  <xsl:template match="itemizedlist/listitem|orderedlist/listitem">
     <xsl:if test="text() or *[not(self::para)]">
-      <xsl:message terminate="yes">Expected itemizedlist/listitem to only contain para elements</xsl:message>
+      <xsl:message terminate="yes">Expected <xsl:value-of select="name()"/>/listitem to only contain para elements</xsl:message>
     </xsl:if>
     <xsl:if test="position() != 1 and @spaceing != 'compact'">
@@ -420,9 +422,17 @@
 
 
-
   <!--
     Text escaping for C.
     -->
   <xsl:template match="text()" name="escape_text">
+    <!-- Leading whitespace hack! -->
+    <xsl:if test="substring(.,1,1) = ' ' and position() != 1">
+      <xsl:text> </xsl:text>
+      <xsl:if test="boolean($g_fDebugText)">
+        <xsl:message>text: add space</xsl:message>
+      </xsl:if>
+    </xsl:if>
+
+    <!-- Body of text -->
     <xsl:choose>
 
@@ -436,20 +446,32 @@
           </xsl:call-template>
         </xsl:variable>
-        <xsl:call-template name="str:subst">
-          <xsl:with-param name="text" select="$sTmp"/>
-          <xsl:with-param name="replace" select="'&quot;'"/>
-          <xsl:with-param name="with" select="'\&quot;'"/>
-          <xsl:with-param name="disable-output-escaping" select="yes"/>
-        </xsl:call-template>
+        <xsl:variable name="sTmp2">
+          <xsl:call-template name="str:subst">
+            <xsl:with-param name="text" select="$sTmp"/>
+            <xsl:with-param name="replace" select="'&quot;'"/>
+            <xsl:with-param name="with" select="'\&quot;'"/>
+            <xsl:with-param name="disable-output-escaping" select="yes"/>
+          </xsl:call-template>
+        </xsl:variable>
+        <xsl:value-of select="$sTmp2"/>
+        <xsl:if test="boolean($g_fDebugText)">
+          <xsl:message>text: |<xsl:value-of select="$sTmp2"/>|</xsl:message>
+        </xsl:if>
       </xsl:when>
 
       <xsl:otherwise>
         <xsl:value-of select="normalize-space(.)"/>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <!-- Ugly whitespace hack! Mainly for <arg>-_-cpu <replaceable>id</replaceable></arg> -->
-    <xsl:if test="substring(.,string-length(.)) = ' ' and position() != last()">
+        <xsl:if test="boolean($g_fDebugText)">
+          <xsl:message>text: |<xsl:value-of select="normalize-space(.)"/>|</xsl:message>
+        </xsl:if>
+      </xsl:otherwise>
+    </xsl:choose>
+
+    <!-- Trailing whitespace hack! -->
+    <xsl:if test="substring(.,string-length(.)) = ' ' and position() != last() and string-length(.) != 1">
       <xsl:text> </xsl:text>
+      <xsl:if test="boolean($g_fDebugText)">
+        <xsl:message>text: add space</xsl:message>
+      </xsl:if>
     </xsl:if>
 
@@ -478,23 +500,38 @@
           </xsl:call-template>
         </xsl:variable>
-        <xsl:call-template name="str:subst">
-          <xsl:with-param name="text" select="$sTmp2"/>
-          <xsl:with-param name="replace" select="' '"/>
-          <xsl:with-param name="with" select="'\b'"/>
-          <xsl:with-param name="disable-output-escaping" select="yes"/>
-        </xsl:call-template>
+        <xsl:variable name="sTmp3">
+          <xsl:call-template name="str:subst">
+            <xsl:with-param name="text" select="$sTmp2"/>
+            <xsl:with-param name="replace" select="' '"/>
+            <xsl:with-param name="with" select="'\b'"/>
+            <xsl:with-param name="disable-output-escaping" select="yes"/>
+          </xsl:call-template>
+        </xsl:variable>
+        <xsl:value-of select="$sTmp3"/>
+        <xsl:if test="boolean($g_fDebugText)">
+          <xsl:message>text! |<xsl:value-of select="$sTmp3"/>|</xsl:message>
+        </xsl:if>
       </xsl:when>
 
       <xsl:when test="contains($sText, ' ')">
-        <xsl:call-template name="str:subst">
-          <xsl:with-param name="text" select="$sText"/>
-          <xsl:with-param name="replace" select="' '"/>
-          <xsl:with-param name="with" select="'\b'"/>
-          <xsl:with-param name="disable-output-escaping" select="yes"/>
-        </xsl:call-template>
+        <xsl:variable name="sTmp">
+          <xsl:call-template name="str:subst">
+            <xsl:with-param name="text" select="$sText"/>
+            <xsl:with-param name="replace" select="' '"/>
+            <xsl:with-param name="with" select="'\b'"/>
+            <xsl:with-param name="disable-output-escaping" select="yes"/>
+          </xsl:call-template>
+        </xsl:variable>
+        <xsl:value-of select="$sTmp"/>
+        <xsl:if test="boolean($g_fDebugText)">
+          <xsl:message>text! |<xsl:value-of select="$sTmp"/>|</xsl:message>
+        </xsl:if>
       </xsl:when>
 
       <xsl:otherwise>
         <xsl:value-of select="$sText"/>
+        <xsl:if test="boolean($g_fDebugText)">
+          <xsl:message>text! |<xsl:value-of select="$sText"/>|</xsl:message>
+        </xsl:if>
       </xsl:otherwise>
     </xsl:choose>
@@ -562,7 +599,4 @@
 
     <xsl:for-each select="node()[not(self::remark)]">
-      <xsl:if test="position() != 1">
-        <xsl:text> </xsl:text>
-      </xsl:if>
       <xsl:choose>
         <xsl:when test="name() = ''">
@@ -712,4 +746,5 @@
     <xsl:for-each select="ancestor-or-self::*">
       <xsl:choose>
+
         <xsl:when test="self::refsect1
                       | self::refsect2
@@ -718,14 +753,28 @@
           <xsl:text>  </xsl:text>
         </xsl:when>
-        <xsl:when test="self::term"/> <!-- currently no indent. -->
-        <xsl:when test="self::listitem and parent::varlistentry">
+
+        <xsl:when test="self::term">
+           <!-- currently no indent. -->
+        </xsl:when>
+
+        <!-- Evidence here (especially with orderedlist) that doing list by for-each
+             listitem in the template matching the list type would be easier... -->
+        <xsl:when test="self::listitem and parent::itemizedlist and (position() + 1) = $iDepth">
+          <xsl:text>  - </xsl:text>
+        </xsl:when>
+
+        <xsl:when test="self::listitem and parent::orderedlist and (position() + 1) = $iDepth">
+          <xsl:variable name="iNumber" select="count(preceding-sibling::listitem) + 1"/>
+          <xsl:if test="$iNumber &lt;= 9">
+            <xsl:text> </xsl:text>
+          </xsl:if>
+          <xsl:value-of select="$iNumber"/>
+          <xsl:text>. </xsl:text>
+        </xsl:when>
+
+        <xsl:when test="self::listitem">
           <xsl:text>    </xsl:text>
         </xsl:when>
-        <xsl:when test="self::listitem and parent::itemizedlist and (position() + 1) = $iDepth">
-          <xsl:text>  * </xsl:text>
-        </xsl:when>
-        <xsl:when test="self::listitem and parent::itemizedlist">
-          <xsl:text>    </xsl:text>
-        </xsl:when>
+
       </xsl:choose>
     </xsl:for-each>
Index: /trunk/doc/manual/en_US/man_VBoxManage-debugvm.xml
===================================================================
--- /trunk/doc/manual/en_US/man_VBoxManage-debugvm.xml	(revision 56567)
+++ /trunk/doc/manual/en_US/man_VBoxManage-debugvm.xml	(revision 56568)
@@ -37,5 +37,5 @@
       <arg choice="req"><replaceable>uuid|vmname</replaceable></arg>
       <arg choice="plain">dumpvmcore</arg>
-      <arg>--filename <replaceable>name</replaceable></arg>
+      <arg>--filename=<replaceable>name</replaceable></arg>
     </cmdsynopsis>
     <cmdsynopsis id="synopsis-vboxmanage-debugvm-info">
@@ -86,5 +86,5 @@
       <arg choice="req"><replaceable>uuid|vmname</replaceable></arg>
       <arg choice="plain">osdmesg</arg>
-      <arg>--lines <replaceable>lines</replaceable></arg>
+      <arg>--lines=<replaceable>lines</replaceable></arg>
     </cmdsynopsis>
     <cmdsynopsis id="synopsis-vboxmanage-debugvm-getregisters">
@@ -92,5 +92,5 @@
       <arg choice="req"><replaceable>uuid|vmname</replaceable></arg>
       <arg choice="plain">getregisters</arg>
-      <arg>--cpu <replaceable>id</replaceable></arg>
+      <arg>--cpu=<replaceable>id</replaceable></arg>
       <arg rep="repeat"><replaceable>reg-set.reg-name</replaceable></arg>
     </cmdsynopsis>
@@ -99,5 +99,5 @@
       <arg choice="req"><replaceable>uuid|vmname</replaceable></arg>
       <arg choice="plain">setregisters</arg>
-      <arg>--cpu <replaceable>id</replaceable></arg>
+      <arg>--cpu=<replaceable>id</replaceable></arg>
       <arg rep="repeat"><replaceable>reg-set.reg-name=value</replaceable></arg>
     </cmdsynopsis>
@@ -115,5 +115,5 @@
       <arg>--reset</arg>
       <arg>--descriptions</arg>
-      <arg>--pattern <replaceable>pattern</replaceable></arg>
+      <arg>--pattern=<replaceable>pattern</replaceable></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
@@ -153,5 +153,5 @@
       <variablelist>
         <varlistentry>
-          <term><option>--filename <replaceable>filename</replaceable></option></term>
+          <term><option>--filename=<replaceable>filename</replaceable></option></term>
           <listitem><para>The name of the output file.</para></listitem>
         </varlistentry>
@@ -204,5 +204,20 @@
       <remark role="help-copy-synopsis"/>
       <para>
-        TODO
+        Changes the group settings for either debug (<option>--debug</option>)
+        or release (<option>--release</option>) logger of the VM process.
+      </para>
+      <para>
+        The <replaceable>group-settings</replaceable> are typically strings on the form
+        <computeroutput>em.e.f.l</computeroutput>, <computeroutput>hm=~0</computeroutput>
+        and <computeroutput>-em.f</computeroutput>.  Basic wildcards are supported for
+        group matching.  The <computeroutput>all</computeroutput> group is an alias for
+        all the groups.
+      </para>
+      <para>
+        Please do keep in mind that the group settings are applied as modifications
+        to the current ones.
+      </para>
+      <para>
+        This corresponds to the <command>log</command> command in the debugger.
       </para>
     </refsect2>
@@ -212,5 +227,74 @@
       <remark role="help-copy-synopsis"/>
       <para>
-        TODO
+        Changes the destination settings for either debug (<option>--debug</option>)
+        or release (<option>--release</option>) logger of the VM process.  For details
+        on the destination format, the best source is src/VBox/Runtime/common/log/log.cpp.
+      </para>
+      <para>
+        The <replaceable>destinations</replaceable> is one or more mnemonics, optionally
+        prefixed by "no" to disable them.  Some of them take values after a ":" or "="
+        separator.  Multiple mnemonics can be separated by space or given as separate
+        arguments on the command line.
+      </para>
+      <para>
+        List of available destination:
+      </para>
+      <variablelist>
+        <varlistentry>
+          <term><option>file[=<replaceable>file</replaceable>], nofile</option></term>
+          <listitem><para>Specifies a log file.  It no filname is given, one will be
+              generated based on the current UTC time and VM process name and placed in
+              the current directory of the VM process.  Note that this will currently not
+              have any effect if the log file has already been opened.
+          </para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>dir=<replaceable>directory</replaceable>, nodir</option></term>
+          <listitem><para>Specifies the output directory for log files.  Note that this
+              will currently not  have any effect if the log file has already been opened.
+          </para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>history=<replaceable>count</replaceable>, nohistory</option></term>
+          <listitem><para>A non-zero value enables log historization, with the value
+            specifying how many old log files to keep.
+          </para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>histsize=<replaceable>bytes</replaceable></option></term>
+          <listitem><para>The max size of a log file before it is historized.  Default is infinite.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>histtime=<replaceable>seconds</replaceable></option></term>
+          <listitem><para>The max age (in seconds) of a log file before it is historized.  Default is infinite.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>ringbuffer, noringbuffer</option></term>
+          <listitem><para>Only log to the log buffer until an explicit flush (e.g. via an assertion)
+              occurs.  This is fast and saves diskspace.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>stdout, nostdout</option></term>
+          <listitem><para>Write the log content to standard output.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>stdout, nostdout</option></term>
+          <listitem><para>Write the log content to standard error.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>debugger, nodebugger</option></term>
+          <listitem><para>Write the log content to the debugger, if supported by the host OS.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>com, nocom</option></term>
+          <listitem><para>Writes logging to the COM port. This is only applicable for raw-mode and ring-0 logging.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>user, nouser</option></term>
+          <listitem><para>Custom destination which has no meaning to VM processes..</para></listitem>
+        </varlistentry>
+      </variablelist>
+      <para>
+        This corresponds to the <command>logdest</command> command in the debugger.
       </para>
     </refsect2>
@@ -220,5 +304,123 @@
       <remark role="help-copy-synopsis"/>
       <para>
-        TODO
+        Changes the flags on either debug (<option>--debug</option>) or release
+        (<option>--release</option>) logger of the VM process.  Please note that the
+        modifications are applied onto the existing changes, they are not replacing them.
+      </para>
+      <para>
+        The <replaceable>flags</replaceable> are a list of flag mnemonics, optionally
+        prefixed by a "no", "!", "~" or "-" to negate their meaning.  The "+" prefix
+        can be used to undo previous negation or use as a separator, though better use
+        whitespace or separate arguments for that.
+      </para>
+      <para>
+        List of log flag mnemonics, with their counter form where applicable
+        (asterisk indicates defaults):
+      </para>
+      <variablelist>
+        <varlistentry>
+          <term><option>enabled*, disabled</option></term>
+          <listitem><para>Enables or disables logging.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>buffered, unbuffered*</option></term>
+          <listitem><para>Enabling buffering of log output before it hits the destinations.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>writethrough(/writethru)</option></term>
+          <listitem><para>Whether to open the destination file with writethru buffering settings or not.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>flush</option></term>
+          <listitem><para>Enables flushing of the output file (to disk) after each log statement.</para></listitem>
+        </varlistentry>
+        <!-- Prefixes -->
+        <varlistentry>
+          <term><option>lockcnts</option></term>
+          <listitem><para>Prefix each log line with lock counts for the current thread.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>cpuid</option></term>
+          <listitem><para>Prefix each log line with the ID of the current CPU.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>pid</option></term>
+          <listitem><para>Prefix each log line with the current process ID.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>flagno</option></term>
+          <listitem><para>Prefix each log line with the numberic flags corresponding to the log statement.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>flag</option></term>
+          <listitem><para>Prefix each log line with the flag mnemonics corresponding to the log statement.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>groupno</option></term>
+          <listitem><para>Prefix each log line with the log group number for the log statement producing it.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>group</option></term>
+          <listitem><para>Prefix each log line with the log group name for the log statement producing it.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>tid</option></term>
+          <listitem><para>Prefix each log line with the current thread identifier.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>thread</option></term>
+          <listitem><para>Prefix each log line with the current thread name.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>time</option></term>
+          <listitem><para>Prefix each log line with the current UTC wall time.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>timeprog</option></term>
+          <listitem><para>Prefix each log line with the current monotonic time since the start of the program.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>msprog</option></term>
+          <listitem><para>Prefix each log line with the current monotonic timestamp value in milliseconds since the start of the program.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>ts</option></term>
+          <listitem><para>Prefix each log line with the current monotonic timestamp value in nanoseconds.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>tsc</option></term>
+          <listitem><para>Prefix each log line with the current CPU timestamp counter (TSC) value.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>rel, abs*</option></term>
+          <listitem><para>Selects the whether <computeroutput>ts</computeroutput> and
+              <computeroutput>tsc</computeroutput> prefixes should be displayed as relative to the
+              previous log line or as absolute time.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>hex*, dec</option></term>
+          <listitem><para>Selects the whether the <computeroutput>ts</computeroutput> and
+              <computeroutput>tsc</computeroutput> prefixes should be formatted as hexadecimal
+              or decimal.</para></listitem>
+        </varlistentry>
+
+        <!-- Suffixes and weird stuff. -->
+        <varlistentry>
+          <term><option>custom</option></term>
+          <listitem><para>Custom log prefix, has by default no meaning for VM processes.</para></listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><option>usecrlf, uself*</option></term>
+          <listitem><para>Output with DOS style (CRLF) or just UNIX style (LF) line endings.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>overwrite*, append</option></term>
+          <listitem><para>Overwrite the destination file or append to it.</para></listitem>
+        </varlistentry>
+      </variablelist>
+
+      <para>
+        This corresponds to the <command>logflags</command> command in the debugger.
       </para>
     </refsect2>
@@ -253,5 +455,5 @@
       <variablelist>
         <varlistentry>
-          <term><option>--lines <replaceable>lines</replaceable></option></term>
+          <term><option>--lines=<replaceable>lines</replaceable></option></term>
           <listitem><para>Number of lines of the log to display, counting from
           the end. The default is infinite.</para></listitem>
@@ -271,11 +473,11 @@
           <listitem>
             <para>One of more registers, each having one of the following forms:</para>
-            <itemizedlist>
-              <listitem><para><replaceable>register-set.register-name.sub-field</replaceable></para></listitem>
-              <listitem><para><replaceable>register-set.register-name</replaceable></para></listitem>
-              <listitem><para><replaceable>cpu-register-name.sub-field</replaceable></para></listitem>
-              <listitem><para><replaceable>cpu-register-name</replaceable></para></listitem>
-              <listitem><para><replaceable>all</replaceable></para></listitem>
-            </itemizedlist>
+            <orderedlist>
+              <listitem><para>register-set.register-name.sub-field</para></listitem>
+              <listitem><para>register-set.register-name</para></listitem>
+              <listitem><para>cpu-register-name.sub-field</para></listitem>
+              <listitem><para>cpu-register-name</para></listitem>
+              <listitem><para>all</para></listitem>
+            </orderedlist>
             <para>The <replaceable>all</replaceable> form will cause all registers
               to be shown (no sub-fields).  The registers names are case-insensitive.
@@ -284,4 +486,35 @@
         </varlistentry>
         <varlistentry>
+          <term><option>--cpu=<replaceable>id</replaceable></option></term>
+          <listitem><para>Selects the CPU register set when specifying just a
+            CPU register (3rd and 4th form).  The default is 0.</para>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </refsect2>
+
+    <refsect2 id="vboxmanage-debugvm-setregisters">
+      <title>debugvm setregisters</title>
+      <remark role="help-copy-synopsis"/>
+      <para>
+        Changes register values for guest CPUs and emulated devices.
+      </para>
+      <variablelist>
+        <varlistentry>
+          <term><replaceable>reg-set.reg-name=value</replaceable></term>
+          <listitem>
+            <para>One of more register assignment, each having one of the following forms:</para>
+            <orderedlist>
+              <listitem><para>register-set.register-name.sub-field=value</para></listitem>
+              <listitem><para>register-set.register-name=value</para></listitem>
+              <listitem><para>cpu-register-name.sub-field=value</para></listitem>
+              <listitem><para>cpu-register-name=value</para></listitem>
+            </orderedlist>
+            <para>The value format should be in the same style as what
+              <command>getregisters</command> displays, with the exception that
+              both octal and decimal can be used instead of hexadecimal.</para>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
           <term><option>--cpu <replaceable>id</replaceable></option></term>
           <listitem><para>Selects the CPU register set when specifying just a
@@ -292,41 +525,40 @@
     </refsect2>
 
-    <refsect2 id="vboxmanage-debugvm-setregisters">
-      <title>debugvm setregisters</title>
-      <remark role="help-copy-synopsis"/>
-      <para>
-        Changes register values for guest CPUs and emulated devices.
-      </para>
-      <variablelist>
-        <varlistentry>
-          <term><replaceable>reg-set.reg-name=value</replaceable></term>
-          <listitem>
-            <para>One of more register assignment, each having one of the following forms:</para>
-            <itemizedlist>
-              <listitem><para><replaceable>register-set.register-name.sub-field=value</replaceable></para></listitem>
-              <listitem><para><replaceable>register-set.register-name=value</replaceable></para></listitem>
-              <listitem><para><replaceable>cpu-register-name.sub-field=value</replaceable></para></listitem>
-              <listitem><para><replaceable>cpu-register-name=value</replaceable></para></listitem>
-            </itemizedlist>
-            <para>The value format should be in the same style as what
-              <command>getregisters</command> displays, with the exception that
-              both octal and decimal can be used instead of hexadecimal.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term><option>--cpu <replaceable>id</replaceable></option></term>
-          <listitem><para>Selects the CPU register set when specifying just a
-            CPU register (3rd and 4th form).  The default is 0.</para>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-    </refsect2>
-
     <refsect2 id="vboxmanage-debugvm-show">
       <title>debugvm show</title>
       <remark role="help-copy-synopsis"/>
       <para>
-        TODO
-      </para>
+        Shows logging settings for the VM.
+      </para>
+      <variablelist>
+        <varlistentry>
+          <term><option>--human-readable</option></term>
+          <listitem><para>Selects human readable output.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>--sh-export</option></term>
+          <listitem><para>Selects output format as bourne shell style <command>export</command> commands.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>--sh-eval</option></term>
+          <listitem><para>Selects output format as bourne shell style <command>eval</command> command input.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><option>--cmd-set</option></term>
+          <listitem><para>Selects output format as DOS style <command>SET</command> commands.</para></listitem>
+        </varlistentry>
+        <varlistentry>
+          <term><replaceable>settings-item</replaceable></term>
+          <listitem>
+            <para>What to display. One or more of the following:</para>
+            <itemizedlist>
+              <listitem><para>logdbg-settings - debug log settings.</para></listitem>
+              <listitem><para>logrel-settings - release log settings.</para></listitem>
+              <listitem><para>log-settings - alias for both debug and release log settings.</para></listitem>
+            </itemizedlist>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+
     </refsect2>
 
@@ -342,5 +574,5 @@
       <variablelist>
         <varlistentry>
-          <term><option>--pattern <replaceable>pattern</replaceable></option></term>
+          <term><option>--pattern=<replaceable>pattern</replaceable></option></term>
           <listitem><para>DOS/NT-style wildcards patterns for selecting statistics.  Multiple
             patterns can be specified by using the '|' (pipe) character as separator.</para>