Home Explore Help
Sign In
pascal
/
fpc
mirror of https://gitlab.com/freepascal.org/fpc/source.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

* some more occured->occurred, mostly in comments

git-svn-id: trunk@35122 -
marco 8 years ago
parent
dce9b9c68c
commit
f4213124f2
15 changed files with 23 additions and 23 deletions
Unified View Show Diff Stats
  1. 1 1
      packages/amunits/src/otherlibs/triton.pas
  2. 2 2
      packages/amunits/src/otherlibs/xadmaster.pas
  3. 2 2
      packages/arosunits/src/amigados.pas
  4. 1 1
      packages/httpd13/src/ap.inc
  5. 1 1
      packages/libmicrohttpd/examples/largepost.pp
  6. 1 1
      packages/libmicrohttpd/examples/responseheaders.pp
  7. 2 2
      packages/libndsfpc/src/nds/arm7/clock.inc
  8. 1 1
      packages/os2units/src/som.pas
  9. 2 2
      packages/paszlib/src/gzio.pas
  10. 1 1
      packages/rtl-console/src/win/winevent.pp
  11. 1 1
      packages/rtl-objpas/src/inc/fmtbcd.pp
  12. 1 1
      packages/symbolic/examples/easyevalexample.pp
  13. 1 1
      packages/winceunits/src/ras.pp
  14. 3 3
      packages/x11/src/xinput.pp
  15. 3 3
      packages/zorba/src/xqc.pas

+ 1 - 1
packages/amunits/src/otherlibs/triton.pas
View File 

@@ -221,7 +221,7 @@ correction factor *}
 
 
 
 {* Message classes *}
 
 {* Message classes *}
 
 CONST   TRMS_CLOSEWINDOW        = 1;  {* The window should be closed *}
 
 CONST   TRMS_CLOSEWINDOW        = 1;  {* The window should be closed *}
 
-        TRMS_ERROR              = 2;  {* An error occured. Error code in trm_Data *}
 
+        TRMS_ERROR              = 2;  {* An error occurred. Error code in trm_Data *}
 
         TRMS_NEWVALUE           = 3;  {* Object's VALUE has changed. New VALUE in
 
         TRMS_NEWVALUE           = 3;  {* Object's VALUE has changed. New VALUE in
 
 trm_Data *}
 
 trm_Data *}
 
         TRMS_ACTION             = 4;  {* Object has triggered an action *}
 
         TRMS_ACTION             = 4;  {* Object has triggered an action *}

+ 2 - 2
packages/amunits/src/otherlibs/xadmaster.pas
View File 

@@ -220,7 +220,7 @@ const
 
   { do not create XADERR_EMPTY (V8)  }
 
   { do not create XADERR_EMPTY (V8)  }
 
      XAD_NOEMPTYERROR = TAG_USER + 181;
 
      XAD_NOEMPTYERROR = TAG_USER + 181;
 
   { tags for xadFreeHookAccess (V8)  }
 
   { tags for xadFreeHookAccess (V8)  }
 
-  { error occured, call abort method (V8)  }
 
+  { error occurred, call abort method (V8)  }
 
      XAD_WASERROR = TAG_USER + 190;
 
      XAD_WASERROR = TAG_USER + 190;
 
   { tags for miscellaneous stuff  }
 
   { tags for miscellaneous stuff  }
 
   { xadArchiveInfo for stream hooks (V8)  }
 
   { xadArchiveInfo for stream hooks (V8)  }
 
@@ -314,7 +314,7 @@ const
 
      XADHC_INIT = 4;
 
      XADHC_INIT = 4;
 
   { end up hook work, free stuff  }
 
   { end up hook work, free stuff  }
 
      XADHC_FREE = 5;
 
      XADHC_FREE = 5;
 
-  { an error occured, delete partial stuff  }
 
+  { an error occurred, delete partial stuff  }
 
      XADHC_ABORT = 6;
 
      XADHC_ABORT = 6;
 
   { complete input size is needed  }
 
   { complete input size is needed  }
 
      XADHC_FULLSIZE = 7;
 
      XADHC_FULLSIZE = 7;

+ 2 - 2
packages/arosunits/src/amigados.pas
View File 

@@ -247,7 +247,7 @@ const
 
   ERROR_DIRECTORY_NOT_EMPTY      = 216; // You tried to delete a directory that still contains some files. Delete these files first.
 
   ERROR_DIRECTORY_NOT_EMPTY      = 216; // You tried to delete a directory that still contains some files. Delete these files first.
 
   ERROR_TOO_MANY_LEVELS          = 217; // A recursive directory search could not be performed, because the stack was too small.
 
   ERROR_TOO_MANY_LEVELS          = 217; // A recursive directory search could not be performed, because the stack was too small.
 
   ERROR_DEVICE_NOT_MOUNTED       = 218; // You tried to access a device that is currently not mounted.
 
   ERROR_DEVICE_NOT_MOUNTED       = 218; // You tried to access a device that is currently not mounted.
 
-  ERROR_SEEK_ERROR               = 219; // An error occured, while executing DosSeek().
 
+  ERROR_SEEK_ERROR               = 219; // An error occurred, while executing DosSeek().
 
   ERROR_COMMENT_TOO_BIG          = 220; // The supplied file comment was longer than the hardcoded length limit for file comments.
 
   ERROR_COMMENT_TOO_BIG          = 220; // The supplied file comment was longer than the hardcoded length limit for file comments.
 
   ERROR_DISK_FULL                = 221; // A write-operation could not be performed, because the volume has no space left.
 
   ERROR_DISK_FULL                = 221; // A write-operation could not be performed, because the volume has no space left.
 
   ERROR_DELETE_PROTECTED         = 222; // You tried to delete a delete-protected object.
 
   ERROR_DELETE_PROTECTED         = 222; // You tried to delete a delete-protected object.
 
@@ -269,7 +269,7 @@ const
 
   ERROR_RECORD_NOT_LOCKED         = 240; // You tried to access a record that was not locked.
 
   ERROR_RECORD_NOT_LOCKED         = 240; // You tried to access a record that was not locked.
 
   ERROR_LOCK_COLLISION            = 241; // Somebody already locked a part of the record, you wanted to lock.
 
   ERROR_LOCK_COLLISION            = 241; // Somebody already locked a part of the record, you wanted to lock.
 
   ERROR_LOCK_TIMEOUT              = 242; // LockRecord() timed out.
 
   ERROR_LOCK_TIMEOUT              = 242; // LockRecord() timed out.
 
-  ERROR_UNLOCK_ERROR              = 243; // An error occured, while unlocking a record.
 
+  ERROR_UNLOCK_ERROR              = 243; // An error occurred, while unlocking a record.
 
 
 
 { more error codes are defined in dosasl.h and filesystem.h }
 
 { more error codes are defined in dosasl.h and filesystem.h }

+ 1 - 1
packages/httpd13/src/ap.inc
View File 

@@ -123,7 +123,7 @@ function ap_vformatter(flush_func: flush_func_t;
 
  * is the number of characters placed in the buffer, excluding the
 
  * is the number of characters placed in the buffer, excluding the
 
  * terminating NUL. All this implies that, at most, (len-1) characters
 
  * terminating NUL. All this implies that, at most, (len-1) characters
 
  * will be copied over; if the return value is >= len, then truncation
 
  * will be copied over; if the return value is >= len, then truncation
 
- * occured.
 
+ * occurred.
 
  *
 
  *
 
  * In no event does ap_snprintf return a negative number.
 
  * In no event does ap_snprintf return a negative number.
 
  }
 
  }

+ 1 - 1
packages/libmicrohttpd/examples/largepost.pp
View File 

@@ -40,7 +40,7 @@ var
 
   BusyPage: Pcchar = '<html><body>This server is busy, please try again later.</body></html>';
 
   BusyPage: Pcchar = '<html><body>This server is busy, please try again later.</body></html>';
 
   CompletePage: Pcchar = '<html><body>The upload has been completed.</body></html>';
 
   CompletePage: Pcchar = '<html><body>The upload has been completed.</body></html>';
 
   ErrorPage: Pcchar = '<html><body>This doesn''t seem to be right.</body></html>';
 
   ErrorPage: Pcchar = '<html><body>This doesn''t seem to be right.</body></html>';
 
-  ServerErrorPage: Pcchar = '<html><body>An internal server error has occured.</body></html>';
 
+  ServerErrorPage: Pcchar = '<html><body>An internal server error has occurred.</body></html>';
 
   FileExistsPage: Pcchar = '<html><body>This file already exists.</body></html>';
 
   FileExistsPage: Pcchar = '<html><body>This file already exists.</body></html>';
 
 
 
   function SendPage(AConnection: PMHD_Connection; APage: Pcchar; AStatusCode: cint): cint;
 
   function SendPage(AConnection: PMHD_Connection; APage: Pcchar; AStatusCode: cint): cint;

+ 1 - 1
packages/libmicrohttpd/examples/responseheaders.pp
View File 

@@ -19,7 +19,7 @@ const
 
     AUrl: Pcchar; AMethod: Pcchar; AVersion: Pcchar; AUploadData: Pcchar;
 
     AUrl: Pcchar; AMethod: Pcchar; AVersion: Pcchar; AUploadData: Pcchar;
 
     AUploadDataSize: Psize_t; AConCls: PPointer): cint; cdecl;
 
     AUploadDataSize: Psize_t; AConCls: PPointer): cint; cdecl;
 
   const
 
   const
 
-    errorstr: Pcchar = '<html><body>An internal server error has occured!</body></html>';
 
+    errorstr: Pcchar = '<html><body>An internal server error has occurred!</body></html>';
 
   var
 
   var
 
     VFd: cint;
 
     VFd: cint;
 
     VReturn: cint;
 
     VReturn: cint;

+ 2 - 2
packages/libndsfpc/src/nds/arm7/clock.inc
View File 

@@ -9,8 +9,8 @@ const
 
   READ_STATUS_REG1   = $61;
 
   READ_STATUS_REG1   = $61;
 
   STATUS_POC       = (1 shl 7);  // read-only, cleared by reading (1 if just powered on)
 
   STATUS_POC       = (1 shl 7);  // read-only, cleared by reading (1 if just powered on)
 
   STATUS_BLD       = (1 shl 6);  // read-only, cleared by reading (1 if power dropped below the safety threshold)
 
   STATUS_BLD       = (1 shl 6);  // read-only, cleared by reading (1 if power dropped below the safety threshold)
 
-  STATUS_INT2      = (1 shl 5);  // read-only, INT2 has occured
 
-  STATUS_INT1      = (1 shl 4);  // read-only, INT1 has occured
 
+  STATUS_INT2      = (1 shl 5);  // read-only, INT2 has occurred
 
+  STATUS_INT1      = (1 shl 4);  // read-only, INT1 has occurred
 
   STATUS_SC1       = (1 shl 3);  // R/W scratch bit
 
   STATUS_SC1       = (1 shl 3);  // R/W scratch bit
 
   STATUS_SC0       = (1 shl 2);  // R/W scratch bit
 
   STATUS_SC0       = (1 shl 2);  // R/W scratch bit
 
   STATUS_24HRS     = (1 shl 1);  // 24 hour mode when 1, 12 hour mode when 0
 
   STATUS_24HRS     = (1 shl 1);  // 24 hour mode when 1, 12 hour mode when 0

+ 1 - 1
packages/os2units/src/som.pas
View File 

@@ -858,7 +858,7 @@ Procedure somBeginPersistentIds; cdecl;
 
 (* space *)
 
 (* space *)
 
 (* Under normal use (where ids are static varibles) the string *)
 
 (* Under normal use (where ids are static varibles) the string *)
 
 (* associated with an id would only be freed if the code module in *)
 
 (* associated with an id would only be freed if the code module in *)
 
-(* which it occured was unloaded *)
 
+(* which it occurred was unloaded *)
 
 
 
 Procedure somEndPersistentIds; cdecl;
 
 Procedure somEndPersistentIds; cdecl;
 
   external 'som' name 'somEndPersistentIds'; {index 29}
 
   external 'som' name 'somEndPersistentIds'; {index 29}

+ 2 - 2
packages/paszlib/src/gzio.pas
View File 

@@ -1190,9 +1190,9 @@ end;
 
 
 
 { GZERROR ===================================================================
 
 { GZERROR ===================================================================
 
 
 
-  Returns the error message for the last error which occured on the
 
+  Returns the error message for the last error which occurred on the
 
    given compressed file. errnum is set to zlib error number. If an
 
    given compressed file. errnum is set to zlib error number. If an
 
-   error occured in the file system and not in the compression library,
 
+   error occurred in the file system and not in the compression library,
 
    errnum is set to Z_ERRNO and the application may consult errno
 
    errnum is set to Z_ERRNO and the application may consult errno
 
    to get the exact error code.
 
    to get the exact error code.

+ 1 - 1
packages/rtl-console/src/win/winevent.pp
View File 

@@ -29,7 +29,7 @@ interface
 
 
 
     { these procedures must be used to set the event handlers }
 
     { these procedures must be used to set the event handlers }
 
     { these doesn't do something, they signal only the        }
 
     { these doesn't do something, they signal only the        }
 
-    { the upper layer that an event occured, this event       }
 
+    { the upper layer that an event occurred, this event       }
 
     { must be handled with Win32-API function by the upper    }
 
     { must be handled with Win32-API function by the upper    }
 
     { layer                                                   }
 
     { layer                                                   }
 
     Procedure SetMouseEventHandler(p : TEventProcedure);
 
     Procedure SetMouseEventHandler(p : TEventProcedure);

+ 1 - 1
packages/rtl-objpas/src/inc/fmtbcd.pp
View File 

@@ -1612,7 +1612,7 @@ IMPLEMENTATION
 
                 if p < low ( Singles )
 
                 if p < low ( Singles )
 
                   then begin
 
                   then begin
 
                     exitloop := True;
 
                     exitloop := True;
 
-(* what to do if error occured? *)
 
+(* what to do if error occurred? *)
 
                     RAISE eBCDOverflowException.create ( 'in IntegerToBCD' );
 
                     RAISE eBCDOverflowException.create ( 'in IntegerToBCD' );
 
                    end;
 
                    end;
 
               UNTIL exitloop;
 
               UNTIL exitloop;

+ 1 - 1
packages/symbolic/examples/easyevalexample.pp
View File 

@@ -46,6 +46,6 @@ begin
 
    writeln(s,'=',QuickEvaluate(s,['A','B'],[a,b]):10:1,' with A=',a:0:1,' and B=',b);
 
    writeln(s,'=',QuickEvaluate(s,['A','B'],[a,b]):10:1,' with A=',a:0:1,' and B=',b);
 
  except
 
  except
 
    on E:Exception do
 
    on E:Exception do
 
-     Writeln('An exception occured: ',e.message);
 
+     Writeln('An exception occurred: ',e.message);
 
    end;
 
    end;
 
 end.
 
 end.

+ 1 - 1
packages/winceunits/src/ras.pp
View File 

@@ -676,7 +676,7 @@ type
 
 {$IFDEF WINCE} // #ifdef UNDER_CE
 
 {$IFDEF WINCE} // #ifdef UNDER_CE
 
 
 
 // This structure is used by the RnaApp application on WINCE
 
 // This structure is used by the RnaApp application on WINCE
 
-// to signal when a connection has occured.
 
+// to signal when a connection has occurred.
 
 
 
 type
 
 type
 
      tagRNAAppInfo = record
 
      tagRNAAppInfo = record

+ 3 - 3
packages/x11/src/xinput.pp
View File 

@@ -121,7 +121,7 @@ type
 
     display: PDisplay;           { Display the event was read from }
 
     display: PDisplay;           { Display the event was read from }
 
     window: TWindow;             { "event" window reported relative to }
 
     window: TWindow;             { "event" window reported relative to }
 
     deviceid: TXID;
 
     deviceid: TXID;
 
-    root: TWindow;               { root window event occured on }
 
+    root: TWindow;               { root window event occurred on }
 
     subwindow: TWindow;          { child window }
 
     subwindow: TWindow;          { child window }
 
     time: TTime;                 { milliseconds }
 
     time: TTime;                 { milliseconds }
 
     x, y: cint;                  { x, y coordinates in event window }
 
     x, y: cint;                  { x, y coordinates in event window }
 
@@ -156,7 +156,7 @@ type
 
     display: PDisplay;          { Display the event was read from }
 
     display: PDisplay;          { Display the event was read from }
 
     window: TWindow;            { "event" window reported relative to }
 
     window: TWindow;            { "event" window reported relative to }
 
     deviceid: TXID;
 
     deviceid: TXID;
 
-    root: TWindow;              { root window that the event occured on }
 
+    root: TWindow;              { root window that the event occurred on }
 
     subwindow: TWindow;         { child window }
 
     subwindow: TWindow;         { child window }
 
     time: TTime;                { milliseconds }
 
     time: TTime;                { milliseconds }
 
     x, y: cint;                 { x, y coordinates in event window }
 
     x, y: cint;                 { x, y coordinates in event window }
 
@@ -191,7 +191,7 @@ type
 
     display: PDisplay;         { Display the event was read from }
 
     display: PDisplay;         { Display the event was read from }
 
     window: TWindow;           { "event" window reported relative to }
 
     window: TWindow;           { "event" window reported relative to }
 
     deviceid: TXID;
 
     deviceid: TXID;
 
-    root: TWindow;             { root window that the event occured on }
 
+    root: TWindow;             { root window that the event occurred on }
 
     subwindow: TWindow;        { child window }
 
     subwindow: TWindow;        { child window }
 
     time: TTime;               { milliseconds }
 
     time: TTime;               { milliseconds }
 
     x, y: cint;                { x, y coordinates in event window }
 
     x, y: cint;                { x, y coordinates in event window }

+ 3 - 3
packages/zorba/src/xqc.pas
View File 

@@ -1990,7 +1990,7 @@ type
 
       * \param length The length of the buffer
 
       * \param length The length of the buffer
 
       *
 
       *
 
       * \return The number of bytes read - this will be less than length if the end of the input is reached
 
       * \return The number of bytes read - this will be less than length if the end of the input is reached
 
-      *         or -1 if an error occured
 
+      *         or -1 if an error occurred
 
       *
 
       *
 
       *)
 
       *)
 
     read: function(stream: XQC_InputStream; const buf: pchar; length: cuint): cint; extdecl;
 
     read: function(stream: XQC_InputStream; const buf: pchar; length: cuint): cint; extdecl;
 
@@ -2035,8 +2035,8 @@ type
 
      *                   (e.g. for errors not defined in the spec).
 
      *                   (e.g. for errors not defined in the spec).
 
      * \param description A detailed description of the error or an empty string if no description is available.
 
      * \param description A detailed description of the error or an empty string if no description is available.
 
      * \param query_uri The uri of the query causing the error or an empty string if no uri is available for the query.
 
      * \param query_uri The uri of the query causing the error or an empty string if no uri is available for the query.
 
-     * \param line The line number of the query where the error occured.
 
-     * \param components The column number in the line in the query where the error occured.
 
+     * \param line The line number of the query where the error occurred.
 
+     * \param components The column number in the line in the query where the error occurred.
 
      *)
 
      *)
 
     error: procedure(handler: XQC_ErrorHandler; error: XQUERY_ERROR; const local_name, description,
 
     error: procedure(handler: XQC_ErrorHandler; error: XQUERY_ERROR; const local_name, description,
 
       query_uri: pchar; line, column: cuint); extdecl;
 
       query_uri: pchar; line, column: cuint); extdecl;