This patch fixes spell errors in code strings and in documentation.

Index: fpcbuild-2.4.0/fpcdocs/classchart.ps
===================================================================
--- fpcbuild-2.4.0/fpcdocs/classchart.ps	(revision 633)
+++ fpcbuild-2.4.0/fpcdocs/classchart.ps	(working copy)
@@ -76,7 +76,7 @@
   % save parameters
   /status exch def  
   /classname exch def
-  % save enviroment
+  % save environment
   gsave
   newpath
 
@@ -140,7 +140,7 @@
   % save parameters
   /status exch def  
   /classname exch def
-  % save enviroment
+  % save environment
   gsave
   newpath
 
@@ -210,7 +210,7 @@
    % save parameters
    /status exch def  
    /classname exch def
-   % save enviroment
+   % save environment
    % push this on the stack for onelevelback
    nexty 
    newpath
@@ -269,7 +269,7 @@
    /offsetx exch def
    /status exch def  
    /classname exch def
-   % save enviroment
+   % save environment
    % push this on the stack for onemovelevelback
    nextx
    nexty 
Index: fpcbuild-2.4.0/fpcdocs/internal/comparch.tex
===================================================================
--- fpcbuild-2.4.0/fpcdocs/internal/comparch.tex	(revision 633)
+++ fpcbuild-2.4.0/fpcdocs/internal/comparch.tex	(working copy)
@@ -109,7 +109,7 @@
 \label{subsubsec:input}
 
 The input data is handled via the standard way of handling all the I/O in
-the compiler. That is to say, that it is a hook which can be overriden in
+the compiler. That is to say, that it is a hook which can be overridden in
 \textbf{comphook.pas (do{\_}openinputfile)}, in case where another I/O
 method wants to be used.
 
@@ -1481,7 +1481,7 @@
     ??? \\
 & \textsf{proptype      : ttype;}&
     Indicates the type of the property\\
-& \textsf{propoverriden : ppropertysym;}&
+& \textsf{propoverridden : ppropertysym;}&
     ??? \\
 & \textsf{indextype     : ttype;}&  \\
 & \textsf{index : longint;}&
@@ -2123,7 +2123,7 @@
 \textsf{po{\_}abstractmethod}& This is an abstract method \\
 \textsf{po{\_}staticmethod}  & This is a static method \\
 \textsf{po{\_}overridingmethod}&
-    This is an overriden method (with po{\_}virtual flag usually) \\
+    This is an overridden method (with po{\_}virtual flag usually) \\
 \textsf{po{\_}methodpointer}&
     This is a method pointer (not a normal routine pointer) \\
 \textsf{po{\_}containsself}&
Index: fpcbuild-2.4.0/fpcdocs/packages/listings/listings.dtx
===================================================================
--- fpcbuild-2.4.0/fpcdocs/packages/listings/listings.dtx	(revision 633)
+++ fpcbuild-2.4.0/fpcdocs/packages/listings/listings.dtx	(working copy)
@@ -11043,7 +11043,7 @@
 %
 %
 % \paragraph{Helpers}
-% Our goal is to define the yet unkown |\lst@UseFormat|. This definition
+% Our goal is to define the yet unknown |\lst@UseFormat|. This definition
 % will parse the user supplied format. We start with some general macros.
 %
 % \begin{macro}{\lst@fmtSplit}
Index: fpcbuild-2.4.0/fpcdocs/CinFreePasca.tex
===================================================================
--- fpcbuild-2.4.0/fpcdocs/CinFreePasca.tex	(revision 633)
+++ fpcbuild-2.4.0/fpcdocs/CinFreePasca.tex	(working copy)
@@ -157,7 +157,7 @@
 \verb|longint| Free Pascal type to match it. Here we call the
 \verb|ctypes.cint32| type converter. This method shall be prefered.
 
-For type conversion of C types it is usefull to take a look at the
+For type conversion of C types it is useful to take a look at the
 C/C++ header \verb|limits.h|. On Linux systems it is usually located in
 \verb|/lib/include/|. For Free Pascal conversion, it shall be safer to take a
 look to the documentation \cite{FPDoc,FPFor}.
Index: fpcbuild-2.4.0/fpcdocs/matrix.xml
===================================================================
--- fpcbuild-2.4.0/fpcdocs/matrix.xml	(revision 633)
+++ fpcbuild-2.4.0/fpcdocs/matrix.xml	(working copy)
@@ -3520,7 +3520,7 @@
   <descr>
   This operator allows you to use a three-dimensional matrix with extended precision
   values wherever a two-dimensional matrix with double precision is expected.
-  The surplus fields are thrown away and some accuracy is lost becuase of the
+  The surplus fields are thrown away and some accuracy is lost beacause of the
   conversion.
   </descr>
 </element>
@@ -5629,4 +5629,4 @@
 <element name="operator /(Tmatrix4_double, double): Tmatrix4_double
 <element name="operator /(Tmatrix4_extended, extended): Tmatrix4_extended
 <element name="operator /(Tmatrix4_extended, extended): Tmatrix4_extended
--->
\ No newline at end of file
+-->
Index: fpcbuild-2.4.0/fpcdocs/ref.tex
===================================================================
--- fpcbuild-2.4.0/fpcdocs/ref.tex	(revision 633)
+++ fpcbuild-2.4.0/fpcdocs/ref.tex	(working copy)
@@ -3288,7 +3288,7 @@
 Class reference types are used to create instances of a certain class, which
 is not yet known at compile time, but which is specified at run time. 
 Essentially, a variable of a class reference type contains a pointer to the
-definition of the speficied class. This can be used to construct an instance 
+definition of the specified class. This can be used to construct an instance 
 of the class corresponding to the definition, or to check inheritance. 
 The following example shows how it works:
 \begin{verbatim}
Index: fpcbuild-2.4.0/fpcdocs/process.xml
===================================================================
--- fpcbuild-2.4.0/fpcdocs/process.xml	(revision 633)
+++ fpcbuild-2.4.0/fpcdocs/process.xml	(working copy)
@@ -590,7 +590,7 @@
 <descr>
 <p>
 <var>ProcessID</var> is the ID of the main process thread. It is the same as the handle
-of the main proces thread (or the process itself) on Unix systems, but on Windows it
+of the main process thread (or the process itself) on Unix systems, but on Windows it
 is different from the thread Handle.
 </p>
 <p>
Index: fpcbuild-2.4.0/fpcdocs/sockex/serverex.pp
===================================================================
--- fpcbuild-2.4.0/fpcdocs/sockex/serverex.pp	(revision 633)
+++ fpcbuild-2.4.0/fpcdocs/sockex/serverex.pp	(working copy)
@@ -27,7 +27,7 @@
  If you exit all your telnet sessions before shutting the server down, it
  works fine.
 
- Hope some of you find this usefull. I wrote it, purely because there is a
+ Hope some of you find this useful. I wrote it, purely because there is a
  big lack of examples of linux port use in FPC. And I know NO C, therefore
  the examples on the net meant nothing to me.
 
Index: fpcbuild-2.4.0/fpcdocs/sockex/socksvr.pp
===================================================================
--- fpcbuild-2.4.0/fpcdocs/sockex/socksvr.pp	(revision 633)
+++ fpcbuild-2.4.0/fpcdocs/sockex/socksvr.pp	(working copy)
@@ -33,7 +33,7 @@
    PError ('Server : Bind : ');
   if fpListen (S,1)=-1 then
    PError ('Server : Listen : ');
-  Writeln('Waiting for Connect from Client, run now sock_cli in an other tty');
+  Writeln('Waiting for Connect from Client, run now sock_cli in another tty');
   if not Accept (S,FromName,Sin,Sout) then
    PError ('Server : Accept : '+fromname);
   Reset(Sin);
Index: fpcbuild-2.4.0/fpcdocs/buildfaq/unixrtl.lyx
===================================================================
--- fpcbuild-2.4.0/fpcdocs/buildfaq/unixrtl.lyx	(revision 633)
+++ fpcbuild-2.4.0/fpcdocs/buildfaq/unixrtl.lyx	(working copy)
@@ -1255,7 +1255,7 @@
 \end_layout
 
 \begin_layout Standard
-The unit unixtype was introduced pretty late in the rearchitecting proces.
+The unit unixtype was introduced pretty late in the rearchitecting process.
  Initially baseunix imported ptypes.inc and ctypes, but some platforms needed
  base unix types below this level (e.g.
  in header units that were used to implement baseunix).
Index: fpcbuild-2.4.0/fpcdocs/buildfaq/buildfaq.lyx
===================================================================
--- fpcbuild-2.4.0/fpcdocs/buildfaq/buildfaq.lyx	(revision 633)
+++ fpcbuild-2.4.0/fpcdocs/buildfaq/buildfaq.lyx	(working copy)
@@ -4498,7 +4498,7 @@
 Well, there is not much to tell.
  The default is ok, and I never change it (I wrote it down below for completenes
 s), for more info see the manual.
- Note that any verbosity setting in fpc.cfg can be overriden on the commandline
+ Note that any verbosity setting in fpc.cfg can be overridden on the commandline
  (e.g.
  for debugging, typically uses -va on the cmdline ) 
 \end_layout
@@ -7170,7 +7170,7 @@
 \end_layout
 
 \begin_layout Chapter
-Systematic problem solving for the FPC build proces 
+Systematic problem solving for the FPC build process 
 \end_layout
 
 \begin_layout Standard
Index: fpcbuild-2.4.0/fpcdocs/strutils.xml
===================================================================
--- fpcbuild-2.4.0/fpcdocs/strutils.xml	(revision 633)
+++ fpcbuild-2.4.0/fpcdocs/strutils.xml	(working copy)
@@ -2005,7 +2005,7 @@
       </element>
       <element name="AnsiResemblesProc">
         <short>Procedural variable, called when checking 2 strings for resemblances in <link id="AnsiResemblesText"/></short>
-        <descr>This procedural variable is standard set to <link id="SoundexProc"/> but can be overriden with a user-defined algorithm. 
+        <descr>This procedural variable is standard set to <link id="SoundexProc"/> but can be overridden with a user-defined algorithm. 
 This algorithm should return <var>True</var> if <var>AText</var> resembles <var>AOtherText</var>, or <var>False</var> otherwise. 
 The standard routine compares the soundexes of the two strings and returns <var>True</var> if they are equal.</descr>
         <errors>None</errors>
Index: fpcbuild-2.4.0/fpcdocs/sqldb.xml
===================================================================
--- fpcbuild-2.4.0/fpcdocs/sqldb.xml	(revision 633)
+++ fpcbuild-2.4.0/fpcdocs/sqldb.xml	(working copy)
@@ -837,7 +837,7 @@
         <short>The name of the Host Computer where the SQL server or client is resident and to which connection is to be made</short>
         <descr>
           <p>The name of the Host Computer where the SQL server or client is resident and to which connection is to be made</p>
-          <p>This property can be pre-set in the Object Inspector during programme testing or if the programme is always going to run on the same machine, but more usually and more usefully would be set in a log-in dialog along with the UserName and Password.</p>
+          <p>This property can be pre-set in the Object Inspector during programme testing or if the programme is always going to run on the same machine, but more usually and more usefuly would be set in a log-in dialog along with the UserName and Password.</p>
         </descr>
         <seealso/>
       </element>
Index: fpcbuild-2.4.0/fpcdocs/gtk2.tex
===================================================================
--- fpcbuild-2.4.0/fpcdocs/gtk2.tex	(revision 633)
+++ fpcbuild-2.4.0/fpcdocs/gtk2.tex	(working copy)
@@ -845,7 +845,7 @@
 end;
 \end{lstlisting}
 The \lstinline|realize| and \lstinline|size_allocate| of the parent widget
-\lstinline|GTKDigit| are overriden here. Also 2 events callbacks are
+\lstinline|GTKDigit| are overridden here. Also 2 events callbacks are
 assigned in order to react on mouse clicks.
 
 The object initialization function must undo some work that was done
Index: fpcbuild-2.4.0/fpcdocs/user.tex
===================================================================
--- fpcbuild-2.4.0/fpcdocs/user.tex	(revision 633)
+++ fpcbuild-2.4.0/fpcdocs/user.tex	(working copy)
@@ -3549,7 +3549,7 @@
 This opcode cannot be prefixed by this instruction.
 
 \item [Invalid combination of override and opcode]
-This opcode cannot be overriden by this combination.
+This opcode cannot be overridden by this combination.
 
 \item [Too many operands on line]
 At most three operand instructions exist on the m68k, and i386, you
Index: fpcbuild-2.4.0/fpcdocs/sysutils.xml
===================================================================
--- fpcbuild-2.4.0/fpcdocs/sysutils.xml	(revision 633)
+++ fpcbuild-2.4.0/fpcdocs/sysutils.xml	(working copy)
@@ -3497,7 +3497,7 @@
 <remark>
 Note that on Windows, environment strings can start with an equal sign (=).
 This is a trick used to pass the current working directory to a newly created
-proces. In this case, extracting the variable name as the characters before
+process. In this case, extracting the variable name as the characters before
 the first equal sign will result in an empty name.
 </remark>
 </descr>
@@ -3537,7 +3537,7 @@
 and quote rules.
 </descr>
 <errors>
-In case the program could not be executed or an other error occurs, 
+In case the program could not be executed or another error occurs, 
 an <link id="EOSError"/> exception  will be raised.
 </errors>
 <seealso>
Index: fpcbuild-2.4.0/fpcsrc/utils/fpcm/fpcmake.ini
===================================================================
--- fpcbuild-2.4.0/fpcsrc/utils/fpcm/fpcmake.ini	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/utils/fpcm/fpcmake.ini	(working copy)
@@ -1258,7 +1258,7 @@
 DATESTR=
 endif
 
-# Look if UPX is found for go32v2 and win32. We can't use $UPX becuase
+# Look if UPX is found for go32v2 and win32. We can't use $UPX because
 # upx uses that one itself (PFV)
 ifndef UPXPROG
 ifeq ($(OS_TARGET),go32v2)
Index: fpcbuild-2.4.0/fpcsrc/utils/fpcm/makefile.exm
===================================================================
--- fpcbuild-2.4.0/fpcsrc/utils/fpcm/makefile.exm	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/utils/fpcm/makefile.exm	(working copy)
@@ -87,6 +87,6 @@
 
 
 [rules]
-; here you can add your own rules, the general rules will automaticly
+; here you can add your own rules, the general rules will automatically
 ; remove the defaults which call fpc_<rule>.
 
Index: fpcbuild-2.4.0/fpcsrc/utils/fppkg/pkgmessages.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/utils/fppkg/pkgmessages.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/utils/fppkg/pkgmessages.pp	(working copy)
@@ -21,7 +21,7 @@
   SErrMissingInstallPackage  = 'Could not find package "%s"';
   SErrNoPackageSpecified     = 'No package specified';
   SErrNoPackageAvailable     = 'Package %s %s is not available';
-  SErrOnlyLocalDir           = 'The speficied command "%s" works only on current dir, not on a (remote) package';
+  SErrOnlyLocalDir           = 'The specified command "%s" works only on current dir, not on a (remote) package';
   SErrExecutionFPMake        = 'Execution of FPMake %s failed';
   SErrException              = 'The FPC Package tool encountered the following error:';
   SErrActionAlreadyRegistered= 'Action "%s" is already registered';
Index: fpcbuild-2.4.0/fpcsrc/utils/h2pas/h2pas.y
===================================================================
--- fpcbuild-2.4.0/fpcsrc/utils/h2pas/h2pas.y	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/utils/h2pas/h2pas.y	(working copy)
@@ -655,7 +655,7 @@
                    write(outfile,'args:array of const');
                    (* if variable number of args we must allways pop *)
                    no_pop:=false;
-                   (* Needs 2 declarations, also one without args, becuase
+                   (* Needs 2 declarations, also one without args, because
                       in C you can omit the second parameter. Default parameter
                       doesn't help as that isn't possible with array of const *)
                    NeedEllipsisOverload:=true;
Index: fpcbuild-2.4.0/fpcsrc/utils/h2pas/h2pas.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/utils/h2pas/h2pas.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/utils/h2pas/h2pas.pas	(working copy)
@@ -659,7 +659,7 @@
                    write(outfile,'args:array of const');
                    (* if variable number of args we must allways pop *)
                    no_pop:=false;
-                   (* Needs 2 declarations, also one without args, becuase
+                   (* Needs 2 declarations, also one without args, because
                       in C you can omit the second parameter. Default parameter
                       doesn't help as that isn't possible with array of const *)
                    NeedEllipsisOverload:=true;
Index: fpcbuild-2.4.0/fpcsrc/ide/whlpview.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/ide/whlpview.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/ide/whlpview.pas	(working copy)
@@ -211,7 +211,7 @@
         procedure   ShowTopic(SourceFileID: word; Context: THelpCtx); virtual;
         procedure   HandleEvent(var Event: TEvent); virtual;
         procedure   Close; virtual;
-        function    GetPalette: PPalette; virtual; { needs to be overriden }
+        function    GetPalette: PPalette; virtual; { needs to be overridden }
       end;
 
 implementation
Index: fpcbuild-2.4.0/fpcsrc/ide/fpswitch.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/ide/fpswitch.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/ide/fpswitch.pas	(working copy)
@@ -210,7 +210,7 @@
 {$else}
 const
 {$endif}
-      msg_automaticallycreateddontedit = 'Automaticly created file, don''t edit.';
+      msg_automaticallycreateddontedit = 'Automatically created file, don''t edit.';
 
       { Compiler options }
       opt_objectpascal = 'Object pascal support';
Index: fpcbuild-2.4.0/fpcsrc/ide/whtmlhlp.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/ide/whtmlhlp.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/ide/whtmlhlp.pas	(working copy)
@@ -724,7 +724,7 @@
 end;
 
 Function  THTMLTopicRenderer.CanonicalizeURL(const Base,Relative:String):string;
-// uses info from filesystem (curdir) -> overriden for CHM.
+// uses info from filesystem (curdir) -> overridden for CHM.
 begin
  CanonicalizeURL:=CompleteURL(Base,relative);
 end;
Index: fpcbuild-2.4.0/fpcsrc/rtl/unix/unixutil.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/rtl/unix/unixutil.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/rtl/unix/unixutil.pp	(working copy)
@@ -114,7 +114,7 @@
 Function StringToPPChar(Var S:String;ReserveEntries:integer):ppchar;
 {
   Create a PPChar to structure of pchars which are the arguments specified
-  in the string S. Especially usefull for creating an ArgV for Exec-calls
+  in the string S. Especially useful for creating an ArgV for Exec-calls
   Note that the string S is destroyed by this call.
 }
 
@@ -126,7 +126,7 @@
 Function StringToPPChar(Var S:AnsiString;ReserveEntries:integer):ppchar;
 {
   Create a PPChar to structure of pchars which are the arguments specified
-  in the string S. Especially usefull for creating an ArgV for Exec-calls
+  in the string S. Especially useful for creating an ArgV for Exec-calls
 }
 
 begin
Index: fpcbuild-2.4.0/fpcsrc/rtl/wince/system.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/rtl/wince/system.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/rtl/wince/system.pp	(working copy)
@@ -103,7 +103,7 @@
 
 
 {$ifdef CPUARM}
-{ the external directive isn't really necessary here because it is overriden by external (FK) }
+{ the external directive isn't really necessary here because it is overridden by external (FK) }
 
 function addd(d1,d2 : double) : double; compilerproc;
    cdecl;external 'coredll' name '__addd';
Index: fpcbuild-2.4.0/fpcsrc/rtl/emx/sysutils.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/rtl/emx/sysutils.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/rtl/emx/sysutils.pp	(working copy)
@@ -226,7 +226,7 @@
   PgmInputs:PChar;            {Command parameters (nil allowed).}
   TermQ:PChar;                {System queue. (nil allowed).}
   Environment:PChar;          {Environment to pass (nil allowed).}
-  InheritOpt:word;            {Inherit enviroment from shell/
+  InheritOpt:word;            {Inherit environment from shell/
                                inherit environment from parent (0/1).}
   SessionType:word;           {Auto/full screen/window/presentation
                                manager/full screen Dos/windowed Dos
Index: fpcbuild-2.4.0/fpcsrc/rtl/win/wininc/Makefile
===================================================================
--- fpcbuild-2.4.0/fpcsrc/rtl/win/wininc/Makefile	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/rtl/win/wininc/Makefile	(working copy)
@@ -54,7 +54,7 @@
 	sed -n -e "s/Addr:\(.*\)Ord:\(.*\)Name: \(.*\)/@\3@/p" $*.tmp > $*.exd
 #	-rm $*.tmp
 
-# list of usefull dll's for windows.pp
+# list of useful dll's for windows.pp
 dllexps : gdi32.exp kernel32.exp advapi32.exp user32.exp mapi32.exp  \
 	comdlg32.exp shell32.exp mpr.exp comctl32.exp version.exp \
 	opengl32.exp spoolss.exp winspool.exd
Index: fpcbuild-2.4.0/fpcsrc/rtl/win/sysos.inc
===================================================================
--- fpcbuild-2.4.0/fpcsrc/rtl/win/sysos.inc	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/rtl/win/sysos.inc	(working copy)
@@ -191,7 +191,7 @@
    function GetStdHandle(nStdHandle:DWORD):THANDLE;
      stdcall;external KernelDLL name 'GetStdHandle';
 
-   { command line/enviroment functions }
+   { command line/environment functions }
    function GetCommandLine : pchar;
      stdcall;external KernelDLL name 'GetCommandLineA';
 
Index: fpcbuild-2.4.0/fpcsrc/rtl/win/sysutils.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/rtl/win/sysutils.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/rtl/win/sysutils.pp	(working copy)
@@ -100,7 +100,7 @@
 
 function GetFileVersion(const AFileName:string):Cardinal;
   var
-    { usefull only as long as we don't need to touch different stack pages }
+    { useful only as long as we don't need to touch different stack pages }
     buf : array[0..3071] of byte;
     bufp : pointer;
     fn : string;
Index: fpcbuild-2.4.0/fpcsrc/rtl/linux/oldlinux.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/rtl/linux/oldlinux.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/rtl/linux/oldlinux.pp	(working copy)
@@ -5176,7 +5176,7 @@
 Function StringToPPChar(Var S:String):ppchar;
 {
   Create a PPChar to structure of pchars which are the arguments specified
-  in the string S. Especially usefull for creating an ArgV for Exec-calls
+  in the string S. Especially useful for creating an ArgV for Exec-calls
   Note that the string S is destroyed by this call.
 }
 
@@ -5188,7 +5188,7 @@
 Function StringToPPChar(Var S:AnsiString):ppchar;
 {
   Create a PPChar to structure of pchars which are the arguments specified
-  in the string S. Especially usefull for creating an ArgV for Exec-calls
+  in the string S. Especially useful for creating an ArgV for Exec-calls
 }
 
 begin
Index: fpcbuild-2.4.0/fpcsrc/rtl/os2/sysutils.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/rtl/os2/sysutils.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/rtl/os2/sysutils.pp	(working copy)
@@ -263,7 +263,7 @@
   PgmInputs:PChar;            {Command parameters (nil allowed).}
   TermQ:PChar;                {System queue. (nil allowed).}
   Environment:PChar;          {Environment to pass (nil allowed).}
-  InheritOpt:word;            {Inherit enviroment from shell/
+  InheritOpt:word;            {Inherit environment from shell/
                                inherit environment from parent (0/1).}
   SessionType:word;           {Auto/full screen/window/presentation
                                manager/full screen Dos/windowed Dos
Index: fpcbuild-2.4.0/fpcsrc/rtl/os2/doscalls.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/rtl/os2/doscalls.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/rtl/os2/doscalls.pas	(working copy)
@@ -2860,7 +2860,7 @@
             PgmInputs:PChar;            {Command parameters (nil allowed).}
             TermQ:PChar;                {System queue. (nil allowed).}
             Environment:PChar;          {Environment to pass (nil allowed).}
-            InheritOpt:word;            {Inherit enviroment from shell/
+            InheritOpt:word;            {Inherit environment from shell/
                                          inherit environment from parent
                                          (0/1).}
             SessionType:word;           {Auto/full screen/window/presentation
Index: fpcbuild-2.4.0/fpcsrc/rtl/netware/demos/check.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/rtl/netware/demos/check.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/rtl/netware/demos/check.pp	(working copy)
@@ -18,7 +18,7 @@
 {$Copyright (c) 2002 the FreePascal development team}
 
 
-{ using crt automaticly calls _SetAutoScreenDestructionMode (TRUE);
+{ using crt automatically calls _SetAutoScreenDestructionMode (TRUE);
   so no "Press any key to close screeen" will be shown by netware }
 uses crt;
 
Index: fpcbuild-2.4.0/fpcsrc/rtl/netware/README.txt
===================================================================
--- fpcbuild-2.4.0/fpcsrc/rtl/netware/README.txt	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/rtl/netware/README.txt	(working copy)
@@ -77,7 +77,7 @@
 #ENDIF
 
     This adds the search path for the rtl-units as well as for the needed import-files.
-    You can use the import files from the rtl/netware directory, they are automaticly
+    You can use the import files from the rtl/netware directory, they are automatically
     installed. If you want to use import files from novell, be aware that you have to
     convert the files to unix format (i.e. with dos2unix).
 
@@ -138,7 +138,7 @@
       searching import files via the specified library path (-Fl). If you plan to use
       import files from novell be aware that they have to be converted from CR/LF to
       LF only. The script 'convertimp' in rtl/netware/nwimp will do that.
-      If a module name is specified in an import, the module is automaticly
+      If a module name is specified in an import, the module is automatically
       declared as autoload by FreePascal.
 
       I.e. the following declaration needs nlmlib.imp and sets nlmlib.nlm as autoload:
Index: fpcbuild-2.4.0/fpcsrc/rtl/inc/text.inc
===================================================================
--- fpcbuild-2.4.0/fpcsrc/rtl/inc/text.inc	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/rtl/inc/text.inc	(working copy)
@@ -334,7 +334,7 @@
   { restore file position if not working with a device }
   if not isdevice then
     { if we didn't modify the buffer, simply restore the BufPos and BufEnd  }
-    { (the latter becuase it's now probably set to zero because nothing was }
+    { (the latter because it's now probably set to zero because nothing was }
     {  was read anymore)                                                    }
     if (reads = 0) then
       begin
Index: fpcbuild-2.4.0/fpcsrc/rtl/inc/fexpand.inc
===================================================================
--- fpcbuild-2.4.0/fpcsrc/rtl/inc/fexpand.inc	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/rtl/inc/fexpand.inc	(working copy)
@@ -556,7 +556,7 @@
    parent directory and so on (Amiga). Please, note that you can decide
    to support both '..' and DirectorySeparator as references to the parent
    directory at the same time for compatibility reasons - however this
-   support makes it impossible to use an otherwise possibly valid name
+   support makes it impossible to use anotherwise possibly valid name
    of '..'.
 
    FPC_FEXPAND_DIRSEP_IS_CURDIR - DirectorySeparator at the beginning of
Index: fpcbuild-2.4.0/fpcsrc/rtl/inc/system.inc
===================================================================
--- fpcbuild-2.4.0/fpcsrc/rtl/inc/system.inc	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/rtl/inc/system.inc	(working copy)
@@ -1115,7 +1115,7 @@
 Function StringToPPChar(Var S:AnsiString;ReserveEntries:integer):ppchar;
 {
   Create a PPChar to structure of pchars which are the arguments specified
-  in the string S. Especially usefull for creating an ArgV for Exec-calls
+  in the string S. Especially useful for creating an ArgV for Exec-calls
 }
 
 begin
Index: fpcbuild-2.4.0/fpcsrc/rtl/inc/dynarr.inc
===================================================================
--- fpcbuild-2.4.0/fpcsrc/rtl/inc/dynarr.inc	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/rtl/inc/dynarr.inc	(working copy)
@@ -213,7 +213,7 @@
                  int_addref(pointer(newp)+sizeof(tdynarray)+elesize*i,eletype);
 
                { a declock(ref. count) isn't enough here }
-               { it could be that the in MT enviroments  }
+               { it could be that the in MT environments  }
                { in the mean time the refcount was       }
                { decremented                             }
 
Index: fpcbuild-2.4.0/fpcsrc/rtl/objpas/freebidi.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/rtl/objpas/freebidi.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/rtl/objpas/freebidi.pp	(working copy)
@@ -37,9 +37,9 @@
 function VPos(UTF8Char:PChar; Len:integer; BytePos:integer):Cardinal;
 {Returns character at a given visual position according to paragraph direction}
 function VCharOf(Src:TString; vp:Integer; dir:TDirection):TCharacter;
-{Inserts a string into an other paying attention of RTL/LTR direction}
+{Inserts a string into another paying attention of RTL/LTR direction}
 procedure VInsert(const Src:TString; var Dest:TString; vp:Integer; pDir:TDirection);
-{Deletes a string into an other paying attention of RTL/LTR direction}
+{Deletes a string into another paying attention of RTL/LTR direction}
 procedure VDelete(var str:TString; vp, len:Integer; pDir:TDirection);
 {Resturns a sub string of source string}
 //function VCopy(const Src:TString; vStart, vWidth:Integer):TString;
Index: fpcbuild-2.4.0/fpcsrc/rtl/objpas/utf8bidi.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/rtl/objpas/utf8bidi.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/rtl/objpas/utf8bidi.pp	(working copy)
@@ -47,9 +47,9 @@
 function VPos(const UTF8Str:TUTF8String; lp:Integer; pDir, cDir:TDirection):Cardinal;
 {Returns character at a given visual position according to paragraph direction}
 function VCharOf(UTF8Str:TUTF8String; vp:Integer; dir:TDirection):TUTF8Char;
-{Inserts a string into an other paying attention of RTL/LTR direction}
+{Inserts a string into another paying attention of RTL/LTR direction}
 procedure VInsert(const Src:TUTF8String; var Dest:TUTF8String; vp:Integer; pDir:TDirection);
-{Deletes a string into an other paying attention of RTL/LTR direction}
+{Deletes a string into another paying attention of RTL/LTR direction}
 procedure VDelete(var str:TUTF8String; vp, len:Integer; pDir:TDirection);
 {****************************Helper routines***********************************}
 {Returns direction of a character}
Index: fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj8.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj8.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj8.pp	(working copy)
@@ -200,7 +200,7 @@
       bigstring: shortstring; s32: longint; s64: int64);saveregisters;
    procedure method_virtual_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;saveregisters;
-   procedure method_virtual_overriden_params_mixed(u8 :byte; u16: word;
+   procedure method_virtual_overridden_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;saveregisters;
    procedure method_static_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);static;saveregisters;
@@ -212,7 +212,7 @@
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;saveregisters;
    procedure method_virtual_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;saveregisters;
-   procedure method_virtual_call_overriden_params_mixed(
+   procedure method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;saveregisters;
    procedure method_virtual_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;saveregisters;
@@ -227,7 +227,7 @@
  theritedvmtobject = object(tvmtobject)
    constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word;
+   constructor constructor_params_mixed_call_overridden(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_static(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
@@ -235,7 +235,7 @@
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   procedure method_virtual_overriden_params_mixed(
+   procedure method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;saveregisters;
 
    { normal methods which call other methods }
@@ -243,7 +243,7 @@
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters;
    procedure method_normal_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters;
-   procedure method_normal_call_overriden_params_mixed(
+   procedure method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters;
    procedure method_normal_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters;
@@ -462,8 +462,8 @@
    object_s64bit := s64;
  end;
 
-{ this one should be overriden }
-procedure tvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure tvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters;
  begin
     RunError(211);
@@ -503,10 +503,10 @@
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure tvmtobject.method_virtual_call_overriden_params_mixed(
+procedure tvmtobject.method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters;
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -547,7 +547,7 @@
    method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-constructor theritedvmtobject.constructor_params_mixed_call_overriden(
+constructor theritedvmtobject.constructor_params_mixed_call_overridden(
    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
@@ -555,7 +555,7 @@
    object_bigstring := '';
    object_s32bit := 0;
    object_s64bit := 0;
-   method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+   method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_static(
@@ -591,8 +591,8 @@
    inherited constructor_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-{ this one should be overriden }
-procedure theritedvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure theritedvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := u8;
@@ -614,10 +614,10 @@
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure theritedvmtobject.method_normal_call_overriden_params_mixed(
+procedure theritedvmtobject.method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);saveregisters;
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -1060,7 +1060,7 @@
     failed := false;
 
     Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-    vmtobject.constructor_params_mixed_call_overriden(RESULT_U8BIT,
+    vmtobject.constructor_params_mixed_call_overridden(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1089,7 +1089,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.constructor_params_mixed_call_overriden(value_u8bit,
+    vmtobject.constructor_params_mixed_call_overridden(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1276,7 +1276,7 @@
 
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-    vmtobject.method_virtual_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1306,7 +1306,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1495,10 +1495,10 @@
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-    vmtobject.method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_normal_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1528,7 +1528,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_normal_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_normal_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1831,10 +1831,10 @@
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-    vmtobject.method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1864,7 +1864,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2232,7 +2232,7 @@
         failed := false;
 
         Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-        constructor_params_mixed_call_overriden(RESULT_U8BIT,
+        constructor_params_mixed_call_overridden(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2261,7 +2261,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        constructor_params_mixed_call_overriden(value_u8bit,
+        constructor_params_mixed_call_overridden(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2448,7 +2448,7 @@
 
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-        method_virtual_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2478,7 +2478,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_overriden_params_mixed(value_u8bit,
+        method_virtual_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2667,10 +2667,10 @@
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-        method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+        method_normal_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2700,7 +2700,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_normal_call_overriden_params_mixed(value_u8bit,
+        method_normal_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -3003,10 +3003,10 @@
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-        method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -3036,7 +3036,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_call_overriden_params_mixed(value_u8bit,
+        method_virtual_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
Index: fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalcla1.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalcla1.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalcla1.pp	(working copy)
@@ -202,11 +202,11 @@
       bigstring: shortstring; s32: longint; s64: int64);
    procedure method_virtual_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;
-   procedure method_virtual_overriden_params_mixed(u8 :byte; u16: word;
+   procedure method_virtual_overridden_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;abstract;
    procedure method_dynamic_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);dynamic;
-   procedure method_dynamic_overriden_params_mixed(u8 :byte; u16: word;
+   procedure method_dynamic_overridden_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);dynamic;abstract;
    class procedure method_static_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
@@ -218,7 +218,7 @@
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
    procedure method_virtual_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
-   procedure method_virtual_call_overriden_params_mixed(
+   procedure method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
    procedure method_virtual_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
@@ -232,7 +232,7 @@
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);dynamic;
    procedure method_dynamic_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);dynamic;
-   procedure method_dynamic_call_overriden_params_mixed(
+   procedure method_dynamic_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);dynamic;
    procedure method_dynamic_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);dynamic;
@@ -247,7 +247,7 @@
  theritedvmtclass = class(tvmtclass)
    constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word;
+   constructor constructor_params_mixed_call_overridden(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_static(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
@@ -255,9 +255,9 @@
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   procedure method_virtual_overriden_params_mixed(
+   procedure method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);override;
-   procedure method_dynamic_overriden_params_mixed(
+   procedure method_dynamic_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);override;
 
    { normal methods which call other methods }
@@ -265,7 +265,7 @@
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
    procedure method_normal_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
-   procedure method_normal_call_overriden_params_mixed(
+   procedure method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
    procedure method_normal_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
@@ -538,10 +538,10 @@
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure tvmtclass.method_virtual_call_overriden_params_mixed(
+procedure tvmtclass.method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -586,10 +586,10 @@
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure tvmtclass.method_dynamic_call_overriden_params_mixed(
+procedure tvmtclass.method_dynamic_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -637,7 +637,7 @@
    method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-constructor theritedvmtclass.constructor_params_mixed_call_overriden(
+constructor theritedvmtclass.constructor_params_mixed_call_overridden(
    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    inherited create;
@@ -646,7 +646,7 @@
    object_bigstring := '';
    object_s32bit := 0;
    object_s64bit := 0;
-   method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+   method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
 constructor theritedvmtclass.constructor_params_mixed_call_static(
@@ -685,7 +685,7 @@
    inherited constructor_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-procedure theritedvmtclass.method_virtual_overriden_params_mixed(
+procedure theritedvmtclass.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := u8;
@@ -695,7 +695,7 @@
    object_s64bit := s64;
  end;
 
-procedure theritedvmtclass.method_dynamic_overriden_params_mixed(
+procedure theritedvmtclass.method_dynamic_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := u8;
@@ -718,10 +718,10 @@
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure theritedvmtclass.method_normal_call_overriden_params_mixed(
+procedure theritedvmtclass.method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -1167,7 +1167,7 @@
     failed := false;
 
     Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-    vmtclass:=theritedvmtclass.constructor_params_mixed_call_overriden(RESULT_U8BIT,
+    vmtclass:=theritedvmtclass.constructor_params_mixed_call_overridden(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtclass.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1196,7 +1196,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtclass:=theritedvmtclass.constructor_params_mixed_call_overriden(value_u8bit,
+    vmtclass:=theritedvmtclass.constructor_params_mixed_call_overridden(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtclass.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1408,7 +1408,7 @@
 
     vmtclass:=theritedvmtclass.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) dynamic method call...');
-    vmtclass.method_dynamic_overriden_params_mixed(RESULT_U8BIT,
+    vmtclass.method_dynamic_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtclass.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1438,7 +1438,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtclass.method_dynamic_overriden_params_mixed(value_u8bit,
+    vmtclass.method_dynamic_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtclass.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1494,7 +1494,7 @@
 
     vmtclass:=theritedvmtclass.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-    vmtclass.method_virtual_overriden_params_mixed(RESULT_U8BIT,
+    vmtclass.method_virtual_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtclass.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1524,7 +1524,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtclass.method_virtual_overriden_params_mixed(value_u8bit,
+    vmtclass.method_virtual_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtclass.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1713,10 +1713,10 @@
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtclass:=theritedvmtclass.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-    vmtclass.method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtclass.method_normal_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtclass.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1746,7 +1746,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtclass.method_normal_call_overriden_params_mixed(value_u8bit,
+    vmtclass.method_normal_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtclass.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2049,10 +2049,10 @@
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtclass:=theritedvmtclass.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-    vmtclass.method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtclass.method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtclass.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2082,7 +2082,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtclass.method_virtual_call_overriden_params_mixed(value_u8bit,
+    vmtclass.method_virtual_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtclass.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2644,7 +2644,7 @@
     failed := false;
 
     Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-    vmtclass:=theritedvmtclass.constructor_params_mixed_call_overriden(RESULT_U8BIT,
+    vmtclass:=theritedvmtclass.constructor_params_mixed_call_overridden(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2673,7 +2673,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtclass:=theritedvmtclass.constructor_params_mixed_call_overriden(value_u8bit,
+    vmtclass:=theritedvmtclass.constructor_params_mixed_call_overridden(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2885,7 +2885,7 @@
 
     vmtclass:=theritedvmtclass.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) dynamic method call...');
-    method_dynamic_overriden_params_mixed(RESULT_U8BIT,
+    method_dynamic_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2915,7 +2915,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    method_dynamic_overriden_params_mixed(value_u8bit,
+    method_dynamic_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2971,7 +2971,7 @@
 
     vmtclass:=theritedvmtclass.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-    method_virtual_overriden_params_mixed(RESULT_U8BIT,
+    method_virtual_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -3001,7 +3001,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    method_virtual_overriden_params_mixed(value_u8bit,
+    method_virtual_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -3190,10 +3190,10 @@
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtclass:=theritedvmtclass.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-    method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+    method_normal_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -3223,7 +3223,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    method_normal_call_overriden_params_mixed(value_u8bit,
+    method_normal_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -3526,10 +3526,10 @@
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtclass:=theritedvmtclass.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-    method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+    method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -3559,7 +3559,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    method_virtual_call_overriden_params_mixed(value_u8bit,
+    method_virtual_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if object_u8bit <> RESULT_U8BIT then
       failed := true;
Index: fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj3.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj3.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj3.pp	(working copy)
@@ -198,7 +198,7 @@
       bigstring: shortstring; s32: longint; s64: int64);cdecl;
    procedure method_virtual_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;
-   procedure method_virtual_overriden_params_mixed(u8 :byte; u16: word;
+   procedure method_virtual_overridden_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;
    procedure method_static_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);static;cdecl;
@@ -210,7 +210,7 @@
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
    procedure method_virtual_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
-   procedure method_virtual_call_overriden_params_mixed(
+   procedure method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
    procedure method_virtual_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
@@ -225,7 +225,7 @@
  theritedvmtobject = object(tvmtobject)
    constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word;
+   constructor constructor_params_mixed_call_overridden(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_static(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
@@ -233,7 +233,7 @@
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   procedure method_virtual_overriden_params_mixed(
+   procedure method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
 
    { normal methods which call other methods }
@@ -241,7 +241,7 @@
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);cdecl;
    procedure method_normal_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);cdecl;
-   procedure method_normal_call_overriden_params_mixed(
+   procedure method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);cdecl;
    procedure method_normal_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);cdecl;
@@ -460,8 +460,8 @@
    object_s64bit := s64;
  end;
 
-{ this one should be overriden }
-procedure tvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure tvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
     RunError(211);
@@ -501,10 +501,10 @@
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure tvmtobject.method_virtual_call_overriden_params_mixed(
+procedure tvmtobject.method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -545,7 +545,7 @@
    method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-constructor theritedvmtobject.constructor_params_mixed_call_overriden(
+constructor theritedvmtobject.constructor_params_mixed_call_overridden(
    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
@@ -553,7 +553,7 @@
    object_bigstring := '';
    object_s32bit := 0;
    object_s64bit := 0;
-   method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+   method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_static(
@@ -589,8 +589,8 @@
    inherited constructor_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-{ this one should be overriden }
-procedure theritedvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure theritedvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := u8;
@@ -612,10 +612,10 @@
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure theritedvmtobject.method_normal_call_overriden_params_mixed(
+procedure theritedvmtobject.method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);cdecl;
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -1058,7 +1058,7 @@
     failed := false;
 
     Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-    vmtobject.constructor_params_mixed_call_overriden(RESULT_U8BIT,
+    vmtobject.constructor_params_mixed_call_overridden(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1087,7 +1087,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.constructor_params_mixed_call_overriden(value_u8bit,
+    vmtobject.constructor_params_mixed_call_overridden(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1274,7 +1274,7 @@
 
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-    vmtobject.method_virtual_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1304,7 +1304,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1493,10 +1493,10 @@
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-    vmtobject.method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_normal_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1526,7 +1526,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_normal_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_normal_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1829,10 +1829,10 @@
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-    vmtobject.method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1862,7 +1862,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2229,7 +2229,7 @@
         failed := false;
 
         Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-        constructor_params_mixed_call_overriden(RESULT_U8BIT,
+        constructor_params_mixed_call_overridden(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2258,7 +2258,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        constructor_params_mixed_call_overriden(value_u8bit,
+        constructor_params_mixed_call_overridden(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2445,7 +2445,7 @@
 
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-        method_virtual_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2475,7 +2475,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_overriden_params_mixed(value_u8bit,
+        method_virtual_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2664,10 +2664,10 @@
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-        method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+        method_normal_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2697,7 +2697,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_normal_call_overriden_params_mixed(value_u8bit,
+        method_normal_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -3000,10 +3000,10 @@
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-        method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -3033,7 +3033,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_call_overriden_params_mixed(value_u8bit,
+        method_virtual_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
Index: fpcbuild-2.4.0/fpcsrc/tests/test/cg/obj/stdint.h
===================================================================
--- fpcbuild-2.4.0/fpcsrc/tests/test/cg/obj/stdint.h	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/tests/test/cg/obj/stdint.h	(working copy)
@@ -62,7 +62,7 @@
  *       ANSI C standard makes this an impossibility right from the
  *       very get go. Its really only meant to be useful for the vast
  *       majority of platforms that possess the capability of
- *       implementing usefully and precisely defined, standard sized
+ *       implementing usefuly and precisely defined, standard sized
  *       integer scalars.  Systems which are not intrinsically 2s
  *       complement may produce invalid constants.
  *
Index: fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj6.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj6.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj6.pp	(working copy)
@@ -198,7 +198,7 @@
       bigstring: shortstring; s32: longint; s64: int64);register;
    procedure method_virtual_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;register;
-   procedure method_virtual_overriden_params_mixed(u8 :byte; u16: word;
+   procedure method_virtual_overridden_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;register;
    procedure method_static_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);static;register;
@@ -210,7 +210,7 @@
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;register;
    procedure method_virtual_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;register;
-   procedure method_virtual_call_overriden_params_mixed(
+   procedure method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;register;
    procedure method_virtual_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;register;
@@ -225,7 +225,7 @@
  theritedvmtobject = object(tvmtobject)
    constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word;
+   constructor constructor_params_mixed_call_overridden(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_static(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
@@ -233,7 +233,7 @@
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   procedure method_virtual_overriden_params_mixed(
+   procedure method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;register;
 
    { normal methods which call other methods }
@@ -241,7 +241,7 @@
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);register;
    procedure method_normal_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);register;
-   procedure method_normal_call_overriden_params_mixed(
+   procedure method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);register;
    procedure method_normal_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);register;
@@ -460,8 +460,8 @@
    object_s64bit := s64;
  end;
 
-{ this one should be overriden }
-procedure tvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure tvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);register;
  begin
     RunError(211);
@@ -501,10 +501,10 @@
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure tvmtobject.method_virtual_call_overriden_params_mixed(
+procedure tvmtobject.method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);register;
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -545,7 +545,7 @@
    method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-constructor theritedvmtobject.constructor_params_mixed_call_overriden(
+constructor theritedvmtobject.constructor_params_mixed_call_overridden(
    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
@@ -553,7 +553,7 @@
    object_bigstring := '';
    object_s32bit := 0;
    object_s64bit := 0;
-   method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+   method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_static(
@@ -589,8 +589,8 @@
    inherited constructor_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-{ this one should be overriden }
-procedure theritedvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure theritedvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);register;
  begin
    object_u8bit := u8;
@@ -612,10 +612,10 @@
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure theritedvmtobject.method_normal_call_overriden_params_mixed(
+procedure theritedvmtobject.method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);register;
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -1058,7 +1058,7 @@
     failed := false;
 
     Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-    vmtobject.constructor_params_mixed_call_overriden(RESULT_U8BIT,
+    vmtobject.constructor_params_mixed_call_overridden(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1087,7 +1087,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.constructor_params_mixed_call_overriden(value_u8bit,
+    vmtobject.constructor_params_mixed_call_overridden(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1274,7 +1274,7 @@
 
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-    vmtobject.method_virtual_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1304,7 +1304,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1493,10 +1493,10 @@
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-    vmtobject.method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_normal_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1526,7 +1526,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_normal_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_normal_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1829,10 +1829,10 @@
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-    vmtobject.method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1862,7 +1862,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2230,7 +2230,7 @@
         failed := false;
 
         Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-        constructor_params_mixed_call_overriden(RESULT_U8BIT,
+        constructor_params_mixed_call_overridden(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2259,7 +2259,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        constructor_params_mixed_call_overriden(value_u8bit,
+        constructor_params_mixed_call_overridden(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2446,7 +2446,7 @@
 
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-        method_virtual_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2476,7 +2476,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_overriden_params_mixed(value_u8bit,
+        method_virtual_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2665,10 +2665,10 @@
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-        method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+        method_normal_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2698,7 +2698,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_normal_call_overriden_params_mixed(value_u8bit,
+        method_normal_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -3001,10 +3001,10 @@
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-        method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -3034,7 +3034,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_call_overriden_params_mixed(value_u8bit,
+        method_virtual_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
Index: fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj1.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj1.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj1.pp	(working copy)
@@ -198,7 +198,7 @@
       bigstring: shortstring; s32: longint; s64: int64);
    procedure method_virtual_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;
-   procedure method_virtual_overriden_params_mixed(u8 :byte; u16: word;
+   procedure method_virtual_overridden_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;
    procedure method_static_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);static;
@@ -210,7 +210,7 @@
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
    procedure method_virtual_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
-   procedure method_virtual_call_overriden_params_mixed(
+   procedure method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
    procedure method_virtual_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
@@ -225,7 +225,7 @@
  theritedvmtobject = object(tvmtobject)
    constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word;
+   constructor constructor_params_mixed_call_overridden(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_static(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
@@ -233,7 +233,7 @@
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   procedure method_virtual_overriden_params_mixed(
+   procedure method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;
 
    { normal methods which call other methods }
@@ -241,7 +241,7 @@
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
    procedure method_normal_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
-   procedure method_normal_call_overriden_params_mixed(
+   procedure method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
    procedure method_normal_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
@@ -459,8 +459,8 @@
    object_s64bit := s64;
  end;
 
-{ this one should be overriden }
-procedure tvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure tvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
     RunError(211);
@@ -500,10 +500,10 @@
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure tvmtobject.method_virtual_call_overriden_params_mixed(
+procedure tvmtobject.method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -544,7 +544,7 @@
    method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-constructor theritedvmtobject.constructor_params_mixed_call_overriden(
+constructor theritedvmtobject.constructor_params_mixed_call_overridden(
    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
@@ -552,7 +552,7 @@
    object_bigstring := '';
    object_s32bit := 0;
    object_s64bit := 0;
-   method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+   method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_static(
@@ -588,8 +588,8 @@
    inherited constructor_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-{ this one should be overriden }
-procedure theritedvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure theritedvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := u8;
@@ -611,10 +611,10 @@
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure theritedvmtobject.method_normal_call_overriden_params_mixed(
+procedure theritedvmtobject.method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -1057,7 +1057,7 @@
     failed := false;
 
     Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-    vmtobject.constructor_params_mixed_call_overriden(RESULT_U8BIT,
+    vmtobject.constructor_params_mixed_call_overridden(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1086,7 +1086,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.constructor_params_mixed_call_overriden(value_u8bit,
+    vmtobject.constructor_params_mixed_call_overridden(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1273,7 +1273,7 @@
 
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-    vmtobject.method_virtual_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1303,7 +1303,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1492,10 +1492,10 @@
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-    vmtobject.method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_normal_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1525,7 +1525,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_normal_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_normal_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1828,10 +1828,10 @@
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-    vmtobject.method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1861,7 +1861,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2227,7 +2227,7 @@
         failed := false;
 
         Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-        constructor_params_mixed_call_overriden(RESULT_U8BIT,
+        constructor_params_mixed_call_overridden(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2256,7 +2256,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        constructor_params_mixed_call_overriden(value_u8bit,
+        constructor_params_mixed_call_overridden(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2443,7 +2443,7 @@
 
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-        method_virtual_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2473,7 +2473,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_overriden_params_mixed(value_u8bit,
+        method_virtual_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2662,10 +2662,10 @@
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-        method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+        method_normal_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2695,7 +2695,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_normal_call_overriden_params_mixed(value_u8bit,
+        method_normal_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2998,10 +2998,10 @@
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-        method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -3031,7 +3031,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_call_overriden_params_mixed(value_u8bit,
+        method_virtual_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
Index: fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj4.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj4.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj4.pp	(working copy)
@@ -200,7 +200,7 @@
       bigstring: shortstring; s32: longint; s64: int64);oldfpccall;
    procedure method_virtual_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;oldfpccall;
-   procedure method_virtual_overriden_params_mixed(u8 :byte; u16: word;
+   procedure method_virtual_overridden_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;oldfpccall;
    procedure method_static_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);static;oldfpccall;
@@ -212,7 +212,7 @@
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;oldfpccall;
    procedure method_virtual_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;oldfpccall;
-   procedure method_virtual_call_overriden_params_mixed(
+   procedure method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;oldfpccall;
    procedure method_virtual_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;oldfpccall;
@@ -227,7 +227,7 @@
  theritedvmtobject = object(tvmtobject)
    constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word;
+   constructor constructor_params_mixed_call_overridden(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_static(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
@@ -235,7 +235,7 @@
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   procedure method_virtual_overriden_params_mixed(
+   procedure method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;oldfpccall;
 
    { normal methods which call other methods }
@@ -243,7 +243,7 @@
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);oldfpccall;
    procedure method_normal_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);oldfpccall;
-   procedure method_normal_call_overriden_params_mixed(
+   procedure method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);oldfpccall;
    procedure method_normal_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);oldfpccall;
@@ -462,8 +462,8 @@
    object_s64bit := s64;
  end;
 
-{ this one should be overriden }
-procedure tvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure tvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);oldfpccall;
  begin
     RunError(211);
@@ -503,10 +503,10 @@
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure tvmtobject.method_virtual_call_overriden_params_mixed(
+procedure tvmtobject.method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);oldfpccall;
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -547,7 +547,7 @@
    method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-constructor theritedvmtobject.constructor_params_mixed_call_overriden(
+constructor theritedvmtobject.constructor_params_mixed_call_overridden(
    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
@@ -555,7 +555,7 @@
    object_bigstring := '';
    object_s32bit := 0;
    object_s64bit := 0;
-   method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+   method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_static(
@@ -591,8 +591,8 @@
    inherited constructor_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-{ this one should be overriden }
-procedure theritedvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure theritedvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);oldfpccall;
  begin
    object_u8bit := u8;
@@ -614,10 +614,10 @@
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure theritedvmtobject.method_normal_call_overriden_params_mixed(
+procedure theritedvmtobject.method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);oldfpccall;
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -1060,7 +1060,7 @@
     failed := false;
 
     Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-    vmtobject.constructor_params_mixed_call_overriden(RESULT_U8BIT,
+    vmtobject.constructor_params_mixed_call_overridden(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1089,7 +1089,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.constructor_params_mixed_call_overriden(value_u8bit,
+    vmtobject.constructor_params_mixed_call_overridden(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1276,7 +1276,7 @@
 
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-    vmtobject.method_virtual_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1306,7 +1306,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1495,10 +1495,10 @@
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-    vmtobject.method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_normal_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1528,7 +1528,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_normal_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_normal_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1831,10 +1831,10 @@
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-    vmtobject.method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1864,7 +1864,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2231,7 +2231,7 @@
         failed := false;
 
         Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-        constructor_params_mixed_call_overriden(RESULT_U8BIT,
+        constructor_params_mixed_call_overridden(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2260,7 +2260,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        constructor_params_mixed_call_overriden(value_u8bit,
+        constructor_params_mixed_call_overridden(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2447,7 +2447,7 @@
 
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-        method_virtual_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2477,7 +2477,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_overriden_params_mixed(value_u8bit,
+        method_virtual_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2666,10 +2666,10 @@
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-        method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+        method_normal_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2699,7 +2699,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_normal_call_overriden_params_mixed(value_u8bit,
+        method_normal_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -3002,10 +3002,10 @@
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-        method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -3035,7 +3035,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_call_overriden_params_mixed(value_u8bit,
+        method_virtual_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
Index: fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj7.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj7.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj7.pp	(working copy)
@@ -198,7 +198,7 @@
       bigstring: shortstring; s32: longint; s64: int64);stdcall;
    procedure method_virtual_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;stdcall;
-   procedure method_virtual_overriden_params_mixed(u8 :byte; u16: word;
+   procedure method_virtual_overridden_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;stdcall;
    procedure method_static_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);static;stdcall;
@@ -210,7 +210,7 @@
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;stdcall;
    procedure method_virtual_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;stdcall;
-   procedure method_virtual_call_overriden_params_mixed(
+   procedure method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;stdcall;
    procedure method_virtual_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;stdcall;
@@ -225,7 +225,7 @@
  theritedvmtobject = object(tvmtobject)
    constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word;
+   constructor constructor_params_mixed_call_overridden(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_static(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
@@ -233,7 +233,7 @@
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   procedure method_virtual_overriden_params_mixed(
+   procedure method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;stdcall;
 
    { normal methods which call other methods }
@@ -241,7 +241,7 @@
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall;
    procedure method_normal_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall;
-   procedure method_normal_call_overriden_params_mixed(
+   procedure method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall;
    procedure method_normal_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall;
@@ -460,8 +460,8 @@
    object_s64bit := s64;
  end;
 
-{ this one should be overriden }
-procedure tvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure tvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall;
  begin
     RunError(211);
@@ -501,10 +501,10 @@
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure tvmtobject.method_virtual_call_overriden_params_mixed(
+procedure tvmtobject.method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall;
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -545,7 +545,7 @@
    method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-constructor theritedvmtobject.constructor_params_mixed_call_overriden(
+constructor theritedvmtobject.constructor_params_mixed_call_overridden(
    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
@@ -553,7 +553,7 @@
    object_bigstring := '';
    object_s32bit := 0;
    object_s64bit := 0;
-   method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+   method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_static(
@@ -589,8 +589,8 @@
    inherited constructor_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-{ this one should be overriden }
-procedure theritedvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure theritedvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall;
  begin
    object_u8bit := u8;
@@ -612,10 +612,10 @@
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure theritedvmtobject.method_normal_call_overriden_params_mixed(
+procedure theritedvmtobject.method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);stdcall;
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -1058,7 +1058,7 @@
     failed := false;
 
     Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-    vmtobject.constructor_params_mixed_call_overriden(RESULT_U8BIT,
+    vmtobject.constructor_params_mixed_call_overridden(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1087,7 +1087,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.constructor_params_mixed_call_overriden(value_u8bit,
+    vmtobject.constructor_params_mixed_call_overridden(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1274,7 +1274,7 @@
 
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-    vmtobject.method_virtual_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1304,7 +1304,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1493,10 +1493,10 @@
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-    vmtobject.method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_normal_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1526,7 +1526,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_normal_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_normal_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1829,10 +1829,10 @@
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-    vmtobject.method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1862,7 +1862,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2230,7 +2230,7 @@
         failed := false;
 
         Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-        constructor_params_mixed_call_overriden(RESULT_U8BIT,
+        constructor_params_mixed_call_overridden(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2259,7 +2259,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        constructor_params_mixed_call_overriden(value_u8bit,
+        constructor_params_mixed_call_overridden(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2446,7 +2446,7 @@
 
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-        method_virtual_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2476,7 +2476,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_overriden_params_mixed(value_u8bit,
+        method_virtual_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2665,10 +2665,10 @@
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-        method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+        method_normal_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2698,7 +2698,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_normal_call_overriden_params_mixed(value_u8bit,
+        method_normal_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -3001,10 +3001,10 @@
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-        method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -3034,7 +3034,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_call_overriden_params_mixed(value_u8bit,
+        method_virtual_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
Index: fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj2.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj2.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/tests/test/cg/tcalobj2.pp	(working copy)
@@ -198,7 +198,7 @@
       bigstring: shortstring; s32: longint; s64: int64);pascal;
    procedure method_virtual_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;pascal;
-   procedure method_virtual_overriden_params_mixed(u8 :byte; u16: word;
+   procedure method_virtual_overridden_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);virtual;pascal;
    procedure method_static_params_mixed(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);static;pascal;
@@ -210,7 +210,7 @@
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;pascal;
    procedure method_virtual_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;pascal;
-   procedure method_virtual_call_overriden_params_mixed(
+   procedure method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;pascal;
    procedure method_virtual_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;pascal;
@@ -225,7 +225,7 @@
  theritedvmtobject = object(tvmtobject)
    constructor constructor_params_mixed_call_virtual(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   constructor constructor_params_mixed_call_overriden(u8 :byte; u16: word;
+   constructor constructor_params_mixed_call_overridden(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_static(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
@@ -233,7 +233,7 @@
       bigstring: shortstring; s32: longint; s64: int64);
    constructor constructor_params_mixed_call_inherited(u8 :byte; u16: word;
       bigstring: shortstring; s32: longint; s64: int64);
-   procedure method_virtual_overriden_params_mixed(
+   procedure method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);virtual;pascal;
 
    { normal methods which call other methods }
@@ -241,7 +241,7 @@
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);pascal;
    procedure method_normal_call_virtual_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);pascal;
-   procedure method_normal_call_overriden_params_mixed(
+   procedure method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);pascal;
    procedure method_normal_call_normal_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);pascal;
@@ -460,8 +460,8 @@
    object_s64bit := s64;
  end;
 
-{ this one should be overriden }
-procedure tvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure tvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);pascal;
  begin
     RunError(211);
@@ -501,10 +501,10 @@
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure tvmtobject.method_virtual_call_overriden_params_mixed(
+procedure tvmtobject.method_virtual_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);pascal;
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -545,7 +545,7 @@
    method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-constructor theritedvmtobject.constructor_params_mixed_call_overriden(
+constructor theritedvmtobject.constructor_params_mixed_call_overridden(
    u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);
  begin
    object_u8bit := 0;
@@ -553,7 +553,7 @@
    object_bigstring := '';
    object_s32bit := 0;
    object_s64bit := 0;
-   method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+   method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
 constructor theritedvmtobject.constructor_params_mixed_call_static(
@@ -589,8 +589,8 @@
    inherited constructor_params_mixed(u8, u16, bigstring, s32, s64);
  end;
 
-{ this one should be overriden }
-procedure theritedvmtobject.method_virtual_overriden_params_mixed(
+{ this one should be overridden }
+procedure theritedvmtobject.method_virtual_overridden_params_mixed(
     u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);pascal;
  begin
    object_u8bit := u8;
@@ -612,10 +612,10 @@
     method_virtual_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
-procedure theritedvmtobject.method_normal_call_overriden_params_mixed(
+procedure theritedvmtobject.method_normal_call_overridden_params_mixed(
       u8 :byte; u16: word; bigstring: shortstring; s32: longint; s64: int64);pascal;
    begin
-    method_virtual_overriden_params_mixed(u8, u16, bigstring, s32, s64);
+    method_virtual_overridden_params_mixed(u8, u16, bigstring, s32, s64);
    end;
 
 
@@ -1058,7 +1058,7 @@
     failed := false;
 
     Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-    vmtobject.constructor_params_mixed_call_overriden(RESULT_U8BIT,
+    vmtobject.constructor_params_mixed_call_overridden(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1087,7 +1087,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.constructor_params_mixed_call_overriden(value_u8bit,
+    vmtobject.constructor_params_mixed_call_overridden(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1274,7 +1274,7 @@
 
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-    vmtobject.method_virtual_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1304,7 +1304,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1493,10 +1493,10 @@
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-    vmtobject.method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_normal_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1526,7 +1526,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_normal_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_normal_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1829,10 +1829,10 @@
     else
       Writeln('Passed!');
 
-    { The virtual method has been overriden by the object in this case }
+    { The virtual method has been overridden by the object in this case }
     vmtobject.constructor_init;
     Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-    vmtobject.method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+    vmtobject.method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
        RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -1862,7 +1862,7 @@
     value_bigstring := RESULT_BIGSTRING;
     value_s32bit := RESULT_S32BIT;
     value_s64bit := RESULT_S64BIT;
-    vmtobject.method_virtual_call_overriden_params_mixed(value_u8bit,
+    vmtobject.method_virtual_call_overridden_params_mixed(value_u8bit,
        value_u16bit, value_bigstring, value_s32bit, value_s64bit);
     if vmtobject.object_u8bit <> RESULT_U8BIT then
       failed := true;
@@ -2230,7 +2230,7 @@
         failed := false;
 
         Write('Testing mixed parameter (LOC_CONSTANT) constructor call w/virtual call...');
-        constructor_params_mixed_call_overriden(RESULT_U8BIT,
+        constructor_params_mixed_call_overridden(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2259,7 +2259,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        constructor_params_mixed_call_overriden(value_u8bit,
+        constructor_params_mixed_call_overridden(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2446,7 +2446,7 @@
 
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual method call...');
-        method_virtual_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2476,7 +2476,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_overriden_params_mixed(value_u8bit,
+        method_virtual_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2665,10 +2665,10 @@
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) method call w/virtual call...');
-        method_normal_call_overriden_params_mixed(RESULT_U8BIT,
+        method_normal_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -2698,7 +2698,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_normal_call_overriden_params_mixed(value_u8bit,
+        method_normal_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -3001,10 +3001,10 @@
         else
           Writeln('Passed!');
 
-        { The virtual method has been overriden by the object in this case }
+        { The virtual method has been overridden by the object in this case }
         constructor_init;
         Write('Testing mixed parameter (LOC_CONSTANT) virtual call w/virtual call...');
-        method_virtual_call_overriden_params_mixed(RESULT_U8BIT,
+        method_virtual_call_overridden_params_mixed(RESULT_U8BIT,
            RESULT_U16BIT, RESULT_BIGSTRING, RESULT_S32BIT, RESULT_S64BIT);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
@@ -3034,7 +3034,7 @@
         value_bigstring := RESULT_BIGSTRING;
         value_s32bit := RESULT_S32BIT;
         value_s64bit := RESULT_S64BIT;
-        method_virtual_call_overriden_params_mixed(value_u8bit,
+        method_virtual_call_overridden_params_mixed(value_u8bit,
            value_u16bit, value_bigstring, value_s32bit, value_s64bit);
         if object_u8bit <> RESULT_U8BIT then
           failed := true;
Index: fpcbuild-2.4.0/fpcsrc/tests/test/twide3.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/tests/test/twide3.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/tests/test/twide3.pp	(working copy)
@@ -1,5 +1,5 @@
 { %skiptarget=win32,win64,wince }
-{ This test is only usefull if the local codepage is utf-8 which
+{ This test is only useful if the local codepage is utf-8 which
   usually not the case on windows
 }
 {$codepage utf-8}
Index: fpcbuild-2.4.0/fpcsrc/tests/tbs/tb0271.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/tests/tbs/tb0271.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/tests/tbs/tb0271.pp	(working copy)
@@ -2,7 +2,7 @@
 
 { Old file: tbs0317.pp }
 
-{ This shouldn't give a warning, because it can be used in an other program }
+{ This shouldn't give a warning, because it can be used in another program }
 var
   exportedc : longint;cvar;public;
 begin
Index: fpcbuild-2.4.0/fpcsrc/tests/readme.txt
===================================================================
--- fpcbuild-2.4.0/fpcsrc/tests/readme.txt	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/tests/readme.txt	(working copy)
@@ -102,7 +102,7 @@
 Calling "make full" will perform tests in a standard manner. To have
 more control of the test process one must distinguish between:
 
-* Driver enviroment: compiler/rtl etc. to be used by the tools which
+* Driver environment: compiler/rtl etc. to be used by the tools which
   runs and analyze the tests. All normal options to make, like FPC
   OS_TARGET, OPT etc. controls this.
 
@@ -122,7 +122,7 @@
 TEST_FPC_VERSION       defaults to version of TEST_FPC
 TEST_CCOMPILER         defaults to installed gcc compiler, but only
                        if driver and test full-targets are the same.
-TEST_VERBOSE           let dotest be more verbose, only usefull for debugging
+TEST_VERBOSE           let dotest be more verbose, only useful for debugging
 TEST_DELTEMP           delete temporary executable/object/ppu file,
                        default is off
 TEST_TIMEOUT           use timeout wrapper for (remote) execution
@@ -159,7 +159,7 @@
 TEST_DELTEMP         delete executable after running, so the remote system
                      doesn't need much free disk space
 TEST_REMOTEPW        pass a password with -pw to remote tools,
-                     mainly usefull for putty
+                     mainly useful for putty
 
 
 Examples:
Index: fpcbuild-2.4.0/fpcsrc/compiler/msgtxt.inc
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/msgtxt.inc	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/msgtxt.inc	(working copy)
@@ -758,7 +758,7 @@
   '10007_U_PPU Invalid Header (no PPU at the begin)'#000+
   '10008_U_','PPU Invalid Version $1'#000+
   '10009_U_PPU is compiled for another processor'#000+
-  '10010_U_PPU is compiled for an other target'#000+
+  '10010_U_PPU is compiled for another target'#000+
   '10011_U_PPU Source: $1'#000+
   '10012_U_Writing $1'#000+
   '10013_F_Can'#039't Write PPU-File'#000+
Index: fpcbuild-2.4.0/fpcsrc/compiler/nld.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/nld.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/nld.pas	(working copy)
@@ -639,7 +639,7 @@
 
          { Optimize the reuse of the destination of the assingment in left.
            Allow the use of the left inside the tree generated on the right.
-           This is especially usefull for string routines where the destination
+           This is especially useful for string routines where the destination
            is pushed as a parameter. Using the final destination of left directly
            save a temp allocation and copy of data (PFV) }
          oldassignmentnode:=aktassignmentnode;
Index: fpcbuild-2.4.0/fpcsrc/compiler/dbgdwarf.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/dbgdwarf.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/dbgdwarf.pas	(working copy)
@@ -669,7 +669,7 @@
 
     procedure TDebugInfoDwarf.set_def_dwarf_labs(def:tdef);
       begin
-        { Keep track of used dwarf entries, this info is only usefull for dwarf entries
+        { Keep track of used dwarf entries, this info is only useful for dwarf entries
           referenced by the symbols. Definitions will always include all
           required stabs }
         if def.dbg_state=dbg_state_unused then
Index: fpcbuild-2.4.0/fpcsrc/compiler/i386/daopt386.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/i386/daopt386.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/i386/daopt386.pas	(working copy)
@@ -41,7 +41,7 @@
   con_ref = 1;
   con_const = 2;
   { The contents aren't usable anymore for CSE, but they may still be   }
-  { usefull for detecting whether the result of a load is actually used }
+  { useful for detecting whether the result of a load is actually used }
   con_invalid = 3;
   { the reverse of the above (in case a (conditional) jump is encountered): }
   { CSE is still possible, but the original instruction can't be removed    }
Index: fpcbuild-2.4.0/fpcsrc/compiler/ninl.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/ninl.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/ninl.pas	(working copy)
@@ -47,7 +47,7 @@
 
           { All the following routines currently
             call compilerprocs, unless they are
-            overriden in which case, the code
+            overridden in which case, the code
             generator handles them.
           }
           function first_pi: tnode ; virtual;
Index: fpcbuild-2.4.0/fpcsrc/compiler/browcol.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/browcol.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/browcol.pas	(working copy)
@@ -1486,7 +1486,7 @@
   procedure ProcessDefIfStruct(definition: tdef);
   begin
     { still led to infinite recursions
-      only usefull for unamed types PM }
+      only useful for unamed types PM }
     if assigned(definition) and not assigned(definition.typesym) then
     begin
       case definition.typ of
Index: fpcbuild-2.4.0/fpcsrc/compiler/fppu.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/fppu.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/fppu.pas	(working copy)
@@ -1062,7 +1062,7 @@
          writeusedunit(true);
 
          { write the objectfiles and libraries that come for this unit,
-           preserve the containers becuase they are still needed to load
+           preserve the containers because they are still needed to load
            the link.res.
             All doesn't depend on the crc! It doesn't matter
            if a unit is in a .o or .a file }
@@ -1140,7 +1140,7 @@
          { write whole program optimisation-related information }
          tunitwpoinfo(wpoinfo).ppuwrite(ppufile);
 
-         { the last entry ibend is written automaticly }
+         { the last entry ibend is written automatically }
 
          { flush to be sure }
          ppufile.flush;
Index: fpcbuild-2.4.0/fpcsrc/compiler/aasmdata.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/aasmdata.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/aasmdata.pas	(working copy)
@@ -21,7 +21,7 @@
 }
 { @abstract(This unit implements an abstract asm output class for all processor types)
   This unit implements an abstract assembler output class for all processors, these
-  are then overriden for each assembler writer to actually write the data in these
+  are then overridden for each assembler writer to actually write the data in these
   classes to an assembler file.
 }
 
Index: fpcbuild-2.4.0/fpcsrc/compiler/aggas.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/aggas.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/aggas.pas	(working copy)
@@ -67,7 +67,7 @@
 
       {# This is the base class for writing instructions.
 
-         The WriteInstruction() method must be overriden
+         The WriteInstruction() method must be overridden
          to write a single instruction to the assembler
          file.
       }
Index: fpcbuild-2.4.0/fpcsrc/compiler/pmodules.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/pmodules.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/pmodules.pas	(working copy)
@@ -1526,7 +1526,7 @@
       { read all entries until the end and write them also to the new ppu }
         repeat
           b:=inppu.readentry;
-        { don't write ibend, that's written automaticly }
+        { don't write ibend, that's written automatically }
           if b<>ibend then
            begin
              if b=iblinkothersharedlibs then
Index: fpcbuild-2.4.0/fpcsrc/compiler/pexpr.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/pexpr.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/pexpr.pas	(working copy)
@@ -1007,7 +1007,7 @@
            hpropsym : tpropertysym;
          begin
            result:=false;
-           { find property in the overriden list }
+           { find property in the overridden list }
            hpropsym:=propsym;
            repeat
              propaccesslist:=hpropsym.propaccesslist[pap];
@@ -1016,7 +1016,7 @@
                  result:=true;
                  exit;
                end;
-             hpropsym:=hpropsym.overridenpropsym;
+             hpropsym:=hpropsym.overriddenpropsym;
            until not assigned(hpropsym);
          end;
 
Index: fpcbuild-2.4.0/fpcsrc/compiler/ncgrtti.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/ncgrtti.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/ncgrtti.pas	(working copy)
@@ -250,7 +250,7 @@
              propaccesslist:=hpropsym.propaccesslist[pap];
              if not propaccesslist.empty then
                break;
-             hpropsym:=hpropsym.overridenpropsym;
+             hpropsym:=hpropsym.overriddenpropsym;
            until not assigned(hpropsym);
            if not(assigned(propaccesslist) and assigned(propaccesslist.firstsym))  then
              begin
Index: fpcbuild-2.4.0/fpcsrc/compiler/globals.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/globals.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/globals.pas	(working copy)
@@ -1425,7 +1425,7 @@
         RelocSection:=false;
         RelocSectionSetExplicitly:=false;
         LinkTypeSetExplicitly:=false;
-        { memory sizes, will be overriden by parameter or default for target
+        { memory sizes, will be overridden by parameter or default for target
           in options or init_parser }
         stacksize:=0;
         { not initialized yet }
Index: fpcbuild-2.4.0/fpcsrc/compiler/cgobj.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/cgobj.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/cgobj.pas	(working copy)
@@ -49,7 +49,7 @@
        {# @abstract(Abstract code generator)
           This class implements an abstract instruction generator. Some of
           the methods of this class are generic, while others must
-          be overriden for all new processors which will be supported
+          be overridden for all new processors which will be supported
           by Free Pascal. For 32-bit processors, the base class
           sould be @link(tcg64f32) and not @var(tcg).
        }
@@ -120,7 +120,7 @@
 
              This routine should push/send the parameter to the routine, as
              required by the specific processor ABI and routine modifiers.
-             This must be overriden for each CPU target.
+             This must be overridden for each CPU target.
 
              @param(size size of the operand in the register)
              @param(r register source of the operand)
@@ -130,7 +130,7 @@
           {# Pass a parameter, which is a constant, to a routine.
 
              A generic version is provided. This routine should
-             be overriden for optimization purposes if the cpu
+             be overridden for optimization purposes if the cpu
              permits directly sending this type of parameter.
 
              @param(size size of the operand in constant)
@@ -141,7 +141,7 @@
           {# Pass the value of a parameter, which is located in memory, to a routine.
 
              A generic version is provided. This routine should
-             be overriden for optimization purposes if the cpu
+             be overridden for optimization purposes if the cpu
              permits directly sending this type of parameter.
 
              @param(size size of the operand in constant)
@@ -164,7 +164,7 @@
              calculated address as a parameter.
 
              A generic version is provided. This routine should
-             be overriden for optimization purposes if the cpu
+             be overridden for optimization purposes if the cpu
              permits directly sending this type of parameter.
 
              @param(r reference to get address from)
@@ -190,7 +190,7 @@
           }
 
           {# Emits instruction to call the method specified by symbol name.
-             This routine must be overriden for each new target cpu.
+             This routine must be overridden for each new target cpu.
 
              There is no a_call_ref because loading the reference will use
              a temp register on most cpu's resulting in conflicts with the
@@ -199,7 +199,7 @@
           procedure a_call_name(list : TAsmList;const s : string; weak: boolean);virtual; abstract;
           procedure a_call_reg(list : TAsmList;reg : tregister);virtual; abstract;
           procedure a_call_ref(list : TAsmList;ref : treference);virtual; abstract;
-          { same as a_call_name, might be overriden on certain architectures to emit
+          { same as a_call_name, might be overridden on certain architectures to emit
             static calls without usage of a got trampoline }
           procedure a_call_name_static(list : TAsmList;const s : string);virtual;
 
@@ -382,7 +382,7 @@
           {# This should emit the opcode to copy len bytes from the source
              to destination.
 
-             It must be overriden for each new target processor.
+             It must be overridden for each new target processor.
 
              @param(source Source reference of copy)
              @param(dest Destination reference of copy)
@@ -392,7 +392,7 @@
           {# This should emit the opcode to copy len bytes from the an unaligned source
              to destination.
 
-             It must be overriden for each new target processor.
+             It must be overridden for each new target processor.
 
              @param(source Source reference of copy)
              @param(dest Destination reference of copy)
@@ -415,7 +415,7 @@
           procedure g_finalize(list : TAsmList;t : tdef;const ref : treference);
 
           {# Generates range checking code. It is to note
-             that this routine does not need to be overriden,
+             that this routine does not need to be overridden,
              as it takes care of everything.
 
              @param(p Node which contains the value to check)
@@ -432,7 +432,7 @@
 
           {# Emits instructions when compilation is done in profile
              mode (this is set as a command line option). The default
-             behavior does nothing, should be overriden as required.
+             behavior does nothing, should be overridden as required.
           }
           procedure g_profilecode(list : TAsmList);virtual;
           {# Emits instruction for allocating @var(size) bytes at the stackpointer
Index: fpcbuild-2.4.0/fpcsrc/compiler/assemble.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/assemble.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/assemble.pas	(working copy)
@@ -60,7 +60,7 @@
         procedure MakeObject;virtual;abstract;
       end;
 
-      {# This is the base class which should be overriden for each each
+      {# This is the base class which should be overridden for each each
          assembler writer. It is used to actually assembler a file,
          and write the output to the assembler file.
       }
@@ -115,11 +115,11 @@
         procedure AsmCreate(Aplace:tcutplace);
         procedure AsmClose;
 
-        {# This routine should be overriden for each assembler, it is used
+        {# This routine should be overridden for each assembler, it is used
            to actually write the abstract assembler stream to file.}
         procedure WriteTree(p:TAsmList);virtual;
 
-        {# This routine should be overriden for each assembler, it is used
+        {# This routine should be overridden for each assembler, it is used
            to actually write all the different abstract assembler streams
            by calling for each stream type, the @var(WriteTree) method.}
         procedure WriteAsmList;virtual;
Index: fpcbuild-2.4.0/fpcsrc/compiler/rgobj.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/rgobj.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/rgobj.pas	(working copy)
@@ -120,7 +120,7 @@
       code generator to allocate and free registers which might be valid
       across nodes. It also contains utility routines related to registers.
 
-      Some of the methods in this class should be overriden
+      Some of the methods in this class should be overridden
       by cpu-specific implementations.
 
       --------------------------------------------------------------------}
@@ -160,7 +160,7 @@
         { default subregister used }
         defaultsub        : tsubregister;
         live_registers:Tsuperregisterworklist;
-        { can be overriden to add cpu specific interferences }
+        { can be overridden to add cpu specific interferences }
         procedure add_cpu_interferences(p : tai);virtual;
         procedure add_constraints(reg:Tregister);virtual;
         function  get_alias(n:Tsuperregister):Tsuperregister;
@@ -1947,7 +1947,7 @@
           exit;
 
 {$ifdef x86}
-        { Try replacing the register with the spilltemp. This is usefull only
+        { Try replacing the register with the spilltemp. This is useful only
           for the i386,x86_64 that support memory locations for several instructions }
         for counter := 0 to pred(regindex) do
           with regs[counter] do
Index: fpcbuild-2.4.0/fpcsrc/compiler/cfileutl.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/cfileutl.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/cfileutl.pas	(working copy)
@@ -651,7 +651,7 @@
                exit;
              end;
           end;
-        { Set foundfile to something usefull }
+        { Set foundfile to something useful }
         FoundFile:=fn;
       end;
 
Index: fpcbuild-2.4.0/fpcsrc/compiler/ncgmat.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/ncgmat.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/ncgmat.pas	(working copy)
@@ -35,7 +35,7 @@
            floating point value in the floating point
            register r.
 
-           This routine should be overriden, since
+           This routine should be overridden, since
            the generic version is not optimal at all. The
            generic version assumes that floating
            point values are stored in the register
@@ -277,7 +277,7 @@
     procedure tcgmoddivnode.emit64_div_reg_reg(signed: boolean; denum,num:tregister64);
       begin
         { handled in pass_1 already, unless pass_1 is
-          overriden
+          overridden
         }
         { should be handled in pass_1 (JM) }
         internalerror(200109052);
Index: fpcbuild-2.4.0/fpcsrc/compiler/ncal.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/ncal.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/ncal.pas	(working copy)
@@ -1868,7 +1868,7 @@
             (tabstractvarsym(tloadnode(realassignmenttarget).symtableentry).varregable in [vr_none,vr_addr])
            ) then
           begin
-            { If the funcret is also used as a parameter we can't optimize becuase the funcret
+            { If the funcret is also used as a parameter we can't optimize because the funcret
               and the parameter will point to the same address. That means that a change of the result variable
               will result also in a change of the parameter value }
             result:=not foreachnodestatic(left,@check_funcret_used_as_para,tloadnode(realassignmenttarget).symtableentry);
@@ -2074,7 +2074,7 @@
         end;
         { now all parents are in the correct order
           insert all abstract methods in the list, and remove
-          those which are overriden by parent classes.
+          those which are overridden by parent classes.
         }
         objectinfo:=tobjectinfoitem(parents.first);
         while assigned(objectinfo) do
Index: fpcbuild-2.4.0/fpcsrc/compiler/aasmtai.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/aasmtai.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/aasmtai.pas	(working copy)
@@ -21,7 +21,7 @@
 }
 { @abstract(This unit implements an abstract asm output class for all processor types)
   This unit implements an abstract assembler output class for all processors, these
-  are then overriden for each assembler writer to actually write the data in these
+  are then overridden for each assembler writer to actually write the data in these
   classes to an assembler file.
 }
 
@@ -2111,7 +2111,7 @@
 
     function tai_cpu_abstract.is_same_reg_move(regtype: Tregistertype):boolean;
       begin
-        { When the generic RA is used this needs to be overriden, we don't use
+        { When the generic RA is used this needs to be overridden, we don't use
           virtual;abstract; to prevent a lot of warnings of unimplemented abstract methods
           when tai_cpu is created (PFV) }
         internalerror(200404091);
Index: fpcbuild-2.4.0/fpcsrc/compiler/symtable.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/symtable.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/symtable.pas	(working copy)
@@ -1205,7 +1205,7 @@
             exit;
           end;
 
-        { check also parasymtable, this needs to be done here becuase
+        { check also parasymtable, this needs to be done here because
           of the special situation with the funcret sym that needs to be
           hidden for tp and delphi modes }
         hsym:=tsym(tabstractprocdef(defowner).parast.FindWithHash(hashedid));
Index: fpcbuild-2.4.0/fpcsrc/compiler/symsym.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/symsym.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/symsym.pas	(working copy)
@@ -220,8 +220,8 @@
 
        tpropertysym = class(Tstoredsym)
           propoptions   : tpropertyoptions;
-          overridenpropsym : tpropertysym;
-          overridenpropsymderef : tderef;
+          overriddenpropsym : tpropertysym;
+          overriddenpropsymderef : tderef;
           propdef       : tdef;
           propdefderef  : tderef;
           indexdef      : tdef;
@@ -786,7 +786,7 @@
       begin
          inherited ppuload(propertysym,ppufile);
          ppufile.getsmallset(propoptions);
-         ppufile.getderef(overridenpropsymderef);
+         ppufile.getderef(overriddenpropsymderef);
          ppufile.getderef(propdefderef);
          index:=ppufile.getlongint;
          default:=ppufile.getlongint;
@@ -810,7 +810,7 @@
       var
         pap : tpropaccesslisttypes;
       begin
-        overridenpropsymderef.build(overridenpropsym);
+        overriddenpropsymderef.build(overriddenpropsym);
         propdefderef.build(propdef);
         indexdefderef.build(indexdef);
         for pap:=low(tpropaccesslisttypes) to high(tpropaccesslisttypes) do
@@ -822,7 +822,7 @@
       var
         pap : tpropaccesslisttypes;
       begin
-        overridenpropsym:=tpropertysym(overridenpropsymderef.resolve);
+        overriddenpropsym:=tpropertysym(overriddenpropsymderef.resolve);
         indexdef:=tdef(indexdefderef.resolve);
         propdef:=tdef(propdefderef.resolve);
         for pap:=low(tpropaccesslisttypes) to high(tpropaccesslisttypes) do
@@ -842,7 +842,7 @@
       begin
         inherited ppuwrite(ppufile);
         ppufile.putsmallset(propoptions);
-        ppufile.putderef(overridenpropsymderef);
+        ppufile.putderef(overriddenpropsymderef);
         ppufile.putderef(propdefderef);
         ppufile.putlongint(index);
         ppufile.putlongint(default);
Index: fpcbuild-2.4.0/fpcsrc/compiler/ncgutil.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/ncgutil.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/ncgutil.pas	(working copy)
@@ -1405,7 +1405,7 @@
 
             { Here, we return the function result. In most architectures, the value is
               passed into the FUNCTION_RETURN_REG, but in a windowed architecure like sparc a
-              function returns in a register and the caller receives it in an other one }
+              function returns in a register and the caller receives it in another one }
             case funcretloc.loc of
               LOC_REGISTER:
                 begin
@@ -2379,7 +2379,7 @@
                     LOC_REFERENCE instead for all none register variables. This is
                     required because we can't store an asmsymbol in the localloc because
                     the asmsymbol is invalid after an unit is compiled. This gives
-                    problems when this procedure is inlined in an other unit (PFV) }
+                    problems when this procedure is inlined in another unit (PFV) }
                   if vs.is_regvar(false) then
                     begin
                       vs.initialloc.loc:=tvarregable2tcgloc[vs.varregable];
Index: fpcbuild-2.4.0/fpcsrc/compiler/ncgbas.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/ncgbas.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/ncgbas.pas	(working copy)
@@ -246,7 +246,7 @@
                   ait_instruction :
                      begin
                        { remove cached insentry, because the new code can
-                         require an other less optimized instruction }
+                         require another less optimized instruction }
 {$ifdef i386}
 {$ifndef NOAG386BIN}
                        taicpu(hp2).ResetPass1;
@@ -291,7 +291,7 @@
                   ait_instruction :
                      begin
                        { remove cached insentry, because the new code can
-                         require an other less optimized instruction }
+                         require another less optimized instruction }
 {$ifdef i386}
 {$ifndef NOAG386BIN}
                        taicpu(hp).ResetPass1;
Index: fpcbuild-2.4.0/fpcsrc/compiler/Makefile.fpc
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/Makefile.fpc	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/Makefile.fpc	(working copy)
@@ -173,7 +173,7 @@
 endif
 endif
 
-# set correct defines (-d$(CPU_TARGET) is automaticly added in makefile.fpc)
+# set correct defines (-d$(CPU_TARGET) is automatically added in makefile.fpc)
 override LOCALOPT+=-d$(CPC_TARGET) -dGDB -dBROWSERLOG
 
 # i386 specific
Index: fpcbuild-2.4.0/fpcsrc/compiler/systems/t_nwl.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/systems/t_nwl.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/systems/t_nwl.pas	(working copy)
@@ -423,7 +423,7 @@
    begin
      While not SharedLibFiles.Empty do
       begin
-        {becuase of upper/lower case mix, we may get duplicate
+        {because of upper/lower case mix, we may get duplicate
          names but nlmconv ignores that.
          Here we are setting the import-files for nlmconv. I.e. for
          the module libc or libc.nlm we add IMPORT @libc.imp and also
Index: fpcbuild-2.4.0/fpcsrc/compiler/systems/t_nwm.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/systems/t_nwm.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/systems/t_nwm.pas	(working copy)
@@ -405,7 +405,7 @@
    begin
      While not SharedLibFiles.Empty do
       begin
-        {becuase of upper/lower case mix, we may get duplicate
+        {because of upper/lower case mix, we may get duplicate
          names but nlmconv ignores that.
          Here we are setting the import-files for nlmconv. I.e. for
          the module clib or clib.nlm we add IMPORT @clib.imp and also
Index: fpcbuild-2.4.0/fpcsrc/compiler/paramgr.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/paramgr.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/paramgr.pas	(working copy)
@@ -36,7 +36,7 @@
 
     type
        {# This class defines some methods to take care of routine
-          parameters. It should be overriden for each new processor
+          parameters. It should be overridden for each new processor
        }
        tparamanager = class
           { true if the location in paraloc can be reused as localloc }
Index: fpcbuild-2.4.0/fpcsrc/compiler/x86/rax86int.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/x86/rax86int.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/x86/rax86int.pas	(working copy)
@@ -1561,7 +1561,7 @@
                   case oper.opr.typ of
                     OPR_LOCAL :
                       begin
-                        { don't allow direct access to fields of parameters, becuase that
+                        { don't allow direct access to fields of parameters, because that
                           will generate buggy code. Allow it only for explicit typecasting
                           and when the parameter is in a register (delphi compatible) }
                         if (not oper.hastype) and
Index: fpcbuild-2.4.0/fpcsrc/compiler/x86/aasmcpu.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/x86/aasmcpu.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/x86/aasmcpu.pas	(working copy)
@@ -2213,7 +2213,7 @@
               begin
                 { these are dissambler hints or 32 bit prefixes which
                   are not needed
-                  It's usefull to write rex :) (FK) }
+                  It's useful to write rex :) (FK) }
 {$ifdef x86_64}
                 maybewriterex;
 {$endif x86_64}
Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorheu.msg
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorheu.msg	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorheu.msg	(working copy)
@@ -829,7 +829,7 @@
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_השימוש במ�סף הנוכחי �ינו תומך בוסג התוצ�ה הבינ�רית
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 parser_w_no_objpas_use_mode=03149_W_�סור לקרו� ליחידת OBJPAS ישירות, יש להשתמש ב \{\$mode objfpc\} �ו ב \{\$mode delphi\} במקו�
 % You are trying to load the ObjPas unit manually from a uses clause. This is
 % not a good idea. Use the \var{\{\$mode objfpc\}} or
@@ -1336,7 +1336,7 @@
 type_w_instance_with_abstract=04046_W_מ�תחל �ת המחלקה "$1" ע� מתודות ל� ממומשות
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_הערך השמ�לי של ה�ופרנד IN צריך להיות בגודל של בית
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8-bits, this may lead to range check errors. The \var{in} operator
Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errord.msg
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errord.msg	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errord.msg	(working copy)
@@ -1396,7 +1396,7 @@
 type_w_instance_with_abstract=04046_W_Konstruktion der Klasse "$1" mit der abstrakten Methode "$2"
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_Der linke Operand des IN Operators sollte byte Gr”sse haben
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8 bits. This may lead to range check errors. The \var{in} operator
Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorpli.msg
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorpli.msg	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorpli.msg	(working copy)
@@ -791,7 +791,7 @@
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_Wstawki asemblera niedostêpne gdy wyj¶ciowym formatem jest wbudowane zapisywanie binarne
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 parser_w_no_objpas_use_mode=03149_W_Nie ³aduj modu³u OBJPAS bezpo¶rednio - u¿yj trybu obiektowego (objfpc, delphi)
 % You are trying to load the ObjPas unit manually from a uses clause. This is
 % not a good idea. Use the \var{\{\$mode objfpc\}} or
@@ -1200,7 +1200,7 @@
 type_w_instance_with_abstract=04046_W_Tworzenie klasy "$1" posiadaj±cej metody abstrakcyjne
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_Lewy operand operatora IN powinien byæ wielko¶ci jednego bajta
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8-bits, this may lead to range check errors. The \var{in} operator
Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errore.msg
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errore.msg	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errore.msg	(working copy)
@@ -574,7 +574,7 @@
 % Fields that are declared in a \var{private} section of an object or class
 % declaration cannot be accessed outside the module where the class is
 % defined.
-parser_e_overridden_methods_not_same_ret=03066_E_Overridden methods must have the same return type: "$2" is overriden by "$1" which has another return type
+parser_e_overridden_methods_not_same_ret=03066_E_Overridden methods must have the same return type: "$2" is overridden by "$1" which has another return type
 % If you declare overridden methods in a class definition, they must
 % have the same return type.
 parser_e_dont_nest_export=03067_E_EXPORT declared functions can't be nested
@@ -1391,7 +1391,7 @@
 type_w_instance_with_abstract=04046_W_Constructing a class "$1" with abstract method "$2"
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_The left operand of the IN operator should be byte sized
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8 bits. This may lead to range check errors. The \var{in} operator
@@ -2256,7 +2256,7 @@
 unit_u_ppu_invalid_processor=10009_U_PPU is compiled for another processor
 % This unit file was compiled for a different processor type, and
 % cannot be read.
-unit_u_ppu_invalid_target=10010_U_PPU is compiled for an other target
+unit_u_ppu_invalid_target=10010_U_PPU is compiled for another target
 % This unit file was compiled for a different target, and
 % cannot be read.
 unit_u_ppu_source=10011_U_PPU Source: $1
Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorda.msg
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorda.msg	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorda.msg	(working copy)
@@ -811,7 +811,7 @@
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_Direkte assembler er ikke understøttet i det binære udformat
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 parser_w_no_objpas_use_mode=03149_W_Inkludér ikke unit'en OBJPAS manuelt, brug i stedet {$mode objfpc} eller {$mode delphi}
 % You are trying to load the ObjPas unit manually from a uses clause. This is
 % not a good idea. Use the \var{\{\$mode objfpc\}} or
@@ -1245,7 +1245,7 @@
 type_w_instance_with_abstract=04046_W_Konstruerer klassen "$1" med abstrakte metoder
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_Den venstre operand til IN-operatoren skal være én byte stor
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8-bits, this may lead to range check errors. The  \var{in} operator
Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorf.msg
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorf.msg	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorf.msg	(working copy)
@@ -814,11 +814,11 @@
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_Assembleur direct non support‚ pour la sortie binaire
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 parser_w_no_objpas_use_mode=03149_W_Ne chargez pas l'unit‚ OBJPAS manuellement, utilisez {$mode objfpc} ou {$mode delphi}
 % You're trying to load the ObjPas unit manual from a uses clause. This is
 % not a good idea to do, you can better use the {$mode objfpc} or {$mode delphi}
-% directives which load the unit automaticly
+% directives which load the unit automatically
 parser_e_no_object_override=03150_E_OVERRIDE nepeut ˆtre utilis‚ pour des objets
 % Override isn't support for objects, use VIRTUAL instead to override
 % a method of an anchestor object
@@ -1548,10 +1548,10 @@
 unit_u_ppu_invalid_version=10008_U_PPU Invalid Version $1
 % This unit file was compiled with a different version of the compiler, and
 % cannot be read.
-unit_u_ppu_invalid_processor=10009_U_PPU is compiled for an other processor
+unit_u_ppu_invalid_processor=10009_U_PPU is compiled for another processor
 % This unit file was compiled for a different processor type, and
 % cannot be read
-unit_u_ppu_invalid_target=10010_U_PPU is compiled for an other target
+unit_u_ppu_invalid_target=10010_U_PPU is compiled for another target
 % This unit file was compiled for a different processor type, and
 % cannot be read
 unit_u_ppu_source=10011_U_PPU Source: $1
Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorptd.msg
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorptd.msg	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorptd.msg	(working copy)
@@ -530,7 +530,7 @@
 % overridden in the descendent class with the \var{override} directive. If you
 % don't specify the \var{override} directive, you will hide the parent method;
 % you will not override it.
-parser_e_nothing_to_be_overridden=03058_E_Nao ha metodo em classe ancestral com este nome para sofrer overriden : "$1"
+parser_e_nothing_to_be_overridden=03058_E_Nao ha metodo em classe ancestral com este nome para sofrer overridden : "$1"
 % You are trying to \var{override} a virtual method of a parent class that does
 % not exist.
 parser_e_no_procedure_to_access_property=03059_E_Faltou a clausula "read" na declaracao da propriedade
@@ -818,7 +818,7 @@
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_"Direct assembly" nao e suportado quando usando formato binario de saida
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 parser_w_no_objpas_use_mode=03149_W_Nao carregue OBJPAS unit com "uses", use \{\$mode objfpc\} ou \{\$mode delphi\} ao inves disto
 % You are trying to load the ObjPas unit manually from a uses clause. This is
 % not a good idea. Use the \var{\{\$mode objfpc\}} or
@@ -1240,7 +1240,7 @@
 type_w_instance_with_abstract=04046_W_Construindo classe "$1" mas superclasse tem metodos virtuais que nao sofreram override
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_Operando a esquerada de um operador IN tem que ter tamanho de 1 byte
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8-bits, this may lead to range check errors. The \var{in} operator
Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorrw.msg
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorrw.msg	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorrw.msg	(working copy)
@@ -830,12 +830,12 @@
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_Ïðÿìîé ñòèëü àññåìáëåpà íå ïîääåpæèâàåòñÿ ôîpìàòîì âûõîäíîãî ôàéëà
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 parser_w_no_objpas_use_mode=03149_W_Hå çàãpyæàéòå OBJPAS ìîäyëü, èñïîëüçyéòå {$mode objfpc} èëè {$mode delphi} âìåñòî ýòîãî
 % You're trying to load the ObjPas unit manual from a uses clause. This is
 % not a good idea to do, you can better use the \var{\{\$mode objfpc\}} or
 % \var{\{\$mode delphi\}}
-% directives which load the unit automaticly
+% directives which load the unit automatically
 parser_e_no_object_override=03150_E_Ïåpåîïpåäåëåíèå íå ìîæåò áûòü èñïîëüçîâàííî â îáúåêòàõ
 % Override isn't support for objects, use VIRTUAL instead to override
 % a method of an anchestor object
Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorhe.msg
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorhe.msg	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorhe.msg	(working copy)
@@ -829,7 +829,7 @@
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_äùéîåù áîàñó äðåëçé àéðå úåîê áåñâ äúåöàä äáéðàøéú
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 parser_w_no_objpas_use_mode=03149_W_àñåø ì÷øåà ìéçéãú OBJPAS éùéøåú, éù ìäùúîù á \{\$mode objfpc\} àå á \{\$mode delphi\} áî÷åí
 % You are trying to load the ObjPas unit manually from a uses clause. This is
 % not a good idea. Use the \var{\{\$mode objfpc\}} or
@@ -1336,7 +1336,7 @@
 type_w_instance_with_abstract=04046_W_îàúçì àú äîçì÷ä "$1" òí îúåãåú ìà îîåîùåú
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_äòøê äùîàìé ùì äàåôøðã IN öøéê ìäéåú áâåãì ùì áéú
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8-bits, this may lead to range check errors. The \var{in} operator
Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorues.msg
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorues.msg	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorues.msg	(working copy)
@@ -782,7 +782,7 @@
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_Ensamblador directo no soportado para formato binario de salida
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 parser_w_no_objpas_use_mode=03149_W_No carges manuamente la unidad OBJPAS, usa \{\$mode objfpc\} o \{\$mode delphi\}
 % You are trying to load the ObjPas unit manually from a uses clause. This is
 % not a good idea. Use the \var{\{\$mode objfpc\}} or
@@ -1189,7 +1189,7 @@
 type_w_instance_with_abstract=04046_W_Constuyendo un objeto de clase "$1" que contiene métodos abstractos
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_El operando a la izquierda de IN debe ser de tamaño un byte
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8-bits, this may lead to range check errors. The \var{in} operator
Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorn.msg
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorn.msg	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorn.msg	(working copy)
@@ -815,7 +815,7 @@
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_Directe assemblercode wordt niet ondersteund door de interne assembler.
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 parser_w_no_objpas_use_mode=03149_W_Laad de OBJPAS unit niet manueel, gebruik {$mode objfpc} of {$mode delphi}.
 % You are trying to load the ObjPas unit manually from a uses clause. This is
 % not a good idea. Use the \var{\{\$mode objfpc\}} or
@@ -1243,7 +1243,7 @@
 type_w_instance_with_abstract=04046_W_Constructie van een klasse "$1" met abstracte methoden
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_De linker operand van de IN operator moet de grootte van een byte hebben
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8-bits, this may lead to range check errors. The \var{in} operator
Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorfi.msg
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorfi.msg	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorfi.msg	(working copy)
@@ -816,7 +816,7 @@
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_Assembleur direct non supporté pour la sortie binaire
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 parser_w_no_objpas_use_mode=03149_W_Ne chargez pas l'unité OBJPAS manuellement, utilisez de préférence \{\$mode Objfpc\} ou \{\$mode Delphi\}
 % You are trying to load the ObjPas unit manually from a uses clause. This is
 % not a good idea. Use the \var{\{\$mode objfpc\}} or
@@ -1270,7 +1270,7 @@
 type_w_instance_with_abstract=04046_W_Construction d´une classe "$1" avec des méthodes abstraites
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=L´opérande à gauche de l´opérateur IN doit avoir la longueur d´un octet (8 bits)
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8-bits, this may lead to range check errors. The \var{in} operator
Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorr.msg
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorr.msg	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorr.msg	(working copy)
@@ -830,12 +830,12 @@
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_�àאַ© áâ¨«ì  áᥬ¡«¥p  ­¥ ¯®¤¤¥p¦¨¢ ¥âáï ä®p¬ â®¬ ¢ë室­®£® ä ©« 
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 parser_w_no_objpas_use_mode=03149_W_H¥ § £py¦ ©â¥ OBJPAS ¬®¤y«ì, ¨á¯®«ì§y©â¥ {$mode objfpc} ¨«¨ {$mode delphi} ¢¬¥áâ® í⮣®
 % You're trying to load the ObjPas unit manual from a uses clause. This is
 % not a good idea to do, you can better use the \var{\{\$mode objfpc\}} or
 % \var{\{\$mode delphi\}}
-% directives which load the unit automaticly
+% directives which load the unit automatically
 parser_e_no_object_override=03150_E_�¥p¥®¯p¥¤¥«¥­¨¥ ­¥ ¬®¦¥â ¡ëâì ¨á¯®«ì§®¢ ­­® ¢ ®¡ê¥ªâ å
 % Override isn't support for objects, use VIRTUAL instead to override
 % a method of an anchestor object
Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorct.msg
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorct.msg	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorct.msg	(working copy)
@@ -521,7 +521,7 @@
 % declaration cannot be accessed outside the module where the class is
 % defined.
 parser_e_overridden_methods_not_same_ret=03066_E_Els mètodes sobrecarregats han de retornar el mateix tipus: "$2" està sobrecarregat per "$1", el qual retorna un altre tipus
-% If you declare overriden methods in a class definition, they must
+% If you declare overridden methods in a class definition, they must
 % have the same return type.
 parser_e_dont_nest_export=03067_E_Les funcions declarades amb EXPORT no poden estar niades
 % You cannot declare a function or procedure within a function or procedure
@@ -784,7 +784,7 @@
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_L'assemblador directe no és compatible amb el format binari de la sortida
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 % \end{description}
 parser_w_no_objpas_use_mode=03149_W_No carregueu manualment l'unitat OBJPAS, utilitzeu {\$mode objfpc\} o {\$mode delphi\}
 % You are trying to load the ObjPas unit manual from a uses clause. This is
@@ -1192,7 +1192,7 @@
 type_w_instance_with_abstract=04046_W_S'està construint una classe "$1" amb mètodes abstractes 
 % An instance of a class is created which contains non_implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_L'operand esquerra per a l'operador d'IN ha de tenir el tamany d'un octet
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8-bits, this may lead to range check errors. The \var{in} operator
Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errores.msg
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errores.msg	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errores.msg	(working copy)
@@ -788,7 +788,7 @@
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_Ensamblador directo no soportado para formato binario de salida
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 parser_w_no_objpas_use_mode=03149_W_No carges manuamente la unidad OBJPAS, usa \{\$mode objfpc\} o \{\$mode delphi\}
 % You are trying to load the ObjPas unit manually from a uses clause. This is
 % not a good idea. Use the \var{\{\$mode objfpc\}} or
@@ -1195,7 +1195,7 @@
 type_w_instance_with_abstract=04046_W_Constuyendo un objeto de clase "$1" que contiene métodos abstractos
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_El operando a la izquierda de IN debe ser de tamaño un byte
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8-bits, this may lead to range check errors. The \var{in} operator
Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errordu.msg
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errordu.msg	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errordu.msg	(working copy)
@@ -1396,7 +1396,7 @@
 type_w_instance_with_abstract=04046_W_Konstruktion der Klasse "$1" mit der abstrakten Methode "$2"
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_Der linke Operand des IN Operators sollte byte Grösse haben
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8 bits. This may lead to range check errors. The \var{in} operator
Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorptw.msg
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorptw.msg	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorptw.msg	(working copy)
@@ -530,7 +530,7 @@
 % overridden in the descendent class with the \var{override} directive. If you
 % don't specify the \var{override} directive, you will hide the parent method;
 % you will not override it.
-parser_e_nothing_to_be_overridden=03058_E_Não há método em classe ancestral com este nome para sofrer overriden : "$1"
+parser_e_nothing_to_be_overridden=03058_E_Não há método em classe ancestral com este nome para sofrer overridden : "$1"
 % You are trying to \var{override} a virtual method of a parent class that does
 % not exist.
 parser_e_no_procedure_to_access_property=03059_E_Faltou a cláusula "read" na declaração da propriedade
@@ -818,7 +818,7 @@
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_"Direct assembly" não é suportado quando usando formato binário de saída
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 parser_w_no_objpas_use_mode=03149_W_Não carregue OBJPAS unit com "uses", use \{\$mode objfpc\} ou \{\$mode delphi\} ao invés disto
 % You are trying to load the ObjPas unit manually from a uses clause. This is
 % not a good idea. Use the \var{\{\$mode objfpc\}} or
@@ -1240,7 +1240,7 @@
 type_w_instance_with_abstract=04046_W_Construindo classe "$1" mas superclasse tem métodos virtuais que não sofreram override
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_Operando a esquerada de um operador IN tem que ter tamanho de 1 byte
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8-bits, this may lead to range check errors. The \var{in} operator
Index: fpcbuild-2.4.0/fpcsrc/compiler/msg/errorpl.msg
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/msg/errorpl.msg	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/msg/errorpl.msg	(working copy)
@@ -791,7 +791,7 @@
 % are stored on the stack
 parser_f_direct_assembler_not_allowed=03148_F_Wstawki asemblera niedost©pne gdy wyj˜ciowym formatem jest wbudowane zapisywanie binarne
 % You can't use direct assembler when using a binary writer, choose an
-% other outputformat or use an other assembler reader
+% other outputformat or use another assembler reader
 parser_w_no_objpas_use_mode=03149_W_Nie ˆaduj moduˆu OBJPAS bezpo˜rednio - u¾yj trybu obiektowego (objfpc, delphi)
 % You are trying to load the ObjPas unit manually from a uses clause. This is
 % not a good idea. Use the \var{\{\$mode objfpc\}} or
@@ -1200,7 +1200,7 @@
 type_w_instance_with_abstract=04046_W_Tworzenie klasy "$1" posiadaj¥cej metody abstrakcyjne
 % An instance of a class is created which contains non-implemented abstract
 % methods. This will probably lead to a runtime error 211 in the code if that
-% routine is ever called. All abstract methods should be overriden.
+% routine is ever called. All abstract methods should be overridden.
 type_h_in_range_check=04047_H_Lewy operand operatora IN powinien by† wielko˜ci jednego bajta
 % The left operand of the \var{in} operator is not an ordinal or enumeration which fits
 % within 8-bits, this may lead to range check errors. The \var{in} operator
Index: fpcbuild-2.4.0/fpcsrc/compiler/psub.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/psub.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/psub.pas	(working copy)
@@ -1547,7 +1547,7 @@
          old_current_objectdef:=current_objectdef;
 
          { reset current_procinfo.procdef to nil to be sure that nothing is writing
-           to an other procdef }
+           to another procdef }
          current_procinfo:=nil;
          current_objectdef:=nil;
 
Index: fpcbuild-2.4.0/fpcsrc/compiler/aasmbase.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/aasmbase.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/aasmbase.pas	(working copy)
@@ -21,7 +21,7 @@
 }
 { @abstract(This unit implements an abstract asm output class for all processor types)
   This unit implements an abstract assembler output class for all processors, these
-  are then overriden for each assembler writer to actually write the data in these
+  are then overridden for each assembler writer to actually write the data in these
   classes to an assembler file.
 }
 
Index: fpcbuild-2.4.0/fpcsrc/compiler/utils/ppumove.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/utils/ppumove.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/utils/ppumove.pp	(working copy)
@@ -385,7 +385,7 @@
 { read all entries until the end and write them also to the new ppu }
   repeat
     b:=inppu.readentry;
-  { don't write ibend, that's written automaticly }
+  { don't write ibend, that's written automatically }
     if b<>ibend then
      begin
        if b=iblinkothersharedlibs then
Index: fpcbuild-2.4.0/fpcsrc/compiler/pdecvar.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/pdecvar.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/pdecvar.pas	(working copy)
@@ -242,7 +242,7 @@
          sym : tsym;
          srsymtable: tsymtable;
          p : tpropertysym;
-         overriden : tsym;
+         overridden : tsym;
          varspez : tvarspez;
          hdef : tdef;
          arraytype : tdef;
@@ -351,7 +351,7 @@
               if paranr>0 then
                 include(p.propoptions,ppo_hasparameters);
            end;
-         { overriden property ?                                 }
+         { overridden property ?                                 }
          { force property interface
              there is a property parameter
              a global property }
@@ -398,18 +398,18 @@
          else
            begin
               { do an property override }
-              overriden:=search_class_member(aclass.childof,p.name);
-              if assigned(overriden) and
-                 (overriden.typ=propertysym) and
+              overridden:=search_class_member(aclass.childof,p.name);
+              if assigned(overridden) and
+                 (overridden.typ=propertysym) and
                  not(is_dispinterface(aclass)) then
                 begin
-                  p.overridenpropsym:=tpropertysym(overriden);
+                  p.overriddenpropsym:=tpropertysym(overridden);
                   { inherit all type related entries }
-                  p.indexdef:=tpropertysym(overriden).indexdef;
-                  p.propdef:=tpropertysym(overriden).propdef;
-                  p.index:=tpropertysym(overriden).index;
-                  p.default:=tpropertysym(overriden).default;
-                  p.propoptions:=tpropertysym(overriden).propoptions;
+                  p.indexdef:=tpropertysym(overridden).indexdef;
+                  p.propdef:=tpropertysym(overridden).propdef;
+                  p.index:=tpropertysym(overridden).index;
+                  p.default:=tpropertysym(overridden).default;
+                  p.propoptions:=tpropertysym(overridden).propoptions;
                 end
               else
                 begin
@@ -535,8 +535,8 @@
 
          if assigned(aclass) and not(is_dispinterface(aclass)) then
            begin
-             { ppo_stored is default on for not overriden properties }
-             if not assigned(p.overridenpropsym) then
+             { ppo_stored is default on for not overridden properties }
+             if not assigned(p.overriddenpropsym) then
                include(p.propoptions,ppo_stored);
              if try_to_consume(_STORED) then
               begin
Index: fpcbuild-2.4.0/fpcsrc/compiler/dbgstabs.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/compiler/dbgstabs.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/compiler/dbgstabs.pas	(working copy)
@@ -288,7 +288,7 @@
            not(def.dbg_state in [dbg_state_writing,dbg_state_written,dbg_state_queued]) then
           internalerror(200403091);
 
-        { Keep track of used stabs, this info is only usefull for stabs
+        { Keep track of used stabs, this info is only useful for stabs
           referenced by the symbols. Definitions will always include all
           required stabs }
         if def.dbg_state=dbg_state_unused then
@@ -509,7 +509,7 @@
             st:=def_stabstr_evaluate(def,'"'+symname+':$1$2=',[stabchar,def_stab_number(def)]);
           end;
         st:=st+ss;
-        { line info is set to 0 for all defs, because the def can be in an other
+        { line info is set to 0 for all defs, because the def can be in another
           unit and then the linenumber is invalid in the current sourcefile }
         st:=st+def_stabstr_evaluate(def,'",${N_LSYM},0,0,0',[]);
         { add to list }
Index: fpcbuild-2.4.0/fpcsrc/packages/winunits-jedi/src/jwantquery.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/winunits-jedi/src/jwantquery.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/winunits-jedi/src/jwantquery.pas	(working copy)
@@ -66,7 +66,7 @@
 type
   // TODO STUBS  see CmdTree.h (cmdtree.idl)
   IFilter = Pointer;
-  IUnkown = Pointer;
+  IUnknown = Pointer;
   ICommand = Pointer;
   {$IFNDEF JWA_INCLUDEMODE}
   PPWCHAR = ^PWCHAR;
@@ -115,7 +115,7 @@
 function BindIFilterFromStorage(pStg: IStorage; pUnkOuter: IUnknown; out ppIUnk: IFilter): HRESULT; stdcall;
 {$EXTERNALSYM BindIFilterFromStorage}
 
-function BindIFilterFromStream(pStm: IStream; pUnkOuter: IUnkown; out ppIUnk: IFilter): HRESULT; stdcall;
+function BindIFilterFromStream(pStm: IStream; pUnkOuter: IUnknown; out ppIUnk: IFilter): HRESULT; stdcall;
 {$EXTERNALSYM BindIFilterFromStream}
 
 function LocateCatalogsW(pwszScope: PWCHAR; iBmk: ULONG; pwszMachine: PWCHAR;
Index: fpcbuild-2.4.0/fpcsrc/packages/winunits-jedi/src/ModuleLoader.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/winunits-jedi/src/ModuleLoader.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/winunits-jedi/src/ModuleLoader.pas	(working copy)
@@ -90,7 +90,7 @@
 // Simple DLL loading class. The idea is to use it to dynamically load
 // a DLL at run-time using the GetProcedure method. Another (better) use is to derive a
 // new class for each DLL you are interested in and explicitly call GetProcedure for
-// each function in an overriden Load method. You would then add procedure/function
+// each function in an overridden Load method. You would then add procedure/function
 // aliases to the new class that maps down to the internally managed function pointers.
 // This class is built from an idea I read about in Delphi Magazine a while ago but
 // I forget who was the originator. If you know, let me know and I'll put it in the credits
@@ -384,7 +384,7 @@
 
 procedure TModuleLoader.Error(ErrorCode: Cardinal);
 begin
-  // overriden classes should handle this
+  // overridden classes should handle this
 end;
 
 function TModuleLoader.GetExportedSymbol(const AName: string; var Buffer;
Index: fpcbuild-2.4.0/fpcsrc/packages/winunits-jedi/src/jwabluetoothapis.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/winunits-jedi/src/jwabluetoothapis.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/winunits-jedi/src/jwabluetoothapis.pas	(working copy)
@@ -584,7 +584,7 @@
 //              if ( pbtdi->fAuthenticated || pbtdi->fRemembered )
 //              {
 //                  //
-//                  //  TODO:   Do something usefull with the device info
+//                  //  TODO:   Do something useful with the device info
 //                  //
 //              }
 //
Index: fpcbuild-2.4.0/fpcsrc/packages/fcl-xml/src/htmlwriter.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/fcl-xml/src/htmlwriter.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/fcl-xml/src/htmlwriter.pp	(working copy)
@@ -62,7 +62,7 @@
     function FormButton (aname, caption, aOnClick: DOMstring) : THTML_Input;
     function FormHidden (aname, aValue: DOMstring) : THTML_Input;
     function FormFile (aname, aValue:DOMstring) : THTML_Input;
-    { Other usefull links to elements }
+    { Other useful links to elements }
     function Meta (aname, ahtpequiv,acontent: DOMString) : THTML_meta;
     function Link (arel, ahref, athetype, amedia: DOMString) : THTML_link;
     function Script (s, athetype, asrc: DOMString) : THTML_script;
Index: fpcbuild-2.4.0/fpcsrc/packages/fcl-image/src/bmpcomn.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/fcl-image/src/bmpcomn.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/fcl-image/src/bmpcomn.pp	(working copy)
@@ -65,7 +65,7 @@
       YPelsPerMeter:Longint;
 {46+04 : Number of colors used}
       ClrUsed:longint;
-{50+04 : Number of imprtant colors used : usefull for displaying on VGA256}
+{50+04 : Number of imprtant colors used : useful for displaying on VGA256}
       ClrImportant:longint;
    end;
    PBitMapInfoHeader = ^TBitMapInfoHeader;
Index: fpcbuild-2.4.0/fpcsrc/packages/httpd13/src/http_main.inc
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/httpd13/src/http_main.inc	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/httpd13/src/http_main.inc	(working copy)
@@ -114,7 +114,7 @@
 
 {$ifndef NO_OTHER_CHILD}
 {
- * register an other_child -- a child which the main loop keeps track of
+ * register another_child -- a child which the main loop keeps track of
  * and knows it is different than the rest of the scoreboard.
  *
  * pid is the pid of the child.
@@ -149,7 +149,7 @@
 					 * us knowing ... buggy os? }
 
 {
- * unregister an other_child.  Note that the data pointer is used here, and
+ * unregister another_child.  Note that the data pointer is used here, and
  * is assumed to be unique' per other_child.  This is because the pid and
  * write_fd are possibly killed off separately.
  }
Index: fpcbuild-2.4.0/fpcsrc/packages/fcl-db/src/sqldb/postgres/pqconnection.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/fcl-db/src/sqldb/postgres/pqconnection.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/fcl-db/src/sqldb/postgres/pqconnection.pp	(working copy)
@@ -696,7 +696,7 @@
     begin
     x := FieldBinding[FieldDef.FieldNo-1];
 
-    // Joost, 5 jan 2006: I disabled the following, since it's usefull for
+    // Joost, 5 jan 2006: I disabled the following, since it's useful for
     // debugging, but it also slows things down. In principle things can only go
     // wrong when FieldDefs is changed while the dataset is opened. A user just
     // shoudn't do that. ;) (The same is done in IBConnection)
Index: fpcbuild-2.4.0/fpcsrc/packages/fcl-db/src/sqldb/odbc/odbcconn.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/fcl-db/src/sqldb/odbc/odbcconn.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/fcl-db/src/sqldb/odbc/odbcconn.pas	(working copy)
@@ -1172,8 +1172,8 @@
     ODBCCheckResult(
       SQLStatistics(
         StmtHandle,
-        nil, 0, // catalog unkown; request for all catalogs
-        nil, 0, // schema unkown; request for all schemas
+        nil, 0, // catalog unknown; request for all catalogs
+        nil, 0, // schema unknown; request for all schemas
         PChar(TableName), Length(TableName), // request information for TableName
         SQL_INDEX_ALL,
         SQL_QUICK
Index: fpcbuild-2.4.0/fpcsrc/packages/fcl-db/src/sqldb/interbase/ibconnection.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/fcl-db/src/sqldb/interbase/ibconnection.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/fcl-db/src/sqldb/interbase/ibconnection.pp	(working copy)
@@ -867,7 +867,7 @@
 {$R-}
     x := FieldBinding[FieldDef.FieldNo-1];
 
-    // Joost, 5 jan 2006: I disabled the following, since it's usefull for
+    // Joost, 5 jan 2006: I disabled the following, since it's useful for
     // debugging, but it also slows things down. In principle things can only go
     // wrong when FieldDefs is changed while the dataset is opened. A user just
     // shoudn't do that. ;) (The same is done in PQConnection)
Index: fpcbuild-2.4.0/fpcsrc/packages/fcl-web/src/ezcgi.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/fcl-web/src/ezcgi.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/fcl-web/src/ezcgi.pp	(working copy)
@@ -104,12 +104,12 @@
 
 procedure TEZcgi.DoPost;
 begin
-  // Must be overriden by child class
+  // Must be overridden by child class
 end;
 
 procedure TEZcgi.DoGet;
 begin
-  // Must be overriden by child class
+  // Must be overridden by child class
 end;
 
 procedure TEZcgi.WriteContent(ctype : String);
Index: fpcbuild-2.4.0/fpcsrc/packages/httpd20/src/apr/apr_portable.inc
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/httpd20/src/apr/apr_portable.inc	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/httpd20/src/apr/apr_portable.inc	(working copy)
@@ -144,7 +144,7 @@
   apr_os_file_t: Integer;        {< native file }
 typedef DIR                   apr_os_dir_t;         {< native dir }
   apr_os_sock_t: Integer;        {< native dir }
-typedef struct apr_os_proc_mutex_t  apr_os_proc_mutex_t; {< native proces
+typedef struct apr_os_proc_mutex_t  apr_os_proc_mutex_t; {< native process
                                                           *   mutex
                                                           }
 {$if defined(APR_HAS_THREADS) and defined(APR_HAVE_PTHREAD_H)}
Index: fpcbuild-2.4.0/fpcsrc/packages/httpd20/src/apr/apr_thread_proc.inc
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/httpd20/src/apr/apr_thread_proc.inc	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/httpd20/src/apr/apr_thread_proc.inc	(working copy)
@@ -679,7 +679,7 @@
 // external LibAPR name LibNamePrefix + 'apr_proc_detach' + LibSuff4;
 
 {
- * Register an other_child -- a child associated to its registered 
+ * Register another_child -- a child associated to its registered 
  * maintence callback.  This callback is invoked when the process
  * dies, is disconnected or disappears.
  * @param proc The child process to register.
Index: fpcbuild-2.4.0/fpcsrc/packages/httpd20/src/apr/apr_pools.inc
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/httpd20/src/apr/apr_pools.inc	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/httpd20/src/apr/apr_pools.inc	(working copy)
@@ -88,7 +88,7 @@
  * <pre>
  * | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 |
  * ---------------------------------
- * |   |   |   |   |   |   |   | x |  General debug code enabled (usefull in
+ * |   |   |   |   |   |   |   | x |  General debug code enabled (useful in
  *                                    combination with --with-efence).
  *
  * |   |   |   |   |   |   | x |   |  Verbose output on stderr (report
Index: fpcbuild-2.4.0/fpcsrc/packages/utmp/src/utmp.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/utmp/src/utmp.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/utmp/src/utmp.pp	(working copy)
@@ -18,7 +18,7 @@
   tDevice_name = String[Device_name_length];
   tUser_name = String[User_name_length];
   tHost_name = String[Host_name_length];
-  tLogin_type = (Unkown, Run_level, Boot_time, New_time, Old_time,
+  tLogin_type = (Unknown, Run_level, Boot_time, New_time, Old_time,
     Init_process, Login_process, User_process, Dead_process);
   tLogin_types = set of tLogin_type;
   tParameter_type = (Include, Exclude);
@@ -38,9 +38,9 @@
 Const
   DefaultLoginType : TLogin_Types = [User_Process];
   Login_type_names : array [TLogin_type] of string[20] =
-  ('Unkown', 'Run level', 'Boot time','New time', 'Old time',
+  ('Unknown', 'Run level', 'Boot time','New time', 'Old time',
     'Init process', 'Login process', 'User process', 'Dead process');
- All_Login_types : TLogin_types = [Unkown, Run_level, Boot_time, New_time, Old_time,
+ All_Login_types : TLogin_types = [Unknown, Run_level, Boot_time, New_time, Old_time,
     Init_process, Login_process, User_process, Dead_process];
 
 procedure Read_logged_users;
Index: fpcbuild-2.4.0/fpcsrc/packages/numlib/tests/intge2te.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/numlib/tests/intge2te.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/numlib/tests/intge2te.pas	(working copy)
@@ -258,7 +258,7 @@
           writeln(f: 10)
         else
           writeln;
-        Writeln('    proces afgebroken, te hoge nauwkeurigheid?');
+        Writeln('    process afgebroken, te hoge nauwkeurigheid?');
       end;
       3: Writeln('Verkeerde parameterwaarde (<=0) bij aanroep: ', ae: 8);
       4:
@@ -268,7 +268,7 @@
           writeln(f: 10)
         else
           writeln;
-        writeln('    proces afgebroken, moeilijk, mogelijk divergent?');
+        writeln('    process afgebroken, moeilijk, mogelijk divergent?');
       end;
     end;
   end;
@@ -684,7 +684,7 @@
           writeln(f: 10)
         else
           writeln;
-        Writeln('    proces afgebroken, te hoge nauwkeurigheid?');
+        Writeln('    process afgebroken, te hoge nauwkeurigheid?');
       end;
       3: Writeln('Verkeerde parameterwaarde (<=0) bij aanroep: ', ae: 8);
       4:
@@ -694,7 +694,7 @@
           writeln(f: 10)
         else
           writeln;
-        writeln('    proces afgebroken, moeilijk, mogelijk divergent?');
+        writeln('    process afgebroken, moeilijk, mogelijk divergent?');
       end;
     end;
   end;
Index: fpcbuild-2.4.0/fpcsrc/packages/numlib/tests/intge1te.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/numlib/tests/intge1te.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/numlib/tests/intge1te.pas	(working copy)
@@ -368,7 +368,7 @@
           writeln(f: 10)
         else
           writeln;
-        Writeln('    proces afgebroken, te hoge nauwkeurigheid?');
+        Writeln('    process afgebroken, te hoge nauwkeurigheid?');
       end;
       3: Writeln('Verkeerde waarde ae (<=0) bij aanroep: ', ae: 8);
       4:
@@ -378,7 +378,7 @@
           writeln(f: 10)
         else
           writeln;
-        writeln('    proces afgebroken, moeilijk, mogelijk divergent?');
+        writeln('    process afgebroken, moeilijk, mogelijk divergent?');
       end;
     end;
   end;
@@ -866,7 +866,7 @@
           writeln(f: 10)
         else
           writeln;
-        Writeln('    proces afgebroken, te hoge nauwkeurigheid?');
+        Writeln('    process afgebroken, te hoge nauwkeurigheid?');
       end;
       3: Writeln('Verkeerde waarde ae (<=0) bij aanroep: ', ae: 8);
       4:
@@ -876,7 +876,7 @@
           writeln(f: 10)
         else
           writeln;
-        writeln('    proces afgebroken, moeilijk, mogelijk divergent?');
+        writeln('    process afgebroken, moeilijk, mogelijk divergent?');
       end;
     end;
   end;
Index: fpcbuild-2.4.0/fpcsrc/packages/httpd22/src/apr/apr_portable.inc
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/httpd22/src/apr/apr_portable.inc	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/httpd22/src/apr/apr_portable.inc	(working copy)
@@ -144,7 +144,7 @@
   apr_os_file_t: Integer;        {< native file }
 typedef DIR                   apr_os_dir_t;         {< native dir }
   apr_os_sock_t: Integer;        {< native dir }
-typedef struct apr_os_proc_mutex_t  apr_os_proc_mutex_t; {< native proces
+typedef struct apr_os_proc_mutex_t  apr_os_proc_mutex_t; {< native process
                                                           *   mutex
                                                           }
 {$if defined(APR_HAS_THREADS) and defined(APR_HAVE_PTHREAD_H)}
Index: fpcbuild-2.4.0/fpcsrc/packages/httpd22/src/apr/apr_thread_proc.inc
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/httpd22/src/apr/apr_thread_proc.inc	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/httpd22/src/apr/apr_thread_proc.inc	(working copy)
@@ -716,7 +716,7 @@
 // external LibAPR name LibNamePrefix + 'apr_proc_detach' + LibSuff4;
 
 {
- * Register an other_child -- a child associated to its registered 
+ * Register another_child -- a child associated to its registered 
  * maintence callback.  This callback is invoked when the process
  * dies, is disconnected or disappears.
  * @param proc The child process to register.
Index: fpcbuild-2.4.0/fpcsrc/packages/univint/src/AppleEvents.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/univint/src/AppleEvents.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/univint/src/AppleEvents.pas	(working copy)
@@ -459,7 +459,7 @@
  *  
  *  Discussion:
  *    Returns a CFArrayRef containing CFDictionary objects containing
- *    information about processses running on a remote machine.  If the
+ *    information about processes running on a remote machine.  If the
  *    result array is NULL, the query failed and the error out
  *    parameter will contain information about the failure.  If the
  *    resolver had not been previously scheduled for execution, this
Index: fpcbuild-2.4.0/fpcsrc/packages/univint/src/AudioHardware.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/univint/src/AudioHardware.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/univint/src/AudioHardware.pas	(working copy)
@@ -916,7 +916,7 @@
     @constant       kAudioHardwarePropertyPlugInForBundleID
                         Using an AudioValueTranslation structure, this property translates the input
                         CFString containing a bundle ID into the AudioObjectID of the AudioPlugIn
-                        that corresponds to it. This property will return kAudioObjectUnkown if the
+                        that corresponds to it. This property will return kAudioObjectUnknown if the
                         given bundle ID doesn't match any AudioPlugIns.
 }
 const
Index: fpcbuild-2.4.0/fpcsrc/packages/univint/src/Controls.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/univint/src/Controls.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/univint/src/Controls.pas	(working copy)
@@ -3236,7 +3236,7 @@
  *  
  *  Discussion:
  *    Advances the focus to the next most appropriate control. Unless
- *    overriden in some fashion (either by overriding certain carbon
+ *    overridden in some fashion (either by overriding certain carbon
  *    events or using the HIViewSetNextFocus API), the Toolbox will use
  *    a spacially determinant method of focusing, attempting to focus
  *    left to right, top to bottom in a window, taking groups of
@@ -3273,7 +3273,7 @@
  *  
  *  Discussion:
  *    Reverses the focus to the next most appropriate control. Unless
- *    overriden in some fashion (either by overriding certain carbon
+ *    overridden in some fashion (either by overriding certain carbon
  *    events or using the HIViewSetNextFocus API), the Toolbox will use
  *    a spacially determinant method of focusing, attempting to focus
  *    left to right, top to bottom in a window, taking groups of
Index: fpcbuild-2.4.0/fpcsrc/packages/univint/src/Devices.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/univint/src/Devices.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/univint/src/Devices.pas	(working copy)
@@ -869,7 +869,7 @@
  }
 function DriverInstallReserveMem(drvrPtr: DRVRHeaderPtr; refNum: SInt16): OSErr; external name '_DriverInstallReserveMem';
 {
-  Note: DrvrInstall() is no longer supported, becuase it never really worked anyways.
+  Note: DrvrInstall() is no longer supported, because it never really worked anyways.
         There will soon be a DriverInstall() which does the right thing.
 
         DrvrRemove has been renamed to DriverRemove.  But, InterfaceLib for PowerPC
Index: fpcbuild-2.4.0/fpcsrc/packages/univint/src/CGImageDestination.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/univint/src/CGImageDestination.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/univint/src/CGImageDestination.pas	(working copy)
@@ -183,7 +183,7 @@
 
 { Set the next image in the image destination `idst' to be the image at
  * `index' in the image source `isrc'.  The index is zero-based. The
- * properties of the source image can be added to or overriden by supplying
+ * properties of the source image can be added to or overridden by supplying
  * additional keys/values in `properties'.  If a key in `properties' has
  * the value kCFNull, the corresponding property in the destination will be
  * removed. }
Index: fpcbuild-2.4.0/fpcsrc/packages/univint/src/Authorization.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/univint/src/Authorization.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/univint/src/Authorization.pas	(working copy)
@@ -305,7 +305,7 @@
 		The reason for passing in this flag is to provide correct audit trail information and to avoid unnecessary user interaction.
 
     @param rights (input/optional) An AuthorizationItemSet containing rights for which authorization is being requested.  If none are specified the resulting AuthorizationRef will authorize nothing at all.
-    @param environment (input/optional) An AuthorizationItemSet containing enviroment state used when making the autorization decision.  See the AuthorizationEnvironment type for details.
+    @param environment (input/optional) An AuthorizationItemSet containing environment state used when making the autorization decision.  See the AuthorizationEnvironment type for details.
     @param flags (input) options specified by the AuthorizationFlags enum.  set all unused bits to zero to allow for future expansion.
     @param authorization (output optional) A pointer to an AuthorizationRef to be returned.  When the returned AuthorizationRef is no longer needed AuthorizationFree should be called to prevent anyone from using the aquired rights.  If NULL is specified no new rights are returned, but the system will attempt to authorize all the requested rights and return the appropriate status.
 
@@ -359,7 +359,7 @@
 
     @param authorization (input) The authorization object on which this operation is performed.
     @param rights (input) A rights set (see AuthorizationCreate).
-    @param environment (input/optional) An AuthorizationItemSet containing enviroment state used when making the autorization decision.  See the AuthorizationEnvironment type for details.
+    @param environment (input/optional) An AuthorizationItemSet containing environment state used when making the autorization decision.  See the AuthorizationEnvironment type for details.
     @param flags (input) options specified by the AuthorizationFlags enum.  set all unused bits to zero to allow for future expansion.
     @param authorizedRights (output/optional) A pointer to a newly allocated AuthorizationInfoSet in which the authorized subset of rights are returned (authorizedRights should be deallocated by calling AuthorizationFreeItemSet() when it is no longer needed).  If NULL the only information returned is the status.  Note that if the kAuthorizationFlagPreAuthorize flag was specified rights that could not be preauthorized are returned in authorizedRights, but their flags contains the kAuthorizationFlagCanNotPreAuthorize bit.
 
Index: fpcbuild-2.4.0/fpcsrc/packages/univint/src/Sound.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/univint/src/Sound.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/univint/src/Sound.pas	(working copy)
@@ -525,7 +525,7 @@
 	kPassThrough				= $00010000;
 	kNoSoundComponentChain		= $00020000;
 
-	{ SoundParamBlock flags, usefull for OpenMixerSoundComponent }
+	{ SoundParamBlock flags, useful for OpenMixerSoundComponent }
 	kNoMixing					= $01;							{ don't mix source }
 	kNoSampleRateConversion		= $02;							{ don't convert sample rate (i.e. 11 kHz -> 22 kHz) }
 	kNoSampleSizeConversion		= $04;							{ don't convert sample size (i.e. 16 -> 8) }
Index: fpcbuild-2.4.0/fpcsrc/packages/univint/src/CFURL.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/univint/src/CFURL.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/univint/src/CFURL.pas	(working copy)
@@ -431,7 +431,7 @@
 { are not legal URL characters (based on RFC 2396), plus any characters }
 { in legalURLCharactersToBeEscaped, less any characters in }
 { charactersToLeaveUnescaped.  To simply correct any non-URL characters }
-{ in an otherwise correct URL string, do: }
+{ in anotherwise correct URL string, do: }
 
 { newString = CFURLCreateStringByAddingPercentEscapes(NULL, origString, NULL, NULL, kCFStringEncodingUTF8); }
 function CFURLCreateStringByAddingPercentEscapes( allocator: CFAllocatorRef; originalString: CFStringRef; charactersToLeaveUnescaped: CFStringRef; legalURLCharactersToBeEscaped: CFStringRef; encoding: CFStringEncoding ): CFStringRef; external name '_CFURLCreateStringByAddingPercentEscapes';
Index: fpcbuild-2.4.0/fpcsrc/packages/univint/src/HIView.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/univint/src/HIView.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/univint/src/HIView.pas	(working copy)
@@ -2979,7 +2979,7 @@
  *  
  *  Discussion:
  *    Advances the focus to the next most appropriate view. Unless
- *    overriden in some fashion (either by overriding certain carbon
+ *    overridden in some fashion (either by overriding certain carbon
  *    events or using the HIViewSetNextFocus API), the Toolbox will use
  *    a spacially determinant method of focusing, attempting to focus
  *    left to right, top to bottom in a window, taking groups of
Index: fpcbuild-2.4.0/fpcsrc/packages/univint/src/MacOSAll.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/univint/src/MacOSAll.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/univint/src/MacOSAll.pas	(working copy)
@@ -15159,7 +15159,7 @@
 		The reason for passing in this flag is to provide correct audit trail information and to avoid unnecessary user interaction.
 
     @param rights (input/optional) An AuthorizationItemSet containing rights for which authorization is being requested.  If none are specified the resulting AuthorizationRef will authorize nothing at all.
-    @param environment (input/optional) An AuthorizationItemSet containing enviroment state used when making the autorization decision.  See the AuthorizationEnvironment type for details.
+    @param environment (input/optional) An AuthorizationItemSet containing environment state used when making the autorization decision.  See the AuthorizationEnvironment type for details.
     @param flags (input) options specified by the AuthorizationFlags enum.  set all unused bits to zero to allow for future expansion.
     @param authorization (output optional) A pointer to an AuthorizationRef to be returned.  When the returned AuthorizationRef is no longer needed AuthorizationFree should be called to prevent anyone from using the aquired rights.  If NULL is specified no new rights are returned, but the system will attempt to authorize all the requested rights and return the appropriate status.
 
@@ -15213,7 +15213,7 @@
 
     @param authorization (input) The authorization object on which this operation is performed.
     @param rights (input) A rights set (see AuthorizationCreate).
-    @param environment (input/optional) An AuthorizationItemSet containing enviroment state used when making the autorization decision.  See the AuthorizationEnvironment type for details.
+    @param environment (input/optional) An AuthorizationItemSet containing environment state used when making the autorization decision.  See the AuthorizationEnvironment type for details.
     @param flags (input) options specified by the AuthorizationFlags enum.  set all unused bits to zero to allow for future expansion.
     @param authorizedRights (output/optional) A pointer to a newly allocated AuthorizationInfoSet in which the authorized subset of rights are returned (authorizedRights should be deallocated by calling AuthorizationFreeItemSet() when it is no longer needed).  If NULL the only information returned is the status.  Note that if the kAuthorizationFlagPreAuthorize flag was specified rights that could not be preauthorized are returned in authorizedRights, but their flags contains the kAuthorizationFlagCanNotPreAuthorize bit.
 
@@ -75251,7 +75251,7 @@
     @constant       kAudioHardwarePropertyPlugInForBundleID
                         Using an AudioValueTranslation structure, this property translates the input
                         CFString containing a bundle ID into the AudioObjectID of the AudioPlugIn
-                        that corresponds to it. This property will return kAudioObjectUnkown if the
+                        that corresponds to it. This property will return kAudioObjectUnknown if the
                         given bundle ID doesn't match any AudioPlugIns.
 }
 const
@@ -77465,7 +77465,7 @@
 { are not legal URL characters (based on RFC 2396), plus any characters }
 { in legalURLCharactersToBeEscaped, less any characters in }
 { charactersToLeaveUnescaped.  To simply correct any non-URL characters }
-{ in an otherwise correct URL string, do: }
+{ in anotherwise correct URL string, do: }
 
 { newString = CFURLCreateStringByAddingPercentEscapes(NULL, origString, NULL, NULL, kCFStringEncodingUTF8); }
 function CFURLCreateStringByAddingPercentEscapes( allocator: CFAllocatorRef; originalString: CFStringRef; charactersToLeaveUnescaped: CFStringRef; legalURLCharactersToBeEscaped: CFStringRef; encoding: CFStringEncoding ): CFStringRef; external name '_CFURLCreateStringByAddingPercentEscapes';
@@ -105421,7 +105421,7 @@
 
 { Set the next image in the image destination `idst' to be the image at
  * `index' in the image source `isrc'.  The index is zero-based. The
- * properties of the source image can be added to or overriden by supplying
+ * properties of the source image can be added to or overridden by supplying
  * additional keys/values in `properties'.  If a key in `properties' has
  * the value kCFNull, the corresponding property in the destination will be
  * removed. }
@@ -120291,7 +120291,7 @@
  }
 function DriverInstallReserveMem(drvrPtr: DRVRHeaderPtr; refNum: SInt16): OSErr; external name '_DriverInstallReserveMem';
 {
-  Note: DrvrInstall() is no longer supported, becuase it never really worked anyways.
+  Note: DrvrInstall() is no longer supported, because it never really worked anyways.
         There will soon be a DriverInstall() which does the right thing.
 
         DrvrRemove has been renamed to DriverRemove.  But, InterfaceLib for PowerPC
@@ -160022,7 +160022,7 @@
  *  
  *  Discussion:
  *    Advances the focus to the next most appropriate control. Unless
- *    overriden in some fashion (either by overriding certain carbon
+ *    overridden in some fashion (either by overriding certain carbon
  *    events or using the HIViewSetNextFocus API), the Toolbox will use
  *    a spacially determinant method of focusing, attempting to focus
  *    left to right, top to bottom in a window, taking groups of
@@ -160059,7 +160059,7 @@
  *  
  *  Discussion:
  *    Reverses the focus to the next most appropriate control. Unless
- *    overriden in some fashion (either by overriding certain carbon
+ *    overridden in some fashion (either by overriding certain carbon
  *    events or using the HIViewSetNextFocus API), the Toolbox will use
  *    a spacially determinant method of focusing, attempting to focus
  *    left to right, top to bottom in a window, taking groups of
@@ -190186,7 +190186,7 @@
  *  
  *  Discussion:
  *    Advances the focus to the next most appropriate view. Unless
- *    overriden in some fashion (either by overriding certain carbon
+ *    overridden in some fashion (either by overriding certain carbon
  *    events or using the HIViewSetNextFocus API), the Toolbox will use
  *    a spacially determinant method of focusing, attempting to focus
  *    left to right, top to bottom in a window, taking groups of
@@ -229828,7 +229828,7 @@
 	kPassThrough				= $00010000;
 	kNoSoundComponentChain		= $00020000;
 
-	{ SoundParamBlock flags, usefull for OpenMixerSoundComponent }
+	{ SoundParamBlock flags, useful for OpenMixerSoundComponent }
 	kNoMixing					= $01;							{ don't mix source }
 	kNoSampleRateConversion		= $02;							{ don't convert sample rate (i.e. 11 kHz -> 22 kHz) }
 	kNoSampleSizeConversion		= $04;							{ don't convert sample size (i.e. 16 -> 8) }
Index: fpcbuild-2.4.0/fpcsrc/packages/fcl-base/src/unix/daemonapp.inc
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/fcl-base/src/unix/daemonapp.inc	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/fcl-base/src/unix/daemonapp.inc	(working copy)
@@ -31,7 +31,7 @@
     end
   else
     begin
-    // Here we are in the daemonized proces
+    // Here we are in the daemonized process
     sid := FpSetsid;
     if sid < 0 then
       raise Exception.Create(SErrFailedToFork);
Index: fpcbuild-2.4.0/fpcsrc/packages/fcl-base/examples/testez.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/fcl-base/examples/testez.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/fcl-base/examples/testez.pp	(working copy)
@@ -73,7 +73,7 @@
 // To determine how many environment variables have been stored you can
 // use the VariableCount property.
 //
-// The following procedure loops through all of the enviroment variables
+// The following procedure loops through all of the environment variables
 // and prints them back to the client. This is a good CGI example to
 // show you exactly what information you have to work with.
 
Index: fpcbuild-2.4.0/fpcsrc/packages/xforms/examples/yesno.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/xforms/examples/yesno.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/xforms/examples/yesno.pp	(working copy)
@@ -1,7 +1,7 @@
 Program yesno;
 {
   A box with two buttons and a string. Simple boxes like this
-   are very usefull for asking questions
+   are very useful for asking questions
 }
 
 Uses xforms;
Index: fpcbuild-2.4.0/fpcsrc/packages/xforms/examples/borderwidth.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/xforms/examples/borderwidth.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/xforms/examples/borderwidth.pp	(working copy)
@@ -81,7 +81,7 @@
 end;
 
 begin
-   { application default. Can be overriden by the command line options }
+   { application default. Can be overridden by the command line options }
    fl_set_border_width(-2);
 
    fl_initialize(@argc, argv, 'FormDemo', nil, 0);
Index: fpcbuild-2.4.0/fpcsrc/packages/amunits/src/coreunits/colorwheel.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/amunits/src/coreunits/colorwheel.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/amunits/src/coreunits/colorwheel.pas	(working copy)
@@ -67,7 +67,7 @@
     WHEEL_Green          = (WHEEL_Dummy+6) ;  { set/get Green     }
     WHEEL_Blue           = (WHEEL_Dummy+7) ;  { set/get Blue              }
     WHEEL_RGB            = (WHEEL_Dummy+8) ;  { set/get ColorWheelRGB     }
-    WHEEL_Screen         = (WHEEL_Dummy+9) ;  { init screen/enviroment    }
+    WHEEL_Screen         = (WHEEL_Dummy+9) ;  { init screen/environment    }
     WHEEL_Abbrv          = (WHEEL_Dummy+10);  { "GCBMRY" if English       }
     WHEEL_Donation       = (WHEEL_Dummy+11);  { colors donated by app     }
     WHEEL_BevelBox       = (WHEEL_Dummy+12);  { inside a bevel box        }
Index: fpcbuild-2.4.0/fpcsrc/packages/os2units/src/lvm.pas
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/os2units/src/lvm.pas	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/os2units/src/lvm.pas	(working copy)
@@ -4982,7 +4982,7 @@
 //*          exception to this is if ProcessItem sets *Error to       */
 //*          DLIST_SEARCH_COMPLETE, in which case ForEachItem         */
 //*          terminates and sets *Error to DLIST_SUCCESS.  This is    */
-//*          usefull for using ForEachItem to search a list and then  */
+//*          useful for using ForEachItem to search a list and then  */
 //*          terminating the search once the desired item is found.   */
 //*                                                                   */
 //*          A word about the Parameters parameter.  This parameter   */
@@ -5083,7 +5083,7 @@
 //*          exception to this is if KillItem sets *Error to          */
 //*          DLIST_SEARCH_COMPLETE, in which case KillItem            */
 //*          terminates and sets *Error to DLIST_SUCCESS.  This is    */
-//*          usefull for using KillItem to search a list and then     */
+//*          useful for using KillItem to search a list and then     */
 //*          terminating the search once the desired item is found.   */
 //*                                                                   */
 //*          A word about the Parameters parameter.  This parameter   */
Index: fpcbuild-2.4.0/fpcsrc/packages/os2units/readme.txt
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/os2units/readme.txt	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/os2units/readme.txt	(working copy)
@@ -81,7 +81,7 @@
    SOM and WPS toolkits will be presented)
 c) SEAL library interface (seal.pas) www.netlabs.org/hobbes.nmsu.edu
    SEAL is module player library. At the present time SEAL not developing
-   anymore (for all platforms), but still very usefull for mudule music fans.
+   anymore (for all platforms), but still very useful for mudule music fans.
 d) DualMode Library (dual.pas) www.netlabs.org
    DualMode library allows to use common access method as for fullscreen (MGL)
    as for windowed (DIVE) video modes.
Index: fpcbuild-2.4.0/fpcsrc/packages/libxml/src/schemasInternals.inc
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/libxml/src/schemasInternals.inc	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/libxml/src/schemasInternals.inc	(working copy)
@@ -556,7 +556,7 @@
 (**
  * XML_SCHEMAS_TYPE_REDEFINING:
  *
- * The type redefines an other type.
+ * The type redefines another type.
  *)
 (*   XML_SCHEMAS_TYPE_REDEFINING    = (1 shl 31); *)
 {$ENDIF}
@@ -872,7 +872,7 @@
 (**
  * XML_SCHEMAS_INCLUDING_CONVERT_NS:
  *
- * the schema is currently including an other schema with
+ * the schema is currently including another schema with
  * no target namespace.
  *)
   XML_SCHEMAS_INCLUDING_CONVERT_NS            = (1 shl 9);
Index: fpcbuild-2.4.0/fpcsrc/packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/FireAndSprites.pp
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/FireAndSprites.pp	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/libndsfpc/examples/graphics/Sprites/fire_and_sprites/FireAndSprites.pp	(working copy)
@@ -88,7 +88,7 @@
   //load our ball pcx file into an image
   loadPCX(pcuint8(ball_pcx), @ball);
 
-  //tile it so it is usefull as sprite data
+  //tile it so it is useful as sprite data
   imageTileData(@ball);
 
   // Sprite initialisation
Index: fpcbuild-2.4.0/fpcsrc/packages/gtk2/src/gtk+/gtk/gtkrc.inc
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/gtk2/src/gtk+/gtk/gtkrc.inc	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/gtk2/src/gtk+/gtk/gtkrc.inc	(working copy)
@@ -41,7 +41,7 @@
      of brackets. Returns G_TOKEN_NONE if succesful, otherwise returns
      the token it expected but didn't get.
     }
-{ Combine RC style data from src into dest. If overriden, this
+{ Combine RC style data from src into dest. If overridden, this
      function should chain to the parent.
     }
 { Create an empty style suitable to this RC style
Index: fpcbuild-2.4.0/fpcsrc/packages/gtk2/src/glib/gutils.inc
===================================================================
--- fpcbuild-2.4.0/fpcsrc/packages/gtk2/src/glib/gutils.inc	(revision 14817)
+++ fpcbuild-2.4.0/fpcsrc/packages/gtk2/src/glib/gutils.inc	(working copy)
@@ -105,7 +105,7 @@
        must not be freed.  }
     function g_getenv(variable:Pgchar):Pgchar;cdecl;external gliblib name 'g_getenv';
 
-    { we try to provide a usefull equivalent for ATEXIT if it is
+    { we try to provide a useful equivalent for ATEXIT if it is
        not defined, but use is actually abandoned. people should
        use g_atexit() instead.
       }
Index: fpcbuild-2.4.0/install/doc/readme.txt
===================================================================
--- fpcbuild-2.4.0/install/doc/readme.txt	(revision 751)
+++ fpcbuild-2.4.0/install/doc/readme.txt	(working copy)
@@ -88,7 +88,7 @@
 - smartlinking (not yet supported under Mac OS X)
 - support for the GNU debugger
 - integrated development environment (disabled by default on Mac OS X)
-  - powerfull user friendly Wordstar compatible multi file editor
+  - powerful user friendly Wordstar compatible multi file editor
   - context sensitive help supports help files in HTML, Windows HLP and
     Borland TPH format.
   - debugger on most platforms
Index: fpcbuild-2.4.0/install/man/man1/fpc.1
===================================================================
--- fpcbuild-2.4.0/install/man/man1/fpc.1	(revision 751)
+++ fpcbuild-2.4.0/install/man/man1/fpc.1	(working copy)
@@ -51,7 +51,7 @@
 
 .SH Usage
 
-The compilation proces is started by typing
+The compilation process is started by typing
 .I fpc
 followed by a sourcefile name (normally with .pas or .pp extension). Before processing the actual processing of the source file,
 .BR fpc.cfg (5)
Index: fpcbuild-2.4.0/install/man/man1/fp.1
===================================================================
--- fpcbuild-2.4.0/install/man/man1/fp.1	(revision 751)
+++ fpcbuild-2.4.0/install/man/man1/fp.1	(working copy)
@@ -1,6 +1,6 @@
 .TH fp 1 "14 apr 2006" "Free Pascal" "Free Pascal IDE"
 .SH NAME
-fp \- Free Pascal Compiler (FPC) integrated development enviroment
+fp \- Free Pascal Compiler (FPC) integrated development environment
 
 .SH SYNOPSIS
 
@@ -44,7 +44,7 @@
 .SH Usage
 
 The user interface of the IDE has been designed to be similar to Turbo Pascal.
-It provides the user with a user friendly, but rather powerfull editor, an extensive
+It provides the user with a user friendly, but rather powerful editor, an extensive
 on-line help system and a debugger.
 
 A text mode windowing system is the base of the user interface. The mouse is supported,
@@ -57,7 +57,7 @@
 
 No help files are provided by default. The user must download the Free Pascal documentation
 in HTML format and install it into the IDE using the Help->Files menu. Turbo Pascal .tph
-files can also be installed in this menu and can be usefull for source code that ships with
+files can also be installed in this menu and can be useful for source code that ships with
 .BR .tph files as documentation.
 
 .SH Character sets
Index: fpcbuild-2.4.0/demo/netware/check.pp
===================================================================
--- fpcbuild-2.4.0/demo/netware/check.pp	(revision 751)
+++ fpcbuild-2.4.0/demo/netware/check.pp	(working copy)
@@ -18,7 +18,7 @@
 {$Copyright (c) 2002 the FreePascal development team}
 
 
-{ using crt automaticly calls _SetAutoScreenDestructionMode (TRUE);
+{ using crt automatically calls _SetAutoScreenDestructionMode (TRUE);
   so no "Press any key to close screeen" will be shown by netware }
 uses crt;