Index: /trunk/src/VBox/Main/idl/apiwrap-server.xsl
===================================================================
--- /trunk/src/VBox/Main/idl/apiwrap-server.xsl	(revision 79736)
+++ /trunk/src/VBox/Main/idl/apiwrap-server.xsl	(revision 79737)
@@ -80,6 +80,6 @@
  */
 
-/**
- * Copyright (C) 2010-2016 Oracle Corporation
+/*
+ * Copyright (C) 2010-2019 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -120,18 +120,12 @@
 
 </xsl:text>
-    <xsl:value-of select="concat('class ATL_NO_VTABLE ', substring(@name, 2), 'Wrap:')"/>
+    <xsl:value-of select="concat('class ATL_NO_VTABLE ', substring(@name, 2), 'Wrap')"/>
     <xsl:text>
-    public VirtualBoxBase,
-</xsl:text>
-    <xsl:value-of select="concat('    VBOX_SCRIPTABLE_IMPL(', @name, ')')"/>
-    <xsl:if test="count(exsl:node-set($addinterfaces)/token) > 0">
-        <xsl:text>,</xsl:text>
-    </xsl:if>
+    : public VirtualBoxBase
+</xsl:text>
+    <xsl:value-of select="concat('    , VBOX_SCRIPTABLE_IMPL(', @name, ')')"/>
     <xsl:value-of select="$G_sNewLine"/>
     <xsl:for-each select="exsl:node-set($addinterfaces)/token">
-        <xsl:value-of select="concat('    VBOX_SCRIPTABLE_IMPL(', text(), ')')"/>
-        <xsl:if test="not(position()=last())">
-            <xsl:text>,</xsl:text>
-        </xsl:if>
+        <xsl:value-of select="concat('    , VBOX_SCRIPTABLE_IMPL(', text(), ')')"/>
         <xsl:value-of select="$G_sNewLine"/>
     </xsl:for-each>
@@ -1563,5 +1557,7 @@
         </xsl:when>
         <xsl:when test="$pmode != 'dtrace-probes'">
-            <xsl:value-of select="concat($G_sNewLine, '    // ', $pmode, ' ', $name, ' properties', $G_sNewLine)"/>
+            <xsl:value-of select="concat($G_sNewLine, '    /** @name ', translate(substring($pmode, 1, 1), $G_lowerCase, $G_upperCase), substring($pmode,2), ' ', $name, ' properties', $G_sNewLine)"/>
+            <xsl:text>     * @{ */
+</xsl:text>
         </xsl:when>
     </xsl:choose>
@@ -1615,4 +1611,10 @@
         <xsl:otherwise><xsl:message terminate="yes">Otherwise oops in emitAttributes</xsl:message></xsl:otherwise>
     </xsl:choose>
+
+    <!-- close doxygen @name -->
+    <xsl:if test="($pmode != 'code') and ($pmode != 'dtrace-probes')" >
+            <xsl:text>    /** @} */
+</xsl:text>
+    </xsl:if>
 </xsl:template>
 
@@ -2196,5 +2198,7 @@
         <xsl:when test="$pmode='dtrace-probes'"/>
         <xsl:otherwise>
-            <xsl:value-of select="concat($G_sNewLine, '    // ', $pmode, ' ', $name, ' methods', $G_sNewLine)"/>
+            <xsl:value-of select="concat($G_sNewLine, '    /** @name ', translate(substring($pmode, 1, 1), $G_lowerCase, $G_upperCase), substring($pmode,2), ' ', $name, ' methods', $G_sNewLine)"/>
+            <xsl:text>     * @{ */
+</xsl:text>
         </xsl:otherwise>
     </xsl:choose>
@@ -2247,4 +2251,10 @@
         <xsl:otherwise/>
     </xsl:choose>
+
+    <!-- close doxygen @name -->
+    <xsl:if test="($pmode != 'code') and ($pmode != 'dtrace-probes')" >
+            <xsl:text>    /** @} */
+</xsl:text>
+    </xsl:if>
 </xsl:template>