diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6dc6f2bce9..17cb646939 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-11 19:40 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/contrib/hbnetio/netio.h
+  * harbour/contrib/hbnetio/netiomt.prg
+  * harbour/contrib/hbnetio/netiocli.c
+  * harbour/contrib/hbnetio/netiosrv.c
+    * updated some comments
+
+  * harbour/examples/gtwvw/gtwvw.c
+    ! fixed typo in HB_TRACE() message
+
 2010-01-11 08:12 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbide/ideeditor.prg
   * contrib/hbide/idesources.prg
diff --git a/harbour/contrib/hbnetio/netio.h b/harbour/contrib/hbnetio/netio.h
index fc6225c441..8a7fcb496e 100644
--- a/harbour/contrib/hbnetio/netio.h
+++ b/harbour/contrib/hbnetio/netio.h
@@ -5,7 +5,7 @@
 /*
  * Harbour Project source code:
  *    demonstration code for alternative RDD IO API which uses own
- *    very simple TCP/IP file server.
+ *    very simple TCP/IP file server with RPC support
  *    All files which names starts with 'net:' are redirected to this API.
  *    This is header file used by client and server code with some constant
  *    definitions.
diff --git a/harbour/contrib/hbnetio/netiocli.c b/harbour/contrib/hbnetio/netiocli.c
index 0d8a2a08db..9e025d4b41 100644
--- a/harbour/contrib/hbnetio/netiocli.c
+++ b/harbour/contrib/hbnetio/netiocli.c
@@ -5,13 +5,21 @@
 /*
  * Harbour Project source code:
  *    demonstration code for alternative RDD IO API which uses own
- *    very simple TCP/IP file server.
+ *    very simple TCP/IP file server with RPC support
  *    All files which names starts 'net:' are redirected to this API.
  *    This is client code with
- *       NETIO_CONNECT( [<cServer>], [<cPort>], [<nTimeOut>] ) -> <lOK>
+ *       NETIO_CONNECT( [<cServer>], [<cPort>], [<nTimeOut>],
+ *                      [<cPasswd>], [<nCompressionLevel>], [<nStrategy>] )
+ *             -> <lOK>
  *    function which register alternative RDD IO API, sets server
  *    address and port and connection timeout parameter.
  *    Then it tries to connect to the server and returns .T. on success.
+ *    This code also provides the following .prg functions:
+ *       NETIO_DISCONNECT( [<cServer>], [<cPort>] ) -> <lOK>
+ *       NETIO_PROCEXISTS( <cProcName> ) -> <lExists>
+ *       NETIO_PROCEXEC( <cProcName> [, <params,...>] ) -> <lSent>
+ *       NETIO_PROCEXECW( <cProcName> [, <params,...>] ) -> <lExecuted>
+ *       NETIO_FUNCEXEC( <cFuncName> [, <params,...>] ) -> <xFuncRetVal>
  *
  * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
  * www - http://www.harbour-project.org
diff --git a/harbour/contrib/hbnetio/netiomt.prg b/harbour/contrib/hbnetio/netiomt.prg
index 96a6faaac0..6b3f450c7f 100644
--- a/harbour/contrib/hbnetio/netiomt.prg
+++ b/harbour/contrib/hbnetio/netiomt.prg
@@ -5,11 +5,12 @@
 /*
  * Harbour Project source code:
  *    demonstration code for alternative RDD IO API which uses own
- *    very simple TCP/IP file server.
+ *    very simple TCP/IP file server with RPC support
  *    All files which names starts 'net:' are redirected to this API.
  *    This is code for simple MT server which is activated by:
- *       NETIO_MTSERVER( [<nPort>], [<cAddress>], [<cRootDir>] )
-                                                -> <pListenSocket> | NIL
+ *       NETIO_MTSERVER( [<nPort>], [<cIfAddr>], [<cRootDir>], [<lRPC>],
+ *                       [<cPasswd>], [<nCompressionLevel>], [<nStrategy>] )
+ *                                              -> <pListenSocket> | NIL
  *    and can be stopped by:
  *       NETIO_SERVERSTOP( <pListenSocket>, .T. )
  *
diff --git a/harbour/contrib/hbnetio/netiosrv.c b/harbour/contrib/hbnetio/netiosrv.c
index 5ac08e9e97..0c6761a9ee 100644
--- a/harbour/contrib/hbnetio/netiosrv.c
+++ b/harbour/contrib/hbnetio/netiosrv.c
@@ -5,16 +5,23 @@
 /*
  * Harbour Project source code:
  *    demonstration code for alternative RDD IO API which uses own
- *    very simple TCP/IP file server.
+ *    very simple TCP/IP file server with RPC support
  *    All files which names starts 'net:' are redirected to this API.
  *    This is server code giving the following .prg functions:
- *       NETIO_LISTEN( [<nPort>], [<cAddress>], [<cRootDir>] )
+ *       NETIO_LISTEN( [<nPort>], [<cAddress>], [<cRootDir>], [<lRPC>] )
  *                                              -> <pListenSocket> | NIL
- *       NETIO_ACCEPT( <pListenSocket> [, <nTimeOut>] )
+ *       NETIO_ACCEPT( <pListenSocket>, [<nTimeOut>],
+ *                     [<cPass>], [<nCompressionLevel>], [<nStrategy>] )
  *                                              -> <pConnectionSocket> | NIL
- *       NETIO_SERVER( <pConnectionSocket> ) -> NIL
- *       NETIO_SERVERSTOP( <pListenSocket> | <pConnectionSocket>, <lStop> )
+ *       NETIO_COMPRESS( <pConnectionSocket>,
+ *                       [<cPass>], [<nCompressionLevel>], [<nStrategy>] )
  *                                              -> NIL
+ *       NETIO_SERVER( <pConnectionSocket> ) -> NIL
+ *       NETIO_SERVERSTOP( <pListenSocket> | <pConnectionSocket> [, <lStop>] )
+ *                                              -> NIL
+ *       NETIO_RPC( <pListenSocket> | <pConnectionSocket> [, <lEnable>] )
+ *                                              -> <lPrev>
+ *       NETIO_RPCFUNC( <pConnectionSocket>, <sFuncSym> ) -> NIL
  *
  * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
  * www - http://www.harbour-project.org
@@ -426,6 +433,8 @@ static void s_listenRet( HB_SOCKET sd, const char * szRootPath, BOOL rpc )
 }
 
 
+/* NETIO_RPC( <pListenSocket> | <pConnectionSocket> [, <lEnable>] ) -> <lPrev>
+ */
 HB_FUNC( NETIO_RPC )
 {
    PHB_LISTENSD lsd = s_listenParam( 1, FALSE );
@@ -450,6 +459,8 @@ HB_FUNC( NETIO_RPC )
    hb_retl( fRPC );
 }
 
+/* NETIO_RPCFUNC( <pConnectionSocket>, <sFuncSym> ) -> NIL
+ */
 HB_FUNC( NETIO_RPCFUNC )
 {
    PHB_CONSRV conn = s_consrvParam( 1 );
@@ -459,6 +470,8 @@ HB_FUNC( NETIO_RPCFUNC )
    }
 }
 
+/* NETIO_SERVERSTOP( <pListenSocket> | <pConnectionSocket> [, <lStop>] ) -> NIL
+ */
 HB_FUNC( NETIO_SERVERSTOP )
 {
    PHB_LISTENSD lsd = s_listenParam( 1, FALSE );
diff --git a/harbour/examples/gtwvw/gtwvw.c b/harbour/examples/gtwvw/gtwvw.c
index d8646684af..0c2bafabad 100644
--- a/harbour/examples/gtwvw/gtwvw.c
+++ b/harbour/examples/gtwvw/gtwvw.c
@@ -7919,7 +7919,7 @@ HB_EXPORT void hb_gt_wvwDrawOutline( UINT usWinNum, int iTop, int iLeft, int iBo
 //static void gtFnInit( PHB_GT_FUNCS gt_funcs )
 static BOOL hb_gt_FuncInit( PHB_GT_FUNCS pFuncTable )
 {
-    HB_TRACE( HB_TR_DEBUG, ( "hb_gtFnInit( %p )", gt_funcs ) );
+    HB_TRACE( HB_TR_DEBUG, ( "hb_gtFnInit( %p )", pFuncTable ) );
 
     pFuncTable->Init                  = hb_gt_wvw_Init;
     pFuncTable->Exit                  = hb_gt_wvw_Exit;