Index: gtk-doc.lang
===================================================================
--- gtk-doc.lang	(revision 1459)
+++ gtk-doc.lang	(working copy)
@@ -23,16 +23,16 @@
 <!-- Copyright (C) 2006-2007 - Yevgen Muntyan <muntyan@tamu.edu> -->
 <language id="gtk-doc" _name="gtk-doc" version="2.0" _section="Markup" hidden="true">
     <styles>
-        <style id="inline-docs-section" _name="Inline Documentation Section" map-to="def:comment"/>
-        <style id="function-name" _name="Function Name" map-to="def:inline-docs"/>
-        <style id="signal-name" _name="Signal Name" map-to="def:inline-docs"/>
-        <style id="property-name" _name="Property Name" map-to="def:inline-docs"/>
-        <style id="parameter" _name="Parameter" map-to="def:inline-docs"/>
-        <style id="constant" _name="Constant" map-to="def:inline-docs"/>
-        <style id="type" _name="Type" map-to="def:inline-docs"/>
-        <style id="function" _name="Function" map-to="def:inline-docs"/>
-        <style id="return" _name="Return" map-to="def:inline-docs"/>
-        <style id="since" _name="Since" map-to="def:inline-docs"/>
+        <style id="inline-docs-section" _name="Inline Documentation Section" map-to="def:doc-comment"/>
+        <style id="function-name" _name="Function Name" map-to="def:doc-comment-element"/>
+        <style id="signal-name" _name="Signal Name" map-to="def:doc-comment-element"/>
+        <style id="property-name" _name="Property Name" map-to="def:doc-comment-element"/>
+        <style id="parameter" _name="Parameter" map-to="def:doc-comment-element"/>
+        <style id="constant" _name="Constant" map-to="def:doc-comment-element"/>
+        <style id="type" _name="Type" map-to="def:doc-comment-element"/>
+        <style id="function" _name="Function" map-to="def:doc-comment-element"/>
+        <style id="return" _name="Return" map-to="def:doc-comment-element"/>
+        <style id="since" _name="Since" map-to="def:doc-comment-element"/>
     </styles>
 
     <definitions>
Index: gvim.xml
===================================================================
--- gvim.xml	(revision 1459)
+++ gvim.xml	(working copy)
@@ -46,7 +46,8 @@
   <style name="def:error"                   background="#FF0000" bold="true"/>
   <style name="def:escape"                  foreground="#9010D0"/>
   <style name="def:shebang"                 foreground="#0000FF" bold="true"/>
-  <style name="def:inline-docs"             italic="true"/>
+  <style name="def:doc-comment"             use-style="def:comment"/>
+  <style name="def:doc-comment-element"     italic="true"/>
 
   <style name="def:specials"                foreground="#FFFFFF" background="#FF0000"/>
   <style name="def:preprocessor"            foreground="#A020F0"/>
Index: kate.xml
===================================================================
--- kate.xml	(revision 1459)
+++ kate.xml	(working copy)
@@ -52,7 +52,8 @@
   <style name="def:function"                foreground="#000080"/>
   <style name="def:error"                   foreground="red" underline="true"/>
   <style name="def:shebang"                 foreground="grey" bold="true"/>
-  <style name="def:inline-docs"             bold="true"/>
+  <style name="def:doc-comment"             foreground="blue"/>
+  <style name="def:doc-comment-element"     bold="true"/>
 
   <style name="def:net-address-in-comment"  underline="true"/>
   <style name="def:escape"                  foreground="#FF00FF"/>
@@ -62,8 +63,6 @@
   <style name="c:common-defines"            foreground="#0095FF" bold="true"/>
   <style name="c:preprocessor"              foreground="dark-green"/>
 
-  <style name="gtk-doc:inline-docs-section" foreground="blue"/>
-
   <style name="diff:diff-file"              use-style="def:keyword"/>
   <style name="diff:added-line"             use-style="def:decimal"/>
   <style name="diff:removed-line"           use-style="def:string"/>
Index: def.lang
===================================================================
--- def.lang	(revision 1459)
+++ def.lang	(working copy)
@@ -38,7 +38,8 @@
         <style id="character"               _name="Character"/>
         <style id="function"                _name="Function"/>
         <style id="shebang"                 _name="Shebang"/>
-        <style id="inline-docs"             _name="Inline Documentation"/>
+        <style id="doc-comment"             _name="Documentation Comment"/>
+        <style id="doc-comment-element"     _name="Documentation Comment Element"/>
         <!-- FIXME and this is real nonsense -->
         <style id="preprocessor"            _name="Preprocessor"/>
     </styles>