diff --git a/harbour/utils/hbdoc/genhtm.prg b/harbour/utils/hbdoc/genhtm.prg
index 8a55c0cd9e..cfb92a2efd 100644
--- a/harbour/utils/hbdoc/genhtm.prg
+++ b/harbour/utils/hbdoc/genhtm.prg
@@ -296,10 +296,11 @@ FUNCTION ProcessWww()
                ENDIF
                lDoc      := .F.
                lClassDoc := .F.
-
+               lData   := .F.
+               lMethod := .F.
                IF lEndReturns .AND. lClassDoc
                   lEndReturns := .f.
-                  oHtm:WriteText( "</p></dd>" )
+                  oHtm:WriteText( "</pre>" )
                ENDIF
                IF lEndArgs .AND. lClassDoc
                   lEndArgs := .f.
@@ -407,14 +408,20 @@ FUNCTION ProcessWww()
                ENDIF
                IF lEndDesc .AND. lClassDoc
                   lEndDesc := .f.
+                  if lWasTestExamples
+                  oHtm:WriteText( "</pre>" )
+                  else
                   oHtm:WriteText( "</p></dd>" )
+                  lWasTestExamples:=.f.
+                  endif
+
                ENDIF
                ohtm:WriteText( '<br>' )
                ohtm:WriteText( '<br>' )
                ohtm:Writetext( '<hr>' )
                ohtm:WriteText( '<br>' )
                ohtm:WriteText( '<br>' )
-
+     
                oHtm:WriteText( "<a NAME=" + '"' + ALLTRIM( cFuncname )  + '"' + "></a>" )
 
                //  2) Category
@@ -504,6 +511,53 @@ end
                   lAddBlank := .T.
                   lEndDesc  := .t.
                end
+               ELSEIF AT( cdatalink, cBuffer ) > 0
+                  IF GetItem( cBuffer, nCurdoc )
+                     IF !lBlankLine
+oHtm:writeText("<br>")  //:endpar()
+//                     oHtm:WriteParBold( " Data" )
+                        oHtm:WriteText( "</dl><dl><dt><b>Data</b></dt>" )
+//oHtm:writeText("<br>")  //:endpar()
+                     endif
+                     nMode     := D_DATALINK
+  //                   lAddBlank := .T.
+
+                     lIsDataLink := .T.
+                  END
+               ELSEIF AT( cDatanolink, cBuffer ) > 0
+                  IF GetItem( cBuffer, nCurdoc )
+                     IF !lIsDataLink
+                    oHtm:writeText("<br>")                //:endpar()
+                        oHtm:WriteText( "</dl><dl><dt><b>Data</b></dt>" )
+//                    oHtm:writeText("<br>")                //:endpar()
+                     ENDIF
+                     nMode     := D_NORMAL
+                     lAddBlank := .T.
+
+                  END
+               ELSEIF AT( cMethodslink, cBuffer ) > 0
+                  IF GetItem( cBuffer, nCurdoc )
+                 oHtm:writeText("<br>")                //:endpar()
+                     oHtm:WriteParBold( " Method" )
+//oHtm:writeText("<br>")  //:endpar()
+                     nMode     := D_METHODLINK
+                     lAddBlank := .T.
+
+                     lIsMethodLink := .T.
+                  END
+               ELSEIF AT( cMethodsnolink, cBuffer ) > 0
+                  IF GetItem( cBuffer, nCurdoc )
+                     IF !lIsMethodLink
+                    oHtm:writeText("<br>")                //:endpar()
+                        oHtm:WriteParBold( " Methods" )
+                       oHtm:writepar("<br>")                //:endpar()
+                     ENDIF
+//                       oHtm:writeText("<br>")                //:endpar()
+                     nMode     := D_NORMAL
+                     lAddBlank := .T.
+
+                  END
+
                ELSEIF AT( cExam, cBuffer ) > 0
                   if GetItem( cBuffer, nCurdoc ) 
                   IF !lBlankLine
@@ -654,8 +708,8 @@ end
                         lAddBlank := .F.
                      ENDIF
                      cTemp := ALLTRIM( SUBSTR( cBuffer, 1, AT( ":", cBuffer ) - 1 ) )
-                     ohtm:WriteText( "<a href=" + cFileName + "#" +  cTemp  + ">" + cBuffer + '</a>' )
-
+                     ohtm:WriteText( "<dd><a href=" + cFileName + "#" +  cTemp  + ">" + cBuffer + '</a></dd>' )
+                     ohtm:writetext('<dd><br></dd>')
                   ELSEIF nMode = D_METHODLINK
                      IF LEN( cBuffer ) > LONGLINE
 //                        WRITE_ERROR( "General", cBuffer, nLineCnt, ;
@@ -666,8 +720,10 @@ end
                         lAddBlank := .F.
                      ENDIF
                      cTemp := ALLTRIM( SUBSTR( cBuffer, 1, AT( "(", cBuffer ) - 1 ) )
-                     ohtm:WriteText( "<a href=" + cFileName + "#" +  cTemp  + ">" + cBuffer + '</a>' )
-
+                     if !lBlankline
+                     ohtm:WriteText( "<dd><a href=" + cFileName + "#" +  cTemp  + ">" + cBuffer + '</a></dd>' )
+                     ohtm:writetext('<dd><br></dd>')
+                    endif
                   ELSEIF nMode = D_COMPLIANCE
                      IF LEN( cBuffer ) > LONGLINE
 //                        WRITE_ERROR( "General", cBuffer, nLineCnt, ;
diff --git a/harbour/utils/hbdoc/genrtf.prg b/harbour/utils/hbdoc/genrtf.prg
index 6b83bbdf73..751d600706 100644
--- a/harbour/utils/hbdoc/genrtf.prg
+++ b/harbour/utils/hbdoc/genrtf.prg
@@ -355,7 +355,7 @@ FUNCTION ProcessRtf()
                IF lData
                   oRtf:WriteJumpTitle( LEFT( cFilename, AT( '.', cFilename ) - 1 ) + cFuncName, "Data " + cFuncName )
                ELSEIF lMethod
-                  oRtf:WriteJumpTitle( LEFT( cFilename, AT( '.', cFilename ) - 1 ) + cFuncName, "Method " + cFuncName )
+                  oRtf:WriteJumpTitle( LEFT( cFilename, AT( '.', cFilename ) - 1 ) + cFuncName, LEFT( cFilename, AT( '.', cFilename ) - 1 )  + ":"+cFuncName )
                ELSE
                   oRtf:WriteTitle(  cFuncName, cFuncName, cOneLine,cCategory)
                   //               oRtf:WriteParBold( cOneLine )
@@ -438,8 +438,9 @@ FUNCTION ProcessRtf()
                      IF !lBlankLine
                         oRtf:WritePar( "" )                 //:endpar()
                      ENDIF
-
+                    oRtf:WritePar( "" )                 //:endpar()
                      oRtf:WriteParBold( " Data" )
+                    oRtf:WritePar( "" )                 //:endpar()
                      nMode     := D_DATALINK
                      lAddBlank := .T.
 
@@ -448,8 +449,9 @@ FUNCTION ProcessRtf()
                ELSEIF AT( cDatanolink, cBuffer ) > 0
                   IF GetItem( cBuffer, nCurdoc )
                      IF !lIsDataLink
+                     oRtf:WritePar( "" )                 //:endpar()
                         oRtf:WriteParBold( " Data" )
-
+//                     oRtf:WritePar( "" )                 //:endpar()
                      ENDIF
                      nMode     := D_NORMAL
                      lAddBlank := .T.
@@ -458,7 +460,9 @@ FUNCTION ProcessRtf()
                   END
                ELSEIF AT( cMethodslink, cBuffer ) > 0
                   IF GetItem( cBuffer, nCurdoc )
+                  oRtf:WritePar( "" )                 //:endpar()
                      oRtf:WriteParBold( " Method" )
+oRtf:WritePar( "" )                 //:endpar()
                      nMode     := D_METHODLINK
                      lAddBlank := .T.
 
@@ -467,9 +471,11 @@ FUNCTION ProcessRtf()
                ELSEIF AT( cMethodsnolink, cBuffer ) > 0
                   IF GetItem( cBuffer, nCurdoc )
                      IF !lIsMethodLink
+                     oRtf:WritePar( "" )                 //:endpar()
                         oRtf:WriteParBold( " Methods" )
+                        oRtf:WritePar( "" )                 //:endpar()
                      ENDIF
-
+                        oRtf:WritePar( "" )                 //:endpar()
                      nMode     := D_NORMAL
                      lAddBlank := .T.
                      lPar      := .T.
@@ -491,7 +497,7 @@ FUNCTION ProcessRtf()
                   IF GetItem( cBuffer, nCurdoc )
                      IF !lBlankLine
                                                               oRtf:WritePar('') //:endpar()
-                        oRtf:WriteParBold( " Tests" )
+                       oRtf:WriteParBold( " Tests" )
                         oRtf:WritePar( '' )                 //:endpar()
                      ENDIF
 
@@ -610,7 +616,7 @@ FUNCTION ProcessRtf()
                      ENDIF
                      cTemp   := SUBSTR( cBuffer, 1, AT( ":", cBuffer ) - 1 )
                      cBuffer := SUBSTR( cBuffer, AT( ":", cBuffer ) + 1 )
-                     oRtf:WriteJumpLink( LEFT( cfilename, AT( '.', cFilename ) - 1 ) + ALLTRIM( cTemp ), cTemp, cBuffer )
+                     oRtf:WriteJumpLink1( LEFT( cfilename, AT( '.', cFilename ) - 1 ) + ALLTRIM( cTemp ), cTemp, cBuffer )
                   ELSEIF nMode = D_METHODLINK
                      IF LEN( cBuffer ) > LONGLINE
                         WRITE_ERROR( "General", cBuffer, nLineCnt, ;
@@ -623,7 +629,7 @@ FUNCTION ProcessRtf()
                      cTemp   := SUBSTR( cBuffer, 1, AT( "()", cBuffer ) + 1 )
                      cName   := SUBSTR( cBuffer, 1, AT( "()", cBuffer ) - 1 )
                      cBuffer := SUBSTR( cBuffer, AT( "()", cBuffer ) + 2 )
-                     oRtf:WriteJumpLink( LEFT( cfilename, AT( '.', cFilename ) - 1 ) + ALLTRIM( cTemp ), cTemp, cBuffer )
+                     oRtf:WriteJumpLink( LEFT( cfilename, AT( '.', cFilename ) - 1 ) + ALLTRIM( cTemp ),ALLTRIM( cTemp ), cBuffer )
 
                   ELSEIF nMode = D_NORMAL
                      IF LEN( cBuffer ) > LONGLINE
diff --git a/harbour/utils/hbdoc/rtf.prg b/harbour/utils/hbdoc/rtf.prg
index 6afa7bc2cd..e4fb1ec120 100644
--- a/harbour/utils/hbdoc/rtf.prg
+++ b/harbour/utils/hbdoc/rtf.prg
@@ -57,6 +57,7 @@ CLASS TRTF
    METHOD WriteParBox( cPar )
    METHOD WriteLink( clink )
    METHOD WriteJumpLink( clink )
+   METHOD WriteJumpLink1( cLink, cName, cText )
    METHOD CLOSE()
    METHOD WriteParBold( cPar, lCenter )
    METHOD WriteParBoldText( cPar, cText )
@@ -268,6 +269,12 @@ METHOD WriteLink( cLink ) CLASS TRTF
 RETURN Self
 METHOD WriteJumpLink( cLink, cName, cText ) CLASS TRTF
 
+   FWRITE( Self:nHandle, '\par \pard\cf1\fs20       {\f6\uldb ' + ALLTRIM( HB_OEMTOANSI( cName ) ) + '}{\v\f6 ' + "IDH_" + IF( AT( "()", cLink ) > 0, ALLTRIM( HB_OEMTOANSI( STRTRAN( cLink, "()", "xx" ) ) ), ALLTRIM( HB_OEMTOANSI( STRTRAN( cLink, "@", "x" ) ) ) ) + '}' + cText + CRLF )
+
+RETURN Self
+
+METHOD WriteJumpLink1( cLink, cName, cText ) CLASS TRTF
+
    FWRITE( Self:nHandle, '\par \pard\cf1\fs20       {\f6\ul ' + ALLTRIM( HB_OEMTOANSI( cName ) ) + '}{\v\f6 ' + "IDH_" + IF( AT( "()", cLink ) > 0, ALLTRIM( HB_OEMTOANSI( STRTRAN( cLink, "()", "xx" ) ) ), ALLTRIM( HB_OEMTOANSI( STRTRAN( cLink, "@", "x" ) ) ) ) + '}' + cText + CRLF )
 
 RETURN Self