diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c66ac1a036..93e2a224c5 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,30 @@
+2001-03-11 21:43 UTC+0500 April <awhite@user.rose.com>
+   * doc/en/hb_macro.txt
+     * renamed hb_compParse() to hb_macroYYParse()
+       ; see 2000-11-30 18:25 UTC-0800 Ron Pinkas <ron@profit-master.com>
+
+   * doc/en/hb_api.txt
+     * merged the hb_xmemset() function and macro entries
+     * merged the hb_xmemcpy() function and macro entries
+     + entry for hb_idleReset
+       ; see 2000-11-27 08:25 UTC-0800 Ron Pinkas <ron@profit-master.com>
+     + entry for ISOBJECT()
+       ; see 2001-03-01 GMT+1 Antonio Linares <alinares@fivetech.com>
+
+   * doc/en/hb_apigt.txt
+     + entry for hb_gtColorToN()
+       ; see 2001-02-09 16:44 GMT+1 Antonio Linares <alinares@fivetech.com>
+
+   * doc/en/hb_apird.txt
+     + entry for hb_rddInsertAreaNode()
+
+   * include/error.api
+     * corrected define of _errPutFileNaem to _errPutFileName
+       ; no other detected use of this macro
+
+   * doc/en/hb_apier.txt
+     * entry for _errPutFileName() as above
+
 2001-03-11 14:05 UTC-0800 Ron Pinkas <ron@profit-master.com>
    * include/hbexpra.c
      ! Fixed hb_compExprSetOperand() to allow HB_ET_NONE on Right, if Left is >= HB_EO_PLUSEQ && <= HB_EO_EXPEQ
diff --git a/harbour/doc/en/hb_api.txt b/harbour/doc/en/hb_api.txt
index d523c8f837..6bf6a82e0a 100644
--- a/harbour/doc/en/hb_api.txt
+++ b/harbour/doc/en/hb_api.txt
@@ -1531,7 +1531,8 @@
  *  $RETURNS$
  *
  *  $DESCRIPTION$
- *      Conditional on: not UINT_MAX == ULONG_MAX
+ *      If UINT_MAX is defined as ULONG_MAX then this function is replaced
+ *      by a macro replacement to memcpy()
  *  $EXAMPLES$
  *
  *  $STATUS$
@@ -1568,7 +1569,8 @@
  *  $RETURNS$
  *
  *  $DESCRIPTION$
- *      Conditional on: not UINT_MAX == ULONG_MAX
+ *      If UINT_MAX is defined as ULONG_MAX then this function is replaced
+ *      by a macro replacement to memset()
  *  $EXAMPLES$
  *
  *  $STATUS$
@@ -5920,6 +5922,39 @@
  *  $END$
  */
 
+/*  $DOC$
+ *  $FUNCNAME$
+ *      hb_idleReset()
+ *  $CATEGORY$
+ *      Extend API
+ *  $ONELINER$
+ *      Services a single idle state
+ *  $SYNTAX$
+ *      C Prototype
+ *
+ *      #include <hbapi.h>
+ *      hb_idleReset( void ) --> void
+ *  $ARGUMENTS$
+ *
+ *  $RETURNS$
+ *
+ *  $DESCRIPTION$
+ *
+ *  $EXAMPLES$
+ *
+ *  $STATUS$
+ *      R
+ *  $COMPLIANCE$
+ *      Compliance is not applicable to API calls.
+ *  $FILES$
+ *      Library is vm
+ *  $PLATFORMS$
+ *      All
+ *  $SEEALSO$
+ *
+ *  $END$
+ */
+
 /*  $DOC$
  *  $FUNCNAME$
  *      hb_idleShutDown()
@@ -6912,6 +6947,39 @@
  *  $END$
  */
 
+/*  $DOC$
+ *  $FUNCNAME$
+ *      ISOBJECT()
+ *  $CATEGORY$
+ *      Extend API
+ *  $ONELINER$
+ *
+ *  $SYNTAX$
+ *      C Prototype (macro definition)
+ *
+ *      #include <hbapi.h>
+ *      ISOBJECT( n ) --> <see ( ISARRAY( n ) && hb_param( n, HB_IT_ARRAY )->asArray.value->uiClass != 0 )>
+ *  $ARGUMENTS$
+ *      <n>
+ *  $RETURNS$
+ *
+ *  $DESCRIPTION$
+ *
+ *  $EXAMPLES$
+ *
+ *  $STATUS$
+ *      R
+ *  $COMPLIANCE$
+ *      Compliance is not applicable to API calls.
+ *  $FILES$
+ *      Header file is hbapi.h
+ *  $PLATFORMS$
+ *      All
+ *  $SEEALSO$
+ *
+ *  $END$
+ */
+
 /*  $DOC$
  *  $FUNCNAME$
  *      ISBLOCK()
@@ -7524,72 +7592,6 @@
  *  $END$
  */
 
-/*  $DOC$
- *  $FUNCNAME$
- *      hb_xmemcpy()
- *  $CATEGORY$
- *      Extend API
- *  $ONELINER$
- *
- *  $SYNTAX$
- *      C Prototype (macro replacement)
- *
- *      #include <hbapi.h>
- *      hb_xmemcpy --> <see memcpy>
- *  $ARGUMENTS$
- *
- *  $RETURNS$
- *
- *  $DESCRIPTION$
- *      Conditional on: UINT_MAX == ULONG_MAX
- *  $EXAMPLES$
- *
- *  $STATUS$
- *      R
- *  $COMPLIANCE$
- *
- *  $FILES$
- *      Header file is hbapi.h
- *  $PLATFORMS$
- *      All
- *  $SEEALSO$
- *      memcpy()
- *  $END$
- */
-
-/*  $DOC$
- *  $FUNCNAME$
- *      hb_xmemset()
- *  $CATEGORY$
- *      Extend API
- *  $ONELINER$
- *
- *  $SYNTAX$
- *      C Prototype (macro replacement)
- *
- *      #include <hbapi.h>
- *      hb_xmemset --> <see memset>
- *  $ARGUMENTS$
- *
- *  $RETURNS$
- *
- *  $DESCRIPTION$
- *      Conditional on: UINT_MAX == ULONG_MAX
- *  $EXAMPLES$
- *
- *  $STATUS$
- *      R
- *  $COMPLIANCE$
- *
- *  $FILES$
- *      Header file is hbapi.h
- *  $PLATFORMS$
- *      All
- *  $SEEALSO$
- *      memset()
- *  $END$
- */
-
 /*  $DOC$
  *  $FUNCNAME$
  *      HB_ISSPACE()
diff --git a/harbour/doc/en/hb_apigt.txt b/harbour/doc/en/hb_apigt.txt
index 0dec1017ba..5968d1460f 100644
--- a/harbour/doc/en/hb_apigt.txt
+++ b/harbour/doc/en/hb_apigt.txt
@@ -272,6 +272,39 @@
  *  $END$
  */
 
+/*  $DOC$
+ *  $FUNCNAME$
+ *      hb_gtColorToN()
+ *  $CATEGORY$
+ *      Terminal API
+ *  $ONELINER$
+ *
+ *  $SYNTAX$
+ *      C Prototype
+ *
+ *      #include <hbapigt.h>
+ *      hb_gtColorToN( char * szColorString ) --> ( USHORT )usResult
+ *  $ARGUMENTS$
+ *      <szColorString>
+ *  $RETURNS$
+ *
+ *  $DESCRIPTION$
+ *
+ *  $EXAMPLES$
+ *
+ *  $STATUS$
+ *      R
+ *  $COMPLIANCE$
+ *      Compliance is not applicable to API calls.
+ *  $FILES$
+ *      Library is gt* (ie. gtdos)
+ *  $PLATFORMS$
+ *      All
+ *  $SEEALSO$
+ *
+ *  $END$
+ */
+
 /*  $DOC$
  *  $FUNCNAME$
  *      hb_gtDispBegin()
diff --git a/harbour/doc/en/hb_apird.txt b/harbour/doc/en/hb_apird.txt
index c606df7cfe..b1b20287c8 100644
--- a/harbour/doc/en/hb_apird.txt
+++ b/harbour/doc/en/hb_apird.txt
@@ -13,6 +13,39 @@
  *
  */
 
+/*  $DOC$
+ *  $FUNCNAME$
+ *      hb_rddInsertAreaNode()
+ *  $CATEGORY$
+ *      RDD API
+ *  $ONELINER$
+ *
+ *  $SYNTAX$
+ *      C Prototype
+ *
+ *      #include <hbapirdd.h>
+ *      hb_rddInsertAreaNode( char *szDriver ) --> ( USHORT )usResult
+ *  $ARGUMENTS$
+ *      <*szDriver>
+ *  $RETURNS$
+ *
+ *  $DESCRIPTION$
+ *
+ *  $EXAMPLES$
+ *
+ *  $STATUS$
+ *      R
+ *  $COMPLIANCE$
+ *      Compliance is not applicable to API calls.
+ *  $FILES$
+ *      Library is rdd, nulsys, dbfntx, dbfcdx
+ *  $PLATFORMS$
+ *      All
+ *  $SEEALSO$
+ *
+ *  $END$
+ */
+
 /*  $DOC$
  *  $FUNCNAME$
  *      hb_rddGetCurrentWorkAreaNumber()
diff --git a/harbour/doc/en/hb_compa.txt b/harbour/doc/en/hb_compa.txt
index 374d998595..fecde39224 100644
--- a/harbour/doc/en/hb_compa.txt
+++ b/harbour/doc/en/hb_compa.txt
@@ -4800,7 +4800,7 @@
 
 /*  $DOC$
  *  $FUNCNAME$
- *      _errPutFileNaem()
+ *      _errPutFileName()
  *  $CATEGORY$
  *      Error compatability API
  *  $ONELINER$
@@ -4809,7 +4809,7 @@
  *      C Prototype (macro replacement)
  *      
  *      #include <error.api>
- *      _errPutFileNaem --> <see hb_errPutFileName>
+ *      _errPutFileName --> <see hb_errPutFileName>
  *  $ARGUMENTS$
  *      
  *  $RETURNS$
diff --git a/harbour/doc/en/hb_macro.txt b/harbour/doc/en/hb_macro.txt
index e23417a0ad..0a10e2737b 100644
--- a/harbour/doc/en/hb_macro.txt
+++ b/harbour/doc/en/hb_macro.txt
@@ -50,16 +50,16 @@
 
 /*  $DOC$
  *  $FUNCNAME$
- *      hb_compParse()
+ *      hb_macroYYParse()
  *  $CATEGORY$
  *      Macro API
  *  $ONELINER$
- *      
+ *
  *  $SYNTAX$
  *      C Prototype
  *      
  *      #include <hbmacro.h>
- *      hb_compParse( HB_MACRO_PTR pMacro ) --> ( int )iResult
+ *      hb_macroYYParse( HB_MACRO_PTR pMacro ) --> ( int )iResult
  *  $ARGUMENTS$
  *      <pMacro>
  *  $RETURNS$
diff --git a/harbour/include/error.api b/harbour/include/error.api
index 7704d6b353..c6ae1e7e18 100644
--- a/harbour/include/error.api
+++ b/harbour/include/error.api
@@ -56,7 +56,7 @@ typedef PHB_ITEM  ERRORP;
 #define _errLaunch         hb_errLaunch
 #define _errNew            hb_errNew
 #define _errPutDescription hb_errPutDescription
-#define _errPutFileNaem    hb_errPutFileName
+#define _errPutFileName    hb_errPutFileName
 #define _errPutFlags       hb_errPutFlags
 #define _errPutGenCode     hb_errPutGenCode
 #define _errPutOperation   hb_errPutOperation