2012-10-23 23:33 UTC+0200 Viktor Szakats (harbour syenar.net)

* config/detect.mk * contrib/hbct/print.c * contrib/hbnf/fttext.c * contrib/hbnf/n2color.c * contrib/hbnf/tests/clrsel.prg * contrib/hbnf/tests/menu1.prg * contrib/hbwin/win_tprn.prg * doc/en/browse.txt * doc/en/compiler.txt * doc/en/file.txt * doc/en/garbage.txt * doc/en/gtslang.txt * doc/en/idle.txt * doc/en/memo.txt * doc/en/misc.txt * doc/en/setmode.txt * doc/en/string.txt * doc/en/terminal.txt * doc/gtapi.txt * doc/tracing.txt * include/filesys.api * include/hbapifs.h * include/hbsetup.h * package/mpkg_win.nsi * package/winuni/RELNOTES * src/codepage/*.c * src/common/hbffind.c * src/rtl/gete.c * src/rtl/hbgtcore.c * src/rtl/isprint.c * src/rtl/net.c * src/rtl/run.c * src/rtl/tlabel.prg * src/rtl/treport.prg * src/vm/dynsym.c * tests/stripem.prg * tests/tstgtapi.c * various platform related doc cleanups
2012-10-23 21:42:07 +00:00
parent cd42aa6417
commit 6fe841c614
101 changed files with 199 additions and 195 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,46 @@
   The license applies to all entries newer than 2009-04-28.
 */

+2012-10-23 23:33 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * config/detect.mk
+  * contrib/hbct/print.c
+  * contrib/hbnf/fttext.c
+  * contrib/hbnf/n2color.c
+  * contrib/hbnf/tests/clrsel.prg
+  * contrib/hbnf/tests/menu1.prg
+  * contrib/hbwin/win_tprn.prg
+  * doc/en/browse.txt
+  * doc/en/compiler.txt
+  * doc/en/file.txt
+  * doc/en/garbage.txt
+  * doc/en/gtslang.txt
+  * doc/en/idle.txt
+  * doc/en/memo.txt
+  * doc/en/misc.txt
+  * doc/en/setmode.txt
+  * doc/en/string.txt
+  * doc/en/terminal.txt
+  * doc/gtapi.txt
+  * doc/tracing.txt
+  * include/filesys.api
+  * include/hbapifs.h
+  * include/hbsetup.h
+  * package/mpkg_win.nsi
+  * package/winuni/RELNOTES
+  * src/codepage/*.c
+  * src/common/hbffind.c
+  * src/rtl/gete.c
+  * src/rtl/hbgtcore.c
+  * src/rtl/isprint.c
+  * src/rtl/net.c
+  * src/rtl/run.c
+  * src/rtl/tlabel.prg
+  * src/rtl/treport.prg
+  * src/vm/dynsym.c
+  * tests/stripem.prg
+  * tests/tstgtapi.c
+    * various platform related doc cleanups
+
 2012-10-23 22:16 UTC+0200 Viktor Szakats (harbour syenar.net)
  * contrib/hbamf/hbamf.hbp
  * contrib/hbblink/hbblink.hbp
--- a/harbour/config/detect.mk
+++ b/harbour/config/detect.mk
@@ -124,7 +124,7 @@ _DET_INC_HEAD := /X11/Xlib.h

 include $(TOP)$(ROOT)config/detfun.mk

-# Detect WATTCP/WATT-32 in DOS builds
+# Detect WATTCP/WATT-32 in MS-DOS builds

 _DET_DSP_NAME := wattcp/watt-32
 _DET_VAR_INC_ := HB_INC_WATT
--- a/harbour/contrib/hbct/print.c
+++ b/harbour/contrib/hbct/print.c
@@ -69,7 +69,7 @@ HB_FUNC( PRINTSTAT )

 #if defined( HB_OS_DOS )

-   /* NOTE: DOS specific solution, using BIOS interrupt */
+   /* NOTE: MS-DOS specific solution, using BIOS interrupt */

   union REGS regs;

--- a/harbour/contrib/hbnf/fttext.c
+++ b/harbour/contrib/hbnf/fttext.c
@@ -572,7 +572,7 @@ HB_FUNC( FT_FDELETE )
   }
   while( iBytesRead > 0 );

-   /* move DOS EOF marker */
+   /* move legacy EOF marker */
   hb_fsSeekLarge( ft_text->handles[ ft_text->area ], srcPtr, FS_SET );
   hb_fsWrite( ft_text->handles[ ft_text->area ], Buff, 0 );

@@ -671,7 +671,7 @@ HB_FUNC( FT_FAPPEND )

   if( ! ft_text->error[ ft_text->area ] )
   {
-      /* move DOS eof marker */
+      /* move legacy EOF marker */
      hb_fsWrite( ft_text->handles[ ft_text->area ], buff, 0 );
      ft_text->error[ ft_text->area ] = hb_fsError();
   }
@@ -986,7 +986,7 @@ static int _ins_buff( PFT_TEXT ft_text, HB_ISIZ iLen )
      iLenRemaining  -= iLen;
   }

-   /* store length in bytes, set EOF marker for DOS */
+   /* store length in bytes, set legacy EOF marker */
   ft_text->lastbyte[ ft_text->area ] = hb_fsSeekLarge( ft_text->handles[ ft_text->area ], fpWrite, FS_SET );
   hb_fsWrite( ft_text->handles[ ft_text->area ], WriteBuff, 0 );

@@ -1042,7 +1042,7 @@ static int _del_buff( PFT_TEXT ft_text, HB_ISIZ iLen )
      fpRead   += WriteLen;
   }

-   /* store length in bytes, set EOF marker for DOS */
+   /* store length in bytes, set legacy EOF marker */
   ft_text->lastbyte[ ft_text->area ] = hb_fsSeekLarge( ft_text->handles[ ft_text->area ], fpWrite, FS_SET );
   hb_fsWrite( ft_text->handles[ ft_text->area ], WriteBuff, 0 );

--- a/harbour/contrib/hbnf/n2color.c
+++ b/harbour/contrib/hbnf/n2color.c
@@ -16,7 +16,7 @@
 * Made definitions of _ftI2Color and _ftGetColorStr static to match
 * their forward declarations. Commented out the extremely useless
 * #if defined(HB_OS_DOS) line and corresponding #endif line. (There
- * is nothing that is even remotely DOS-specific in the code!) And
+ * is nothing that is even remotely MS-DOS-specific in the code!) And
 * converted tabs to spaces.
 *    Rev 2.0   03 Mar 1997 03:05:01   JO  / Phil Barnett
 *              commented out : if( iColor > 15 ) in _ftI2Color()
--- a/harbour/contrib/hbnf/tests/clrsel.prg
+++ b/harbour/contrib/hbnf/tests/clrsel.prg
@@ -8,10 +8,10 @@

 PROCEDURE Main( cVidMode )

-   LOCAL nRowDos := Row()
-   LOCAL nColDos := Col()
-   LOCAL aEnvDos := FT_SaveSets()
-   LOCAL cScrDos := SaveScreen( 0, 0, MaxRow(), MaxCol() )
+   LOCAL nRowOri := Row()
+   LOCAL nColOri := Col()
+   LOCAL aEnvOri := FT_SaveSets()
+   LOCAL cScrOri := SaveScreen( 0, 0, MaxRow(), MaxCol() )
   LOCAL lColour
   LOCAL aClrs

@@ -48,10 +48,10 @@ PROCEDURE Main( cVidMode )

   HB_SYMBOL_UNUSED( aClrs )

-   //.... restore the DOS environment
-   FT_RestSets( aEnvDos )
-   RestScreen( 0, 0, MaxRow(), MaxCol(), cScrDos )
-   SetPos( nRowDos, nColDos )
+   //.... restore the original environment
+   FT_RestSets( aEnvOri )
+   RestScreen( 0, 0, MaxRow(), MaxCol(), cScrOri )
+   SetPos( nRowOri, nColOri )
   SetBlink( .F. )  // doesn't appear to be reset from FT_RestSets

   RETURN
--- a/harbour/contrib/hbnf/tests/menu1.prg
+++ b/harbour/contrib/hbnf/tests/menu1.prg
@@ -71,7 +71,7 @@ PROCEDURE Main( cCmdLine )
   FT_FILL( aOptions[ 4 ], "D. This EXITs Too"                   , {|| .F. }, .T. )

   FT_FILL( aOptions[ 5 ], "A. Does Nothing"                     , {|| .T. }, .T. )
-   FT_FILL( aOptions[ 5 ], "B. Exit To DOS"                      , {|| .F. }, .T. )
+   FT_FILL( aOptions[ 5 ], "B. Exit Application"                 , {|| .F. }, .T. )

   // main routine starts here
   SET SCOREBOARD OFF
--- a/harbour/contrib/hbwin/win_tprn.prg
+++ b/harbour/contrib/hbwin/win_tprn.prg
@@ -126,7 +126,7 @@ CREATE CLASS WIN_PRN
   METHOD GetTextHeight( cString )
   METHOD DrawBitMap( oBmp )

-   /* Clipper DOS compatible functions. */
+   /* Clipper compatible functions. */
   METHOD SetPrc( nRow, nCol )   // Based on ::LineHeight and current ::CharWidth
   METHOD PRow()
   METHOD PCol()
--- a/harbour/doc/en/browse.txt
+++ b/harbour/doc/en/browse.txt
@@ -148,7 +148,7 @@
 *      ---------------------------------------------
 *
 *      <table>
- *       Dbedit.ch      Meaning
+ *       dbedit.ch      Meaning
 *
 *       DE_IDLE        DBEDIT() is idle, all movement keys have been handled.
 *       DE_HITTOP      Attempt to cursor past top of file.
@@ -164,7 +164,7 @@
 *      ---------------------------   </par>
 *
 *      <table>
- *       Dbedit.ch    Value   Meaning
+ *       dbedit.ch    Value   Meaning
 *
 *       DE_ABORT     0       Abort DBEDIT().
 *       DE_CONT      1       Continue DBEDIT() as is.
--- a/harbour/doc/en/compiler.txt
+++ b/harbour/doc/en/compiler.txt
@@ -54,9 +54,8 @@
 *      =================   </par>
 *
 *          /es or /es0 - all warnings are ignored and exit code returned by
- *                        the compiler (accessed by DOS ERRORLEVEL command)
- *                        is equal to 0 if there are no errors in compiled
- *                        source file.
+ *                        the compiler is equal to 0 if there are no errors
+ *                        in compiled source file.
 *
 *          /es1        - any warnings generate a non-zero exit code, but
 *                        output is still created.
--- a/harbour/doc/en/file.txt
+++ b/harbour/doc/en/file.txt
@@ -37,7 +37,7 @@
 *  $ARGUMENTS$
 *      <cFile> Name of file to open.
 *
- *      <nMode> Dos file open mode.
+ *      <nMode> File open mode.
 *  $RETURNS$
 *      <nHandle> A file handle.
 *  $DESCRIPTION$
@@ -158,7 +158,7 @@
 *  $SYNTAX$
 *      FREAD( <nHandle>, @<cBuffer>, <nBytes> ) --> nBytes
 *  $ARGUMENTS$
- *      <nHandle>     Dos file handle
+ *      <nHandle>     File handle

 *      <cBuffer>  Character expression passed by reference.

@@ -223,7 +223,7 @@
 *  $SYNTAX$
 *     FWRITE( <nHandle>, <cBuffer>, [<nBytes>] ) --> nBytesWritten
 *  $ARGUMENTS$
- *     <nHandle>  DOS file handle number.
+ *     <nHandle>  File handle number.

 *     <cBuffer>  Character expression to be written.

@@ -236,12 +236,12 @@
 *      bytes in <cBuffer> to write.

 *      The returned value is the number of bytes successfully written to the
- *      DOS file. If the returned value is 0, an error has occurred (unless
+ *      file. If the returned value is 0, an error has occurred (unless
 *      this is intended). A successful write occurs when the number returned
- *      by FWRITE() is equal to either LEN( <cBuffer>) or <nBytes>.
+ *      by FWrite() is equal to either Len( <cBuffer> ) or <nBytes>.

 *      The value of <cBuffer> is the string or variable to be written to the
- *      open DOS file <nHandle>.
+ *      open file <nHandle>.

 *      The value of <nBytes> is the number of bytes to write out to the file.
 *      The disk write begins with the current file position in <nHandle>. If
@@ -281,7 +281,7 @@
 *  $SYNTAX$
 *      FERROR() --> <nErrorCode>
 *  $RETURNS$
- *      <nErrorCode> Value of the DOS error last encountered by a
+ *      <nErrorCode> Value of the OS error last encountered by a
 *      low-level file function.
 *
 *      FERROR() Return Values
@@ -315,7 +315,7 @@
 *      #include "fileio.ch"
 *      nHandle := FCreate( "temp.txt", FC_NORMAL )
 *      IF FError() != 0
- *         ? "Cannot create file, DOS error ", FError()
+ *         ? "Cannot create file, OS error ", FError()
 *      ENDIF
 *  $STATUS$
 *     R
@@ -342,12 +342,12 @@
 *  $SYNTAX$
 *     FCLOSE( <nHandle> ) --> <lSuccess>
 *  $ARGUMENTS$
- *     <nHandle> DOS file handle
+ *     <nHandle> File handle
 *  $RETURNS$
 *     <lSuccess>  Logical TRUE (.T.) or FALSE (.F.)
 *  $DESCRIPTION$
- *     This function closes an open file with a dos file handle
- *     of <nHandle> and writes the associated DOS buffer to the
+ *     This function closes an open file with a file handle
+ *     of <nHandle> and writes the associated buffers to the
 *     disk. The <nHandle> value is derived from the FCREATE()
 *     or FOPEN() function.
 *  $EXAMPLES$
@@ -449,7 +449,7 @@
 *      renamed, this function will search the default drive and directory
 *      or the drive and path specified in <cOldFile>. It will not search
 *      directories named by the SET PATH TO and SET DEFAULT TO commands
- *      or by the DOS PATH statement.
+ *      or by the PATH environment variable.

 *      If the file specified in <cNewFile> exists or the file is open,
 *      the function will be unable to rename the file. If the function
@@ -488,7 +488,7 @@
 *  $SYNTAX$
 *      FSEEK( <nHandle>, <nOffset>, [<nOrigin>] ) --> nPosition
 *  $ARGUMENTS$
- *     <nHandle> DOS file handle.
+ *     <nHandle> File handle.

 *     <nOffset> The number of bytes to move.

@@ -496,7 +496,7 @@
 *  $RETURNS$
 *      <nPosition> the current position relative to begin-of-file
 *  $DESCRIPTION$
- *      This function sets the file pointer in the file whose DOS file
+ *      This function sets the file pointer in the file whose file
 *      handle is <nHandle> and moves the file pointer by <expN2> bytes
 *      from the file position designated by <nOrigin>. The returned value
 *      is the relative position of the file pointer to the beginning-of-file
@@ -568,20 +568,21 @@
 *  $SYNTAX$
 *      FILE( <cFileSpec> ) --> lExists
 *  $ARGUMENTS$
- *      <cFileSpec> Dos Skeleton or file name to find.
+ *      <cFileSpec> Filename skeleton or file name to find.
 *  $RETURNS$
 *      <lExists> a logical true (.T.) if the file exists or logical
 *      false (.F.).
 *  $DESCRIPTION$
 *      This function return a logical true (.T.) if the given filename
 *      <cFileSpec> exist.
-
- *      Dos skeletons symbols may be used in the filename in <cFileSpec>,
+ *
+ *      Filename skeletons symbols may be used in the filename in <cFileSpec>,
 *      as may the drive and/or path name. If a path is not explicitly
- *      specified, FILE() will look for the file in the SET DEFAULT path,
+ *      specified, File() will look for the file in the SET DEFAULT path,
 *      then in each SET PATH path, until the file is found or there are
- *      no more paths to search. The DOS PATH is never searched and the
- *      current drive/directory is only searched if SET DEFAULT is blank.
+ *      no more paths to search. The PATH environment variable is never
+ *      searched and the current drive/directory is only searched if
+ *      SET DEFAULT is blank.
 *  $EXAMPLES$
 *      ? File( "C:\harbour\doc\compiler.txt" )
 *      ? File( "C:/harbour/doc/subcodes.txt" )
@@ -610,14 +611,14 @@
 *  $SYNTAX$
 *      FREADSTR(<nHandle>, <nBytes>) --> cString
 *  $ARGUMENTS$
- *      <nHandle> DOS file handle number.
+ *      <nHandle> File handle number.
 *
 *      <nBytes>  Number of bytes to read.
 *  $RETURNS$
 *      <cString> an character expression
 *  $DESCRIPTION$
 *      This function returns a character string of <nBytes> bytes from a
- *      file whose DOS file handle is <nHandle>.
+ *      file whose file handle is <nHandle>.

 *      The value of the file handle <nHandle> is obtained from either the
 *      FOPEN() or FCREATE() functions.
--- a/harbour/doc/en/garbage.txt
+++ b/harbour/doc/en/garbage.txt
@@ -135,16 +135,12 @@
 *      hb_gcFree() function or it will be automatically deallocated
 *      by the GC if it is not locked or if it is not referenced by some
 *      harbour level variable.
- *  $EXAMPLES$
- *      See src/vm/arrays.c
 *  $STATUS$
 *      C
 *  $COMPLIANCE$
 *      H
 *  $PLATFORMS$
 *      All
- *  $FILES$
- *      src/vm/garbage.c
 *  $SEEALSO$
 *      hb_gcFree()
 *  $END$
@@ -171,16 +167,12 @@
 *  $DESCRIPTION$
 *      hb_gcFree() is used to deallocate the memory that was
 *      allocated with the hb_gcAlloc() function.
- *  $EXAMPLES$
- *      See src/vm/arrays.c
 *  $STATUS$
 *      C
 *  $COMPLIANCE$
 *      H
 *  $PLATFORMS$
 *      All
- *  $FILES$
- *      src/vm/garbage.c
 *  $SEEALSO$
 *      hb_gcAlloc()
 *  $END$
@@ -214,8 +206,6 @@
 *      H
 *  $PLATFORMS$
 *      All
- *  $FILES$
- *      src/vm/garbage.c
 *  $SEEALSO$
 *      hb_gcAlloc(),hb_gcFree()
 *  $END$
@@ -258,8 +248,6 @@
 *      H
 *  $PLATFORMS$
 *      All
- *  $FILES$
- *      src/vm/garbage.c
 *  $SEEALSO$
 *      hb_gcAlloc(),hb_gcFree()
 *  $END$
@@ -289,8 +277,6 @@
 *      H
 *  $PLATFORMS$
 *      All
- *  $FILES$
- *      src/vm/garbage.c
 *  $SEEALSO$
 *      hb_gcCollectAll()
 *  $END$
--- a/harbour/doc/en/gtslang.txt
+++ b/harbour/doc/en/gtslang.txt
@@ -12,10 +12,10 @@ because of some bugs they have.

 The main OS it is developed to be used on is Linux. Slang was ported to
 other OSes so it should be possible to use it on other systems too. I've
-also successfully compiled and testd gtsln under DOS but I don't think it
+also successfully compiled and testd gtsln under MS-DOS but I don't think it
 makes any sense to use it on that system instead of gtdos, due to its
-limitations and incompatibilities with CA-Cl*pper (see below), so I removed DOS
-support.
+limitations and incompatibilities with CA-Cl*pper (see below), so I removed
+MS-DOS support.

 A gt Slang driver is a second driver which can be used on Unix based OSes.
 The first one is a gt driver based on a curses library (gtcrs). Due to the
@@ -99,12 +99,12 @@ occupy. So commands like :

 should write boxes well. However commands like :

-            @ Y, X SAY CHR( <OneOfBoxDrawingChar> )
+            @ Y, X SAY Chr( <OneOfBoxDrawingChar> )

 will draw a nation char when it occupies the same code as
 <OneOfBoxDrawingChar> occupies. I don't know a better solution in this
 case. Any ideas are welcome.
-This implementation works better than it would ever work in DOS where
+This implementation works better than it would ever work in MS-DOS where
 there is no way to do such tricks (because there is only one glyph's
 character set without VGA tricks).

--- a/harbour/doc/en/idle.txt
+++ b/harbour/doc/en/idle.txt
@@ -67,8 +67,6 @@
 *      in NanForum library.
 *  $PLATFORMS$
 *      All
- *  $FILES$
- *      src/rtl/idle.c
 *  $SEEALSO$
 *      HB_IDLEDEL(),HB_IDLESTATE()
 *  $END$
@@ -110,8 +108,6 @@
 *      H
 *  $PLATFORMS$
 *      All
- *  $FILES$
- *      src/rtl/idle.c
 *  $SEEALSO$
 *      HB_IDLEADD(),HB_IDLESTATE()
 *  $END$
@@ -145,7 +141,7 @@
 *      nTask1 := hb_idleAdd( {|| SayTime() } )
 *      nTask2 := hb_idleAdd( {|| SaveScreen() } )
 *      DO WHILE ! bFinished
- *        bFinished := DOSomethingVeryImportant()
+ *        bFinished := DoSomethingVeryImportant()
 *        hb_idleState()
 *      ENDDO
 *      cbAction := hb_idleDel( nTask1 )
@@ -157,8 +153,6 @@
 *      in NanForum library.
 *  $PLATFORMS$
 *      All
- *  $FILES$
- *      src/rtl/idle.c
 *  $SEEALSO$
 *      HB_IDLEADD(),HB_IDLEDEL()
 *  $END$
@@ -199,8 +193,6 @@
 *      H
 *  $PLATFORMS$
 *      All
- *  $FILES$
- *      src/rtl/idle.c
 *  $SEEALSO$
 *      HB_IDLEADD(),HB_IDLEDEL(),HB_IDLESTATE()
 *  $END$
--- a/harbour/doc/en/memo.txt
+++ b/harbour/doc/en/memo.txt
@@ -138,7 +138,6 @@
 *      MEMOREAD() does not use the settings SET DEFAULT or SET PATH to
 *      search for <cFileName>.
 *      It searches for <cFileName> in the current directory.
- *      If the file is not found, then MEMOREAD() searches in the DOS path.
 *
 *      Over a network, MEMOREAD() attempts to open <cFileName> in read-only
 *      mode and shared.  If the file is used in mode exclusive by another
@@ -205,7 +204,6 @@
 *      HB_MEMOREAD() does not use the settings SET DEFAULT or SET PATH to
 *      search for <cFileName>.
 *      It searches for <cFileName> in the current directory.
- *      If the file is not found, then HB_MEMOREAD() searches in the DOS path.
 *
 *      Over a network, HB_MEMOREAD() attempts to open <cFileName> in read-only
 *      mode and shared.  If the file is used in mode exclusive by another
--- a/harbour/doc/en/misc.txt
+++ b/harbour/doc/en/misc.txt
@@ -40,8 +40,6 @@
 *      C
 *  $PLATFORMS$
 *      All
- *  $FILES$
- *      src/rtl/version.c
 *  $END$
 */

@@ -75,7 +73,6 @@
 *  $PLATFORMS$
 *      All
 *  $FILES$
- *      src/rtl/version.c
 *      Library is rtl
 *  $SEEALSO$
 *      OS()
@@ -119,7 +116,6 @@
 *  $PLATFORMS$
 *      All
 *  $FILES$
- *     src/rtl/gete.c
 *      Library is rtl
 *  $SEEALSO$
 *     GETE
@@ -165,7 +161,6 @@
 *  $PLATFORMS$
 *      All
 *  $FILES$
- *     src/rtl/gete.c
 *      Library is rtl
 *  $SEEALSO$
 *     GETENV
@@ -219,7 +214,6 @@
 *  $PLATFORMS$
 *      All
 *  $FILES$
- *      src/rtl/gete.c
 *      Library is rtl
 *  $SEEALSO$
 *     GETENV, GETE
@@ -245,14 +239,14 @@
 *      This command runs an external program. Ensure that
 *      you have enough free memory to be able to run the external
 *      program. Do not use it to run 'Terminate and Stay Resident' programs
- *      (in case of DOS) since that causes several problems.
+ *      (in case of MS-DOS) since that causes several problems.
 *
 *      Note: This function is what the RUN command preprocesses into.
 *            It is considered bad form to use this function directly.
 *            Use the RUN command instead.
 *  $EXAMPLES$
 *      __run( "edit " + cMyTextFile )    // Runs an external editor
- *      __run( "command" )                // Gives a DOS shell (DOS only)
+ *      __run( "command" )                // Gives a OS shell
 *  $TESTS$
 *
 *  $STATUS$
@@ -262,7 +256,6 @@
 *  $PLATFORMS$
 *      All
 *  $FILES$
- *      src/rtl/run.c
 *      Library is rtl
 *  $SEEALSO$
 *      RUN
@@ -348,7 +341,7 @@
 *      (in case of DOS) since that causes several problems.
 *  $EXAMPLES$
 *      RUN ( "edit " + cMyTextFile )  // Runs an external editor
- *      RUN command                    // Gives a DOS shell (DOS only)
+ *      RUN command                    // Gives a OS shell
 *  $TESTS$
 *
 *  $STATUS$
@@ -358,7 +351,6 @@
 *  $PLATFORMS$
 *      All
 *  $FILES$
- *      src/rtl/run.c
 *      Library is rtl
 *  $SEEALSO$
 *      RUN
--- a/harbour/doc/en/setmode.txt
+++ b/harbour/doc/en/setmode.txt
@@ -35,7 +35,7 @@
 *      columns specified.
 *      Note that there are only a real few combination or rows/cols pairs
 *      that produce the video mode change.
- *      The followings are availables for DOS:
+ *      The followings are availables for GTDOS:
 *
 *      <table>
 *         12 rows x 40 columns   12 rows x 80 columns
@@ -58,7 +58,7 @@
 *      returned by MAXROW() and MAXCOL().
 *  $EXAMPLES$
 *      // The first example change to a 12 lines of display mode:
- *      IF SETMODE( 12, 40)
+ *      IF SetMode( 12, 40)
 *         ? "Hey man are you blind ?"
 *      ELSE
 *         ? "Mom bring me my glasses!"
--- a/harbour/doc/en/string.txt
+++ b/harbour/doc/en/string.txt
@@ -241,8 +241,7 @@
 *  $STATUS$
 *      R
 *  $COMPLIANCE$
- *      This function is sensitive to HB_CLP_STRICT settings during the
- *      compilation of src/rtl/at.c
+ *      This function is sensitive to HB_CLP_STRICT settings during build.
 *
 *      <nStart> and <nEnd> are Harbour extensions and do not exist if
 *      HB_CLP_STRICT is defined. In that case, the whole string is searched.
--- a/harbour/doc/en/terminal.txt
+++ b/harbour/doc/en/terminal.txt
@@ -366,7 +366,7 @@
 *      (or thinks it is running on, if an OS emulator is being used).
 *
 *      Under HB_OS_UNIX operating system the return value is the
- *      Line-Feed character (0x0a, Chr( 10) ); with other operating systems
+ *      Line-Feed character (0x0a, Chr( 10 ) ); with other operating systems
 *      (like DOS) the return value is the Carriage-Return plus Line-Feed
 *      characters (0x0d 0x0a, Chr( 13 ) + Chr( 10 )).
 *  $EXAMPLES$
--- a/harbour/doc/gtapi.txt
+++ b/harbour/doc/gtapi.txt
@@ -82,8 +82,8 @@ The following functions don't work in gtapi.c:
 _gtSave
 _gtRestore

-You get garbage on the screen in DOS mode. Two Harbour functions are
-included in the gtapi.c file, ROW() and COL() to get started.
+Two Harbour functions are included in the gtapi.c file,
+ROW() and COL() to get started.

 You also may notice that I didn't include any NanFor document headers or
 even any cvs macros. The jury is still out on that so I'll leave that to the
--- a/harbour/doc/tracing.txt
+++ b/harbour/doc/tracing.txt
@@ -95,7 +95,7 @@ usually set the HB_USER_CFLAGS environment variable like this:

  export HB_USER_CFLAGS='-DHARBOUR_USE_WIN_GTAPI -DHB_TR_LEVEL=HB_TR_INFO'

-or for other OS (eg: DOS, WIN9x)
+or for other OS (eg: MS-DOS, Windows)

  SET HB_USER_CFLAGS=-DHARBOUR_USR_WIN_GTAPI -DHB_TR_LEVEL_INFO

@@ -105,7 +105,7 @@ can set an environment variable like this:

  export HB_TR_LEVEL=HB_TR_WARNING

-or for other OS (eg: DOS, WIN9x)
+or for other OS (eg: MS-DOS, Windows)

  SET HB_TR_LEVEL=HB_TR_WARNING

--- a/harbour/include/filesys.api
+++ b/harbour/include/filesys.api
@@ -68,7 +68,7 @@ typedef FHANDLE * FHANDLEP;

 #define FHANDLE_DEFINED

-/* DOS predefined standard handles */
+/* Predefined standard I/O handles */

 #define STDIN                   0
 #define STDOUT                  1
--- a/harbour/include/hbapifs.h
+++ b/harbour/include/hbapifs.h
@@ -82,7 +82,7 @@ HB_EXTERN_BEGIN
 #define FXO_DEFAULTS  0x1000   /* Use SET command defaults    */
 #define FXO_DEVICERAW 0x2000   /* Open devices in raw mode    */
 /* Harbour extension */
-#define FXO_SHARELOCK 0x4000   /* emulate DOS SH_DENY* mode in POSIX OS */
+#define FXO_SHARELOCK 0x4000   /* emulate MS-DOS SH_DENY* mode in POSIX OS */
 #define FXO_COPYNAME  0x8000   /* copy final szPath into pFilename */

 /* these definitions should be cleared,
@@ -171,7 +171,7 @@ extern HB_EXPORT HB_BOOL    hb_fsGetAttr     ( const char * pszFileName, HB_FATT
 extern HB_EXPORT HB_BOOL    hb_fsSetAttr     ( const char * pszFileName, HB_FATTR ulAttr );
 extern HB_EXPORT HB_BOOL    hb_fsGetCWD      ( char * pszBuffer, HB_SIZE nSize );
 extern HB_EXPORT HB_BOOL    hb_fsSetCWD      ( const char * pszDirName );
-extern HB_EXPORT void       hb_fsSetError    ( HB_ERRCODE uiError ); /* set the file system DOS error number */
+extern HB_EXPORT void       hb_fsSetError    ( HB_ERRCODE uiError ); /* set the file system OS error number */
 extern HB_EXPORT void       hb_fsSetIOError  ( HB_BOOL fResult, HB_USHORT uiOperation ); /* set the file system error number after IO operation */
 extern HB_EXPORT HB_BOOL    hb_fsTruncAt     ( HB_FHANDLE hFileHandle, HB_FOFFSET nOffset ); /* truncate file to given size */
 extern HB_EXPORT HB_USHORT  hb_fsWrite       ( HB_FHANDLE hFileHandle, const void * pBuff, HB_USHORT uiCount ); /* write to an open file from a buffer (<=64K) */
@@ -206,8 +206,8 @@ extern HB_EXPORT char *     hb_fsLinkRead    ( const char * pszFileName ); /* re
 #  elif defined( HB_OS_LINUX ) && \
        !defined( __WATCOMC__ ) && !defined( HB_USE_BSDLOCKS )
      /* default usage of BSD locks in *BSD systems for emulating
-       * DOS/Windows DENY_* flags has been disabled because tests
-       * on FreeBSD 6.2 and MacOSX shows that this implementation
+       * MS-DOS/Windows DENY_* flags has been disabled because tests
+       * on FreeBSD 6.2 and OS X shows that this implementation
       * can create self deadlock when used simultaneously with
       * POSIX locks - thanks to Phil and Lorenzo for locating the
       * problem and tests [druzus]
--- a/harbour/include/hbsetup.h
+++ b/harbour/include/hbsetup.h
@@ -477,7 +477,7 @@
   #define HB_OS_OPT_DELIM_LIST         "-"
   #define HB_ISOPTSEP( c )             ( ( c ) == '-' )
 #else
-   /* we are assuming here the DOS compatible OS */
+   /* we are assuming here an MS-DOS/Windows compatible OS */
   #define HB_OS_PATH_LIST_SEP_CHR      ';'
   #define HB_OS_PATH_DELIM_CHR         '\\'
   #define HB_OS_PATH_DELIM_CHR_STRING  "\\"
--- a/harbour/package/mpkg_win.nsi
+++ b/harbour/package/mpkg_win.nsi
@@ -6,7 +6,7 @@
 ; Copyright 2009 Viktor Szakats (harbour syenar.net)
 ; See COPYING for licensing terms.
 ;
-; Harbour Nullsoft installer script (for Windows/DOS)
+; Harbour Nullsoft installer script (for Windows/MS-DOS)
 ; [ Do not try to use this script directly. It won't work. ]
 ;
 ; Please read INSTALL for further information.
@@ -81,7 +81,7 @@ Section "Main components" hb_main
  File /nonfatal "$%HB_INSTALL_PREFIX%\INSTALL"
  File /nonfatal "$%HB_INSTALL_PREFIX%\NEWS"
  File /nonfatal "$%HB_INSTALL_PREFIX%\TODO"
-  ; Let it work also for DOS packages where short filename is used here
+  ; Let it work also for MS-DOS packages where short filename is used here
  File /nonfatal "$%HB_INSTALL_PREFIX%\Change*"

  SetOutPath $INSTDIR\bin
--- a/harbour/package/winuni/RELNOTES
+++ b/harbour/package/winuni/RELNOTES
@@ -157,8 +157,8 @@ Changes since previous (2.0.0beta2 20090624) release:
 - MinGW x64 updated to 4.5.0 (20090905)
 - Finalizing ActiveX/OLE2 support.
 - Timestamp/datetime support in core.
- Added MT support for dos platform.
- Added socket support for dos platform (via WATTCP lib).
+- Added MT support for MS-DOS platform.
+- Added socket support for MS-DOS platform (via WATTCP lib).
 - Added hbnetio lib client/server file I/O implementation.
 - hbxbp lib about feature complete.
 - wce/msvcarm target improvements, sunpro compiler support.
@@ -177,13 +177,13 @@ Changes since previous (2.0.0beta1 20090609) release:
 - Harbour updated to r11508 (from r11287)
 - New User's Forum linked
 - upx compressor included in install package
- DOS cross build libs included in install package
+- MS-DOS cross build libs included in install package
 - preparation to host 3rd party packages inside Harbour directory tree
 - new "zero-conf" library install system in preparation
 - hbmk2: lots of minor refinements, support for all free compilers
  in embedded form, support spaces in filenames/paths, all Harbour
  supported C compilers have now complete support in hbmk2
- DOS support tested and required fixes applied
+- MS-DOS support tested and required fixes applied
 - embedded compilers moved to 'comp' subdir
 - support for latest MinGW x64 and MSVS 2010 compilers
 - extended INSTALL with new examples and app build quick guide
--- a/harbour/src/codepage/cp_tpl.c
+++ b/harbour/src/codepage/cp_tpl.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( template )
+ * National Collation Support Module (template)
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpcs852.c
+++ b/harbour/src/codepage/cpcs852.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( CS852 )
+ * National Collation Support Module (CS852)
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpcs852c.c
+++ b/harbour/src/codepage/cpcs852c.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( CS852C )
+ * National Collation Support Module (CS852C)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpcsiso.c
+++ b/harbour/src/codepage/cpcsiso.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( CSISO )
+ * National Collation Support Module (CSISO)
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpcskamc.c
+++ b/harbour/src/codepage/cpcskamc.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( CSKAMC )
+ * National Collation Support Module (CSKAMC)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpcswin.c
+++ b/harbour/src/codepage/cpcswin.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( CSWIN )
+ * National Collation Support Module (CSWIN)
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpde850.c
+++ b/harbour/src/codepage/cpde850.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( DE850 )
+ * National Collation Support Module (DE850)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpde850m.c
+++ b/harbour/src/codepage/cpde850m.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( DE850M )
+ * National Collation Support Module (DE850M)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpdeiso.c
+++ b/harbour/src/codepage/cpdeiso.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( German ISO )
+ * National Collation Support Module (DEISO)
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpdewin.c
+++ b/harbour/src/codepage/cpdewin.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( German WIN )
+ * National Collation Support Module (DEWIN)
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpel437.c
+++ b/harbour/src/codepage/cpel437.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( EL437 )
+ * National Collation Support Module (EL437)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpel737.c
+++ b/harbour/src/codepage/cpel737.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( Greek MS-DOS 737 )
+ * National Collation Support Module (EL737)
 *
 * Copyright 2004 Pete Dionisopoulos <pete_westg@yahoo.gr>
 * www - http://harbour-project.org
@@ -51,7 +51,7 @@
 */

 #define HB_CP_ID        EL737
-#define HB_CP_INFO      "Greek DOS CP-737"
+#define HB_CP_INFO      "Greek CP-737"
 #define HB_CP_UNITB     HB_UNITB_737
 #define HB_CP_ACSORT    HB_CDP_ACSORT_EQUAL
 #define HB_CP_UPPER     "€~ê<>‚ƒ„~ë…†~ì‡ˆ~í‰Š‹Œ<E280B9>Ž~î<><C3AE>‘‘’“~ï”•–—~ð"
--- a/harbour/src/codepage/cpeliso.c
+++ b/harbour/src/codepage/cpeliso.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( Greek ISO )
+ * National Collation Support Module (ELISO)
 *
 * Copyright 2004 Pete Dionisopoulos <pete_westg@yahoo.gr>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpelwin.c
+++ b/harbour/src/codepage/cpelwin.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( Greek WIN )
+ * National Collation Support Module (ELWIN)
 *
 * Copyright 2004 Pete Dionisopoulos <pete_westg@yahoo.gr>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpes850c.c
+++ b/harbour/src/codepage/cpes850c.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( ES850C )
+ * National Collation Support Module (ES850C)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpes850m.c
+++ b/harbour/src/codepage/cpes850m.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( ES850M )
+ * National Collation Support Module (ES850M)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpfi850.c
+++ b/harbour/src/codepage/cpfi850.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( FI850 )
+ * National Collation Support Module (FI850)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpfr850.c
+++ b/harbour/src/codepage/cpfr850.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( FR850 )
+ * National Collation Support Module (FR850)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpfr850m.c
+++ b/harbour/src/codepage/cpfr850m.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( FR850M )
+ * National Collation Support Module (FR850M)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpfriso.c
+++ b/harbour/src/codepage/cpfriso.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module (French ISO-8859-1)
+ * National Collation Support Module (FRISO)
 *
 * Copyright 2008 Viktor Szakats (harbour syenar.net)
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpfrwin.c
+++ b/harbour/src/codepage/cpfrwin.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module (French Windows-1252)
+ * National Collation Support Module (FRWIN)
 *
 * Copyright 2008 Viktor Szakats (harbour syenar.net)
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cphr646.c
+++ b/harbour/src/codepage/cphr646.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( HR646 )
+ * National Collation Support Module (HR646)
 *
 * Copyright 2003 Vlado Miholic <Vladimir.Miholic@sk.hinet.hr>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cphr852.c
+++ b/harbour/src/codepage/cphr852.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( HR852 )
+ * National Collation Support Module (HR852)
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cphriso.c
+++ b/harbour/src/codepage/cphriso.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module (HRWIN)
+ * National Collation Support Module (HRISO)
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cphu852.c
+++ b/harbour/src/codepage/cphu852.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( HU852 )
+ * National Collation Support Module (HU852)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cphu852c.c
+++ b/harbour/src/codepage/cphu852c.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( HU852C )
+ * National Collation Support Module (HU852C)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpis850.c
+++ b/harbour/src/codepage/cpis850.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( IS850 )
+ * National Collation Support Module (IS850)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpis861.c
+++ b/harbour/src/codepage/cpis861.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( IS861 )
+ * National Collation Support Module (IS861)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpit437.c
+++ b/harbour/src/codepage/cpit437.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( Italian MS-DOS cp 437 )
+ * National Collation Support Module (IT437)
 *
 * Copyright 2004 Maurilio Longo - <maurilio.longo@libero.it>
 *
--- a/harbour/src/codepage/cpit850.c
+++ b/harbour/src/codepage/cpit850.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( IT850 )
+ * National Collation Support Module (IT850)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpit850m.c
+++ b/harbour/src/codepage/cpit850m.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( IT850M )
+ * National Collation Support Module (IT850M)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpitisb.c
+++ b/harbour/src/codepage/cpitisb.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( Italian ISO-8859-1b )
+ * National Collation Support Module (ITISB)
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpitiso.c
+++ b/harbour/src/codepage/cpitiso.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( Italian ISO-8859-1 )
+ * National Collation Support Module (ITISO)
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpitwin.c
+++ b/harbour/src/codepage/cpitwin.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module (Italian Windows-1252)
+ * National Collation Support Module (ITWIN)
 *
 * Copyright 2008 Viktor Szakats (harbour syenar.net)
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cplt775.c
+++ b/harbour/src/codepage/cplt775.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( LTWIN )
+ * National Collation Support Module (LT775)
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpltwin.c
+++ b/harbour/src/codepage/cpltwin.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( LTWIN )
+ * National Collation Support Module (LTWIN)
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpnl850.c
+++ b/harbour/src/codepage/cpnl850.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( NL850 )
+ * National Collation Support Module (NL850)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpnl850m.c
+++ b/harbour/src/codepage/cpnl850m.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( NL850M )
+ * National Collation Support Module (NL850M)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpno865.c
+++ b/harbour/src/codepage/cpno865.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( NO865 )
+ * National Collation Support Module (NO865)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cppl852.c
+++ b/harbour/src/codepage/cppl852.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( PL852 )
+ * National Collation Support Module (PL852)
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cppliso.c
+++ b/harbour/src/codepage/cppliso.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( PLISO )
+ * National Collation Support Module (PLISO)
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpplmaz.c
+++ b/harbour/src/codepage/cpplmaz.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( PLMAZ )
+ * National Collation Support Module (PLMAZ)
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpplwin.c
+++ b/harbour/src/codepage/cpplwin.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( PLWIN )
+ * National Collation Support Module (PLWIN)
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cppt850.c
+++ b/harbour/src/codepage/cppt850.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( Latin 850 )
+ * National Collation Support Module (PT850)
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cppt860.c
+++ b/harbour/src/codepage/cppt860.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( PT860 )
+ * National Collation Support Module (PT860)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpptiso.c
+++ b/harbour/src/codepage/cpptiso.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( PTISO )
+ * National Collation Support Module (PTISO)
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cprukoi.c
+++ b/harbour/src/codepage/cprukoi.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module (RUKOI-8)
+ * National Collation Support Module (RUKOI8)
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpsk852.c
+++ b/harbour/src/codepage/cpsk852.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( SK852 )
+ * National Collation Support Module (SK852)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpsk852c.c
+++ b/harbour/src/codepage/cpsk852c.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( SK852C )
+ * National Collation Support Module (SK852C)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpskiso.c
+++ b/harbour/src/codepage/cpskiso.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( SKISO )
+ * National Collation Support Module (SKISO)
 *
 * Copyright 2007-2010 Viktor Szakats (harbour syenar.net)
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpskkamc.c
+++ b/harbour/src/codepage/cpskkamc.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( SKKAMC )
+ * National Collation Support Module (SKKAMC)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpskwin.c
+++ b/harbour/src/codepage/cpskwin.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( SKWIN )
+ * National Collation Support Module (SKWIN)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpsl646.c
+++ b/harbour/src/codepage/cpsl646.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( SL646 )
+ * National Collation Support Module (SL646)
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpsl852.c
+++ b/harbour/src/codepage/cpsl852.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( SL852 )
+ * National Collation Support Module (SL852)
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpsliso.c
+++ b/harbour/src/codepage/cpsliso.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( SLISO )
+ * National Collation Support Module (SLISO)
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpslwin.c
+++ b/harbour/src/codepage/cpslwin.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( SLWIN )
+ * National Collation Support Module (SLWIN)
 *
 * Copyright 2002 Alexander S.Kresin <alex@belacy.belgorod.su>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpsr646.c
+++ b/harbour/src/codepage/cpsr646.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( SR646 )
+ * National Collation Support Module (SR646)
 *
 * Copyright 2011 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpsr646c.c
+++ b/harbour/src/codepage/cpsr646c.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( SR646C )
+ * National Collation Support Module (SR646C)
 *
 * Copyright 2011 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpsv850.c
+++ b/harbour/src/codepage/cpsv850.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( SV850 )
+ * National Collation Support Module (SV850)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpsv850m.c
+++ b/harbour/src/codepage/cpsv850m.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( SV850M )
+ * National Collation Support Module (SV850M)
 *
 * Copyright 2009 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cptr857.c
+++ b/harbour/src/codepage/cptr857.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( Turkish -- DOS )
+ * National Collation Support Module (TR857)
 *
 * Copyright 2006 Bicahi Esgici <esgici@yahoo.com>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cptriso.c
+++ b/harbour/src/codepage/cptriso.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( Turkish -- ISO )
+ * National Collation Support Module (TRISO)
 *
 * Copyright 2006 Bicahi Esgici <esgici@yahoo.com>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cptrwin.c
+++ b/harbour/src/codepage/cptrwin.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module ( Turkish -- Win )
+ * National Collation Support Module (TRWIN)
 *
 * Copyright 2006 Bicahi Esgici <esgici@yahoo.com>
 * www - http://harbour-project.org
--- a/harbour/src/codepage/cpuakoi.c
+++ b/harbour/src/codepage/cpuakoi.c
@@ -4,7 +4,7 @@

 /*
 * Harbour Project source code:
- * National Collation Support Module (UAKOI-8)
+ * National Collation Support Module (UAKOI8)
 *
 * Copyright 2004 Pavel Tsarenko <tpe2@mail.ru>
 * www - http://www.xharbour.org
--- a/harbour/src/common/hbffind.c
+++ b/harbour/src/common/hbffind.c
@@ -436,7 +436,7 @@ static HB_BOOL hb_fsFindNextLow( PHB_FFIND ffind )
      PHB_FFIND_INFO info = ( PHB_FFIND_INFO ) ffind->info;

      /* Handling HB_FA_LABEL doesn't need any special tricks
-         under the DOS platform. */
+         under the MS-DOS platform. */

      if( ffind->bFirst )
      {
--- a/harbour/src/rtl/gete.c
+++ b/harbour/src/rtl/gete.c
@@ -65,7 +65,7 @@
 #include "hbapiitm.h"

 /* NOTE: Convert the envvar name to uppercase. This is required for
-         DOS and OS/2 systems. [vszakats] */
+         MS-DOS and OS/2 systems. [vszakats] */
 #if defined( HB_OS_DOS ) || defined( HB_OS_OS2 )
 #  include "hbapicdp.h"
 #  define _HB_GETENV_REQUIRES_UPPERCASE
--- a/harbour/src/rtl/hbgtcore.c
+++ b/harbour/src/rtl/hbgtcore.c
@@ -737,7 +737,7 @@ static void hb_gt_def_Tone( PHB_GT pGT, double dFrequency, double dDuration )
   HB_SYMBOL_UNUSED( pGT );
   HB_SYMBOL_UNUSED( dFrequency );

-   /* convert Clipper (DOS) timer tick units to seconds ( x / 18.2 ) */
+   /* convert Clipper (MS-DOS) timer tick units to seconds ( x / 18.2 ) */
   hb_idleSleep( dDuration / 18.2 );
 }

--- a/harbour/src/rtl/isprint.c
+++ b/harbour/src/rtl/isprint.c
@@ -63,7 +63,7 @@ HB_BOOL hb_printerIsReady( const char * pszPrinterName )

 #if defined( HB_OS_DOS )

-   /* NOTE: DOS specific solution, using BIOS interrupt */
+   /* NOTE: MS-DOS specific solution, using BIOS interrupt */

   {
      int iPort;
--- a/harbour/src/rtl/net.c
+++ b/harbour/src/rtl/net.c
@@ -116,7 +116,7 @@

 /* NOTE: Clipper will only return a maximum of 15 bytes from this function.
         And it will be padded with spaces. Harbour does the same on the
-         DOS platform.
+         MS-DOS platform.
         [vszakats] */

 /* NOTE: The caller must free the returned buffer. [vszakats] */
--- a/harbour/src/rtl/run.c
+++ b/harbour/src/rtl/run.c
@@ -57,7 +57,7 @@
 #include "hbapifs.h"

 /* TOFIX: The screen buffer handling is not right for all platforms (Windows)
-          The output of the launched (DOS?) app is not visible. */
+          The output of the launched (MS-DOS?) app is not visible. */

 HB_FUNC( __RUN )
 {
--- a/harbour/src/rtl/tlabel.prg
+++ b/harbour/src/rtl/tlabel.prg
@@ -406,7 +406,7 @@ METHOD LoadLabel( cLblFile ) CLASS HBLabelForm
   IF nReadCount == 0
      nFileError := F_EMPTY             // File is empty
   ELSE
-      nFileError := FError()            // Check for DOS errors
+      nFileError := FError()            // Check for OS errors
   ENDIF

   IF nFileError == 0
--- a/harbour/src/rtl/treport.prg
+++ b/harbour/src/rtl/treport.prg
@@ -971,7 +971,7 @@ METHOD LoadReportFile( cFrmFile AS STRING ) CLASS HBReportForm
         IF nBytesRead == 0
            nFileError := F_EMPTY        // file is empty
         ELSE
-            nFileError := FError()       // check for DOS errors
+            nFileError := FError()       // check for OS errors
         ENDIF

         IF nFileError == F_OK
@@ -1156,7 +1156,7 @@ METHOD GetExpr( nPointer AS NUMERIC ) CLASS HBReportForm
   // Stuff for dBASE compatability.
   IF nPointer != 65535

-      // Convert DOS FILE offset to CLIPPER string offset
+      // Convert FILE offset to CLIPPER string offset
      nPointer++

      // Calculate offset into OFFSETS_BUFF
--- a/harbour/src/vm/dynsym.c
+++ b/harbour/src/vm/dynsym.c
@@ -278,7 +278,7 @@ PHB_DYNS hb_dynsymNew( PHB_SYMB pSymbol )
             * binaries with multiple symbols by
             *    -Wl,--allow-multiple-definition
             * when whole module cannot be cleanly replaced.
-             * OpenWatcom for Linux, DOS and Windows (I haven't tested OS2
+             * OpenWatcom for Linux, MS-DOS and Windows (I haven't tested OS2
             * version), POCC and XCC (with /FORCE:MULTIPLE) also update
             * addresses in such case.
             *
--- a/harbour/tests/stripem.prg
+++ b/harbour/tests/stripem.prg
@@ -54,7 +54,7 @@ PROCEDURE Main( cFrom, cTo )
   RETURN

 //
-// Generic DOS file handler
+// Generic file handler
 //

 CREATE CLASS TTextFile
@@ -101,7 +101,7 @@ METHOD New( cFileName, cMode, nBlock ) CLASS TTextFile
   ELSEIF ::cMode == "W"
      ::hFile := FCreate( cFileName )
   ELSE
-      ? "DosFile Init: Unknown file mode:", ::cMode
+      ? "File Init: Unknown file mode:", ::cMode
   ENDIF

   ::nError := FError()
@@ -123,7 +123,7 @@ METHOD Dispose() CLASS TTextFile
   IF ::hFile != F_ERROR
      IF ! FClose( ::hFile )
         ::nError := FError()
-         ? "Dos Error closing ", ::cFileName, " Code ", ::nError
+         ? "OS Error closing ", ::cFileName, " Code ", ::nError
      ENDIF
   ENDIF

@@ -141,7 +141,7 @@ METHOD Read() CLASS TTextFile
   LOCAL nEoFPos

   IF ::hFile == F_ERROR
-      ? "DosFile:Read : No file open"
+      ? "File:Read : No file open"
   ELSEIF !( ::cMode == "R" )
      ? "File ", ::cFileName, " not open for reading"
   ELSEIF ! ::lEoF
@@ -194,7 +194,7 @@ METHOD WriteLn( xTxt, lCRLF ) CLASS TTextFile
   LOCAL cBlock

   IF ::hFile == F_ERROR
-      ? "DosFile:Write : No file open"
+      ? "File:Write : No file open"
   ELSEIF !( ::cMode == "W" )
      ? "File ", ::cFileName, " not opened for writing"
   ELSE
@@ -220,7 +220,7 @@ METHOD Goto( nLine ) CLASS TTextFile
   LOCAL nWhere := 1

   IF Empty( ::hFile )
-      ? "DosFile:Goto : No file open"
+      ? "File:Goto : No file open"
   ELSEIF !( ::cMode == "R" )
      ? "File ", ::cFileName, " not open for reading"
   ELSE
--- a/Show More
+++ b/Show More