diff --git a/acinclude.m4 b/acinclude.m4 index 3daa102e..69adc0f0 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -144,7 +144,7 @@ int main (int argc, char *argv[]) echo "*** If you have an old version installed, it is best to remove it, although" echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means SDL was incorrectly installed" + echo "*** exact error that occurred. This usually means SDL was incorrectly installed" echo "*** or that you have moved SDL since it was installed. In the latter case, you" echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) CFLAGS="$ac_save_CFLAGS" diff --git a/src/cpu/core_dyn_x86/cache.h b/src/cpu/core_dyn_x86/cache.h index ca96bef8..71a6513d 100644 --- a/src/cpu/core_dyn_x86/cache.h +++ b/src/cpu/core_dyn_x86/cache.h @@ -517,7 +517,7 @@ static void cache_init(bool enable) { #if (C_HAVE_MPROTECT) if(mprotect(cache_code_link_blocks,CACHE_TOTAL+CACHE_MAXSIZE+PAGESIZE_TEMP,PROT_WRITE|PROT_READ|PROT_EXEC)) - LOG_MSG("Setting excute permission on the code cache has failed!"); + LOG_MSG("Setting execute permission on the code cache has failed!"); #endif CacheBlock * block=cache_getblock(); cache.block.first=block; @@ -612,7 +612,7 @@ static void cache_reset(void) { #if (C_HAVE_MPROTECT) if(mprotect(cache_code_link_blocks,CACHE_TOTAL+CACHE_MAXSIZE+PAGESIZE_TEMP,PROT_WRITE|PROT_READ|PROT_EXEC)) - LOG_MSG("Setting excute permission on the code cache has failed!"); + LOG_MSG("Setting execute permission on the code cache has failed!"); #endif } diff --git a/src/cpu/core_dynrec/cache.h b/src/cpu/core_dynrec/cache.h index b1f705c7..4158ff31 100644 --- a/src/cpu/core_dynrec/cache.h +++ b/src/cpu/core_dynrec/cache.h @@ -603,7 +603,7 @@ static void cache_init(bool enable) { #if (C_HAVE_MPROTECT) if(mprotect(cache_code_link_blocks,CACHE_TOTAL+CACHE_MAXSIZE+PAGESIZE_TEMP,PROT_WRITE|PROT_READ|PROT_EXEC)) - LOG_MSG("Setting excute permission on the code cache has failed"); + LOG_MSG("Setting execute permission on the code cache has failed"); #endif CacheBlockDynRec * block=cache_getblock(); cache.block.first=block; diff --git a/src/dos/drive_fat.cpp b/src/dos/drive_fat.cpp index a58ae1e7..1332285f 100644 --- a/src/dos/drive_fat.cpp +++ b/src/dos/drive_fat.cpp @@ -737,7 +737,7 @@ fatDrive::fatDrive(const char *sysFilename, Bit32u bytesector, Bit32u cylsector, } } - if(m==4) LOG_MSG("No good partiton found in image."); + if(m==4) LOG_MSG("No good partition found in image."); partSectOff = startSector; } else { diff --git a/src/hardware/ipx.cpp b/src/hardware/ipx.cpp index 58317cdb..d9379557 100644 --- a/src/hardware/ipx.cpp +++ b/src/hardware/ipx.cpp @@ -854,7 +854,7 @@ public: // Help on connect command if(strcasecmp("connect", helpStr) == 0) { WriteOut("IPXNET CONNECT opens a connection to an IPX tunneling server running on another\n"); - WriteOut("DosBox session. The \"address\" parameter specifies the IP address or host name\n"); + WriteOut("DOSBox session. The \"address\" parameter specifies the IP address or host name\n"); WriteOut("of the server computer. One can also specify the UDP port to use. By default\n"); WriteOut("IPXNET uses port 213, the assigned IANA port for IPX tunneling, for its\nconnection.\n\n"); WriteOut("The syntax for IPXNET CONNECT is:\n\n"); @@ -870,9 +870,9 @@ public: } // Help on the startserver command if(strcasecmp("startserver", helpStr) == 0) { - WriteOut("IPXNET STARTSERVER starts and IPX tunneling server on this DosBox session. By\n"); + WriteOut("IPXNET STARTSERVER starts and IPX tunneling server on this DOSBox session. By\n"); WriteOut("default, the server will accept connections on UDP port 213, though this can be\n"); - WriteOut("changed. Once the server is started, DosBox will automatically start a client\n"); + WriteOut("changed. Once the server is started, DOSBox will automatically start a client\n"); WriteOut("connection to the IPX tunneling server.\n\n"); WriteOut("The syntax for IPXNET STARTSERVER is:\n\n"); WriteOut("IPXNET STARTSERVER \n\n"); @@ -880,9 +880,9 @@ public: } // Help on the stop server command if(strcasecmp("stopserver", helpStr) == 0) { - WriteOut("IPXNET STOPSERVER stops the IPX tunneling server running on this DosBox\nsession."); + WriteOut("IPXNET STOPSERVER stops the IPX tunneling server running on this DOSBox\nsession."); WriteOut(" Care should be taken to ensure that all other connections have\nterminated "); - WriteOut("as well sinnce stoping the server may cause lockups on other\nmachines still using "); + WriteOut("as well since stopping the server may cause lockups on other\nmachines still using "); WriteOut("the IPX tunneling server.\n\n"); WriteOut("The syntax for IPXNET STOPSERVER is:\n\n"); WriteOut("IPXNET STOPSERVER\n\n"); @@ -899,7 +899,7 @@ public: } // Help on the status command if(strcasecmp("status", helpStr) == 0) { - WriteOut("IPXNET STATUS reports the current state of this DosBox's sessions IPX tunneling\n"); + WriteOut("IPXNET STATUS reports the current state of this DOSBox's sessions IPX tunneling\n"); WriteOut("network. For a list of the computers connected to the network use the IPXNET \n"); WriteOut("PING command.\n\n"); WriteOut("The syntax for IPXNET STATUS is:\n\n"); @@ -910,7 +910,7 @@ public: void Run(void) { - WriteOut("IPX Tunneling utility for DosBox\n\n"); + WriteOut("IPX Tunneling utility for DOSBox\n\n"); if(!cmd->GetCount()) { WriteOut("The syntax of this command is:\n\n"); WriteOut("IPXNET [ CONNECT | DISCONNECT | STARTSERVER | STOPSERVER | PING | HELP |\n STATUS ]\n\n"); @@ -960,7 +960,7 @@ public: } if(strcasecmp("stopserver", temp_line.c_str()) == 0) { if(!isIpxServer) { - WriteOut("IPX Tunneling Server not running in this DosBox session.\n"); + WriteOut("IPX Tunneling Server not running in this DOSBox session.\n"); } else { isIpxServer = false; DisconnectFromServer(false);