diff --git a/ChangeLog.txt b/ChangeLog.txt
index a051ce7200..c2d8346b0f 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,13 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-03-18 22:17 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * doc/en/dir.txt
+  * extras/hbdoc/_genhtml.prg
+  * extras/hbdoc/hbdoc.prg
+    ! fixed not to double each doc entry
+    * cleanups
+
 2013-03-18 21:51 UTC+0100 Viktor Szakats (harbour syenar.net)
   - doc/en/strotype.txt
   * doc/en/compiler.txt
diff --git a/doc/en/dir.txt b/doc/en/dir.txt
index 28c6c9efa3..70963c3a1e 100644
--- a/doc/en/dir.txt
+++ b/doc/en/dir.txt
@@ -100,14 +100,14 @@
    $EXAMPLES$
       DIR          // information for all DBF files in current directory
 
-      dir   "*.dbf"          // list all DBF file in current directory
+      DIR "*.dbf"          // list all DBF file in current directory
 
       // list all PRG files in Harbour Run-Time library
       // for MS-DOS compatible operating systems
-      Dir "src\rtl\*.prg"
+      DIR "src\rtl\*.prg"
 
       // list all files in the public section on a Unix like machine
-      Dir  "/pub"
+      DIR "/pub"
    $STATUS$
       R
    $COMPLIANCE$
@@ -184,7 +184,7 @@
          aAttr := Array( nLen )
          ADir( "*.prg", aName, aSize, aDate, aTime, aAttr )
          FOR i := 1 TO nLen
-             ? aName[ i ], aSize[ i ], aDate[ i ], aTime[ i ], aAttr[ i ]
+            ? aName[ i ], aSize[ i ], aDate[ i ], aTime[ i ], aAttr[ i ]
          NEXT
       ELSE
          ? "This directory is clean from smut"
diff --git a/extras/hbdoc/_genhtml.prg b/extras/hbdoc/_genhtml.prg
index 177c2d6644..376f5dc14a 100644
--- a/extras/hbdoc/_genhtml.prg
+++ b/extras/hbdoc/_genhtml.prg
@@ -7,7 +7,6 @@
  *
  * Portions of this project are based on hbdoc
  *    Copyright 1999-2003 Luiz Rafael Culik <culikr@uol.com.br>
- *    Copyright 2000 Luiz Rafael Culik <culik@sl.conex.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/extras/hbdoc/hbdoc.prg b/extras/hbdoc/hbdoc.prg
index b6dbf33a97..9c8ef47e41 100644
--- a/extras/hbdoc/hbdoc.prg
+++ b/extras/hbdoc/hbdoc.prg
@@ -215,7 +215,6 @@ PROCEDURE Main( ... )
    aContent := {}
    AEval( ;
       {;
-         p_hsSwitches[ "basedir" ] + "doc", ;
          p_hsSwitches[ "basedir" ] + "doc" + hb_ps() + "en", ;
          iif( p_hsSwitches[ "source" ], p_hsSwitches[ "basedir" ] + "src", NIL ), ;
          iif( p_hsSwitches[ "contribs" ], p_hsSwitches[ "basedir" ] + "contrib", NIL ), ;
@@ -276,8 +275,7 @@ PROCEDURE Main( ... )
             NEXT
 
             FOR idx := 1 TO Len( aContent )
-               IF Right( aContent[ idx ]:sourcefile_, Len( "1stread.txt" ) ) == "1stread.txt"
-               ELSE
+               IF !( Right( aContent[ idx ]:sourcefile_, Len( "1stread.txt" ) ) == "1stread.txt" )
                   oDocument:AddEntry( aContent[ idx ] )
                ENDIF
             NEXT