diff --git a/aclocal.m4 b/aclocal.m4
index 76b33bda56..49a87b46fc 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -111,7 +111,7 @@ else
 fi
 rm -f conf$$ conf$$.file])
 
-dnl **** Create non-existent directories from config.status ****
+dnl **** Create nonexistent directories from config.status ****
 dnl
 dnl Usage: WINE_CONFIG_EXTRA_DIR(dirname)
 dnl
diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c
index c7f9f2f7a2..bdc8a60f7d 100644
--- a/dlls/advapi32/tests/crypt.c
+++ b/dlls/advapi32/tests/crypt.c
@@ -29,7 +29,7 @@
 #include "wine/test.h"
 
 static const char szRsaBaseProv[] = MS_DEF_PROV_A;
-static const char szNonExistentProv[] = "Wine Non Existent Cryptographic Provider v11.2";
+static const char szNonExistentProv[] = "Wine Nonexistent Cryptographic Provider v11.2";
 static const char szKeySet[] = "wine_test_keyset";
 static const char szBadKeySet[] = "wine_test_bad_keyset";
 #define NON_DEF_PROV_TYPE 999
diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c
index 4c7fb0e1c4..359d37028d 100644
--- a/dlls/comctl32/tests/imagelist.c
+++ b/dlls/comctl32/tests/imagelist.c
@@ -307,9 +307,9 @@ static BOOL DoTest1(void)
     ok(hicon3 != 0, "no hicon3\n");
 
     /* remove when nothing exists */
-    ok(!ImageList_Remove(himl,0),"removed non-existent icon\n");
+    ok(!ImageList_Remove(himl,0),"removed nonexistent icon\n");
     /* removing everything from an empty imagelist should succeed */
-    ok(ImageList_RemoveAll(himl),"removed non-existent icon\n");
+    ok(ImageList_RemoveAll(himl),"removed nonexistent icon\n");
 
     /* add three */
     ok(0==ImageList_AddIcon(himl, hicon1),"failed to add icon1\n");
@@ -317,7 +317,7 @@ static BOOL DoTest1(void)
     ok(2==ImageList_AddIcon(himl, hicon3),"failed to add icon3\n");
 
     /* remove an index out of range */
-    ok(!ImageList_Remove(himl,4711),"removed non-existent icon\n");
+    ok(!ImageList_Remove(himl,4711),"removed nonexistent icon\n");
 
     /* remove three */
     ok(ImageList_Remove(himl,0),"can't remove 0\n");
@@ -325,7 +325,7 @@ static BOOL DoTest1(void)
     ok(ImageList_Remove(himl,0),"can't remove 0\n");
 
     /* remove one extra */
-    ok(!ImageList_Remove(himl,0),"removed non-existent icon\n");
+    ok(!ImageList_Remove(himl,0),"removed nonexistent icon\n");
 
     /* destroy it */
     ok(ImageList_Destroy(himl),"destroy imagelist failed\n");
diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c
index cbca83ad0e..6443446473 100644
--- a/dlls/dplayx/name_server.c
+++ b/dlls/dplayx/name_server.c
@@ -267,7 +267,7 @@ void NS_InvalidateSessionCache( LPVOID lpNSInfo )
 
   if( lpCache == NULL )
   {
-    ERR( ": invalidate non existent cache\n" );
+    ERR( ": invalidate nonexistent cache\n" );
     return;
   }
 
diff --git a/dlls/kernel/tests/directory.c b/dlls/kernel/tests/directory.c
index effb1dd972..ccebad9869 100644
--- a/dlls/kernel/tests/directory.c
+++ b/dlls/kernel/tests/directory.c
@@ -213,7 +213,7 @@ static void test_CreateDirectoryA(void)
     lstrcatA(tmpdir, "Please Remove Me/Please Remove Me");
     ret = CreateDirectoryA(tmpdir, NULL);
     ok(ret == FALSE && GetLastError() == ERROR_PATH_NOT_FOUND, 
-      "CreateDirectoryA with multiple non-existent directories in path should fail\n");
+      "CreateDirectoryA with multiple nonexistent directories in path should fail\n");
     ret = RemoveDirectoryA(tmpdir);
     
 }
@@ -285,7 +285,7 @@ static void test_CreateDirectoryW(void)
     lstrcatW(tmpdir, tmp_dir_name);
     ret = CreateDirectoryW(tmpdir, NULL);
     ok(ret == FALSE && GetLastError() == ERROR_PATH_NOT_FOUND, 
-      "CreateDirectoryW with multiple non-existent directories in path should fail\n");
+      "CreateDirectoryW with multiple nonexistent directories in path should fail\n");
     ret = RemoveDirectoryW(tmpdir);
 }
 
diff --git a/dlls/kernel/tests/file.c b/dlls/kernel/tests/file.c
index c832af57a9..1b63d91659 100644
--- a/dlls/kernel/tests/file.c
+++ b/dlls/kernel/tests/file.c
@@ -690,7 +690,7 @@ static void test_CreateFileW(void)
     ok(hFile == INVALID_HANDLE_VALUE && GetLastError() == ERROR_PATH_NOT_FOUND,
        "CreateFileW(\"\") returned ret=%p error=%ld\n",hFile,GetLastError());
 
-    /* test the result of opening a non-existent driver name */
+    /* test the result of opening a nonexistent driver name */
     hFile = CreateFileW(bogus, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
                         OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
     ok(hFile == INVALID_HANDLE_VALUE && GetLastError() == ERROR_FILE_NOT_FOUND,
diff --git a/dlls/kernel/tests/mailslot.c b/dlls/kernel/tests/mailslot.c
index 2e2513a1c5..f29f75866e 100644
--- a/dlls/kernel/tests/mailslot.c
+++ b/dlls/kernel/tests/mailslot.c
@@ -51,7 +51,7 @@ static int mailslot_test()
     /* open a mailslot that doesn't exist */
     hWriter = CreateFile(szmspath, GENERIC_READ|GENERIC_WRITE,
                              FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
-    ok( hWriter == INVALID_HANDLE_VALUE, "non-existing mailslot\n");
+    ok( hWriter == INVALID_HANDLE_VALUE, "nonexistent mailslot\n");
 
     /* open a mailslot without the right name */
     hSlot = CreateMailslot( "blah", 0, 0, NULL );
diff --git a/dlls/kernel/tests/path.c b/dlls/kernel/tests/path.c
index c5cd9a3511..3d9d0a0360 100644
--- a/dlls/kernel/tests/path.c
+++ b/dlls/kernel/tests/path.c
@@ -34,9 +34,9 @@
 #define SHORTDIR "shortdir"
 #define LONGDIR "Long Directory"
 #define NONFILE_SHORT "noexist.pth"
-#define NONFILE_LONG "Non Existent File"
+#define NONFILE_LONG "NonExistent File"
 #define NONDIR_SHORT "notadir"
-#define NONDIR_LONG "Non Existent Directory"
+#define NONDIR_LONG "NonExistent Directory"
 
 #define NOT_A_VALID_DRIVE '@'
 
@@ -223,7 +223,7 @@ static void test_LongtoShortA(CHAR *teststr,CHAR *goodstr,
    characters in the filename.
      'valid' indicates whether this would be an allowed filename
      'todo' indicates that wine doesn't get this right yet.
-   NOTE: We always call this routine with a non-existent filename, so
+   NOTE: We always call this routine with a nonexistent filename, so
          Get(Short|Long)PathNameA should never pass, but GetFullPathNameA
          should.
 */
@@ -413,10 +413,10 @@ static void test_CurrentDirectoryA(CHAR *origdir, CHAR *newdir)
    so why check it again.
 */
   SetCurrentDirectoryA(newdir);
-/* Check that SetCurrentDirectory fails when a non-existent dir is specified */
+/* Check that SetCurrentDirectory fails when a nonexistent dir is specified */
   sprintf(tmpstr,"%s\\%s\\%s",newdir,SHORTDIR,NONDIR_SHORT);
   test_setdir(newdir,tmpstr,NULL,0,"check 3");
-/* Check that SetCurrentDirectory fails for a non-existent lond directory */
+/* Check that SetCurrentDirectory fails for a nonexistent lond directory */
   sprintf(tmpstr,"%s\\%s\\%s",newdir,SHORTDIR,NONDIR_LONG);
   test_setdir(newdir,tmpstr,NULL,0,"check 4");
 /* Check that SetCurrentDirectory passes with a long directory */
@@ -640,7 +640,7 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive)
   test_ValidPathA(curdir,"",tmpstr,tmpstr1,NULL,"test13");
   sprintf(tmpstr,"%s\\",LONGDIR);
   test_ValidPathA(curdir,"",tmpstr,tmpstr1,NULL,"test14");
-/* Non-existent directories */
+/* Nonexistent directories */
   sprintf(tmpstr,"%s\\",NONDIR_SHORT);
   test_ValidPathA(curdir,"",tmpstr,tmpstr1,&passfail,"test15");
   sprintf(tmpstr2,"%s\\%s",curdir_short,tmpstr);
diff --git a/dlls/lzexpand/tests/lzexpand_main.c b/dlls/lzexpand/tests/lzexpand_main.c
index b8a9f4eeb1..a365be6dc9 100644
--- a/dlls/lzexpand/tests/lzexpand_main.c
+++ b/dlls/lzexpand/tests/lzexpand_main.c
@@ -80,7 +80,7 @@ static void test_lzopenfile(void)
   DWORD retval;
   INT file;
 
-  /* Check for non-existent file. */
+  /* Check for nonexistent file. */
   file = LZOpenFile("badfilename_", &test, OF_READ);
   ok(file == LZERROR_BADINHANDLE, 
      "LZOpenFile succeeded on nonexistent file\n");
diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c
index 2138032da7..2f4c43b7a8 100644
--- a/dlls/mapi32/tests/prop.c
+++ b/dlls/mapi32/tests/prop.c
@@ -636,7 +636,7 @@ static void test_PpropFindProp(void)
            ptTypes[i]);
 
         pRet = pPpropFindProp(&pvProp, 1u, i ? ptTypes[i-1] : ptTypes[i+1]);
-        ok(pRet == NULL, "PpropFindProp[%ld]: Found non-existent propery\n",
+        ok(pRet == NULL, "PpropFindProp[%ld]: Found nonexistent propery\n",
            ptTypes[i]);
     }
 
@@ -868,11 +868,11 @@ static void test_LpValFindProp(void)
            ptTypes[i]);
 
         pRet = pLpValFindProp(PROP_TAG(ptTypes[i], 0u), 1u, &pvProp);
-        ok(pRet == NULL, "LpValFindProp[%ld]: Found non-existent propery id\n",
+        ok(pRet == NULL, "LpValFindProp[%ld]: Found nonexistent propery id\n",
            ptTypes[i]);
 
         pRet = pLpValFindProp(PROP_TAG(PT_NULL, 0u), 1u, &pvProp);
-        ok(pRet == NULL, "LpValFindProp[%ld]: Found non-existent propery id/type\n",
+        ok(pRet == NULL, "LpValFindProp[%ld]: Found nonexistent propery id/type\n",
            ptTypes[i]);
 
         pRet = pLpValFindProp(PROP_TAG(PT_NULL, 1u), 1u, &pvProp);
@@ -1257,19 +1257,19 @@ static void test_IProp(void)
     tags.aulPropTag[0] = PR_RESPONSE_REQUESTED;
     sc = IPropData_DeleteProps(lpIProp, (LPSPropTagArray)&tags, &lpProbs);
     ok(sc == E_ACCESSDENIED && !lpProbs,
-       "DeleteProps(non-existent): Expected E_ACCESSDENIED null got 0x%08lX %p\n",
+       "DeleteProps(nonexistent): Expected E_ACCESSDENIED null got 0x%08lX %p\n",
        sc, lpProbs);
 
     /* Set access to read and write */
     sc = IPropData_HrSetObjAccess(lpIProp, IPROP_READWRITE);
     ok(sc == S_OK, "SetObjAcess(WRITE): Expected S_OK got 0x%08lX\n", sc);
 
-    /* Delete non-existent item - No error */
+    /* Delete nonexistent item - No error */
     lpProbs = NULL;
     tags.aulPropTag[0] = PR_RESPONSE_REQUESTED;
     sc = IPropData_DeleteProps(lpIProp, (LPSPropTagArray)&tags, &lpProbs);
     ok(sc == S_OK && !lpProbs,
-       "DeleteProps(non-existent): Expected S_OK null got 0x%08lX %p\n",
+       "DeleteProps(nonexistent): Expected S_OK null got 0x%08lX %p\n",
        sc, lpProbs);
 
     /* Delete existing item (r/o) - No error, but lpProbs populated */
diff --git a/dlls/msi/table.c b/dlls/msi/table.c
index 8482b8b902..90051f3466 100644
--- a/dlls/msi/table.c
+++ b/dlls/msi/table.c
@@ -408,7 +408,7 @@ UINT read_table_from_storage( MSIDATABASE *db, LPCWSTR name, MSITABLE **ptable)
 
     TRACE("%s\n",debugstr_w(name));
 
-    /* non-existing tables should be interpreted as empty tables */
+    /* nonexistent tables should be interpreted as empty tables */
     t = HeapAlloc( GetProcessHeap(), 0, 
                    sizeof (MSITABLE) + lstrlenW(name)*sizeof (WCHAR) );
     if( !t )
diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c
index 11c8ce58fb..07a07e0579 100644
--- a/dlls/msrle32/msrle32.c
+++ b/dlls/msrle32/msrle32.c
@@ -157,7 +157,7 @@ static BOOL  isSupportedDIB(LPCBITMAPINFOHEADER lpbi)
   if (DIBWIDTHBYTES(*lpbi) * (DWORD)lpbi->biHeight >= (1UL << 31) - 1)
     return FALSE; /* image too big ! */
 
-  /* check for non-existent colortable for hi- and true-color DIB's */
+  /* check for nonexistent colortable for hi- and true-color DIB's */
   if (lpbi->biBitCount >= 15 && lpbi->biClrUsed > 0)
     return FALSE;
 
diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c
index e8630007fb..0a49916ea8 100644
--- a/dlls/msvcrt/environ.c
+++ b/dlls/msvcrt/environ.c
@@ -93,7 +93,7 @@ int _putenv(const char *str)
 
  ret = SetEnvironmentVariableA(name, value[0] ? value : NULL) ? 0 : -1;
 
- /* _putenv returns success on deletion of non-existent variable, unlike [Rtl]SetEnvironmentVariable */
+ /* _putenv returns success on deletion of nonexistent variable, unlike [Rtl]SetEnvironmentVariable */
  if ((ret == -1) && (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) ret = 0;
 
  /* Update the __p__environ array only when already initialized */
@@ -129,7 +129,7 @@ int _wputenv(const MSVCRT_wchar_t *str)
 
  ret = SetEnvironmentVariableW(name, value[0] ? value : NULL) ? 0 : -1;
 
- /* _putenv returns success on deletion of non-existent variable, unlike [Rtl]SetEnvironmentVariable */
+ /* _putenv returns success on deletion of nonexistent variable, unlike [Rtl]SetEnvironmentVariable */
  if ((ret == -1) && (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) ret = 0;
 
  /* Update the __p__environ array only when already initialized */
diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c
index 2197b5a8ed..87355bcdbb 100644
--- a/dlls/msvcrt/tests/environ.c
+++ b/dlls/msvcrt/tests/environ.c
@@ -23,7 +23,7 @@
 
 START_TEST(environ)
 {
-    ok( _putenv("cat=") == 0, "_putenv failed on deletion of non-existent environment variable\n" );
+    ok( _putenv("cat=") == 0, "_putenv failed on deletion of nonexistent environment variable\n" );
     ok( _putenv("cat=dog") == 0, "failed setting cat=dog\n" );
     ok( strcmp(getenv("cat"), "dog") == 0, "getenv did not return 'dog'\n" );
     ok( _putenv("cat=") == 0, "failed deleting cat\n" );
diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c
index 62c23461ea..64ae99735c 100644
--- a/dlls/quartz/acmwrapper.c
+++ b/dlls/quartz/acmwrapper.c
@@ -197,7 +197,7 @@ static HRESULT ACMWrapper_ConnectInput(TransformFilterImpl* pTransformFilter, co
             This->has = drv;
 
 	    if ((res = acmStreamSize(drv, OUTPUT_BUFFER_SIZE, &This->max_size, ACM_STREAMSIZEF_DESTINATION))) {
-		ERR("Cannot retreive input buffer size error %d!\n", res);
+		ERR("Cannot retrieve input buffer size error %d!\n", res);
 		This->max_size = INPUT_BUFFER_SIZE;
 	    }
 
diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c
index bc254e823f..857524c597 100644
--- a/dlls/rsaenh/rsaenh.c
+++ b/dlls/rsaenh/rsaenh.c
@@ -3076,7 +3076,7 @@ BOOL WINAPI RSAENH_CPGetUserKey(HCRYPTPROV hProv, DWORD dwKeySpec, HCRYPTKEY *ph
 
     if (*phUserKey == (HCRYPTKEY)INVALID_HANDLE_VALUE)
     {
-        /* MSDN: dwKeySpec parameter specifies non existent key */
+        /* MSDN: dwKeySpec parameter specifies nonexistent key */
         SetLastError(NTE_NO_KEY);
         return FALSE;
     }
diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c
index f77343c745..d0f4206c5b 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -977,7 +977,7 @@ LPITEMIDLIST WINAPI ILCreateFromPathAW (LPCVOID path)
  *  IShellFolder uses that FileSystem Bind Data object of the BindContext
  *  to pass data about the current path element to the next object. This
  *  is used to avoid having to verify the current path element on disk, so
- *  that creating an ItemIDList from a non-existent path still can work.
+ *  that creating an ItemIDList from a nonexistent path still can work.
  */
 static HRESULT WINAPI _ILParsePathW(LPCWSTR path, LPWIN32_FIND_DATAW lpFindFile,
                              BOOL bBindCtx, LPITEMIDLIST *ppidl, LPDWORD prgfInOut)
@@ -1024,7 +1024,7 @@ static HRESULT WINAPI _ILParsePathW(LPCWSTR path, LPWIN32_FIND_DATAW lpFindFile,
  * SHSimpleIDListFromPath    [SHELL32.162]
  *
  * Creates a simple ItemIDList from a path and returns it. This function
- * does not fail on non-existent paths.
+ * does not fail on nonexistent paths.
  *
  * PARAMS
  *  path         [I]   path to parse and convert into an ItemIDList
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index 3f079a1b15..9c1ca3b882 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -2036,7 +2036,7 @@ HRESULT WINAPI SHGetFolderLocation(
             else if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND))
             {
                 /* unlike SHGetFolderPath, SHGetFolderLocation in shell32
-                 * version 6.0 returns E_FAIL for non-existing paths
+                 * version 6.0 returns E_FAIL for nonexistent paths
                  */
                 hr = E_FAIL;
             }
diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c
index c7559931a5..0549f01f33 100644
--- a/dlls/shell32/tests/shellpath.c
+++ b/dlls/shell32/tests/shellpath.c
@@ -700,7 +700,7 @@ static int init(void)
 }
 
 /* Subprocess helper 1: test what happens when CSIDL_FAVORITES is set to a
- * non-existent directory.
+ * nonexistent directory.
  */
 static void testNonExistentPath1(void)
 {
diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c
index 1296b6b124..f628886d0f 100644
--- a/dlls/shell32/tests/shlfileop.c
+++ b/dlls/shell32/tests/shlfileop.c
@@ -306,7 +306,7 @@ void test_copy(void)
     ok(!file_exists(".\\testdir2\\test2.txt"), "The file is not copied yet\n");
     retval = SHFileOperationA(&shfo);
     if (!retval)
-      /* Win 95/NT returns success but copies only the files up to the non-existent source */
+      /* Win 95/NT returns success but copies only the files up to the nonexistent source */
       ok(file_exists(".\\testdir2\\test1.txt"), "The file is not copied\n");
     else
     {
diff --git a/dlls/shlwapi/tests/clist.c b/dlls/shlwapi/tests/clist.c
index 094da985a7..c7443381b1 100644
--- a/dlls/shlwapi/tests/clist.c
+++ b/dlls/shlwapi/tests/clist.c
@@ -381,9 +381,9 @@ static void test_CList(void)
 
   item = SHLWAPI_CLIST_items;
 
-  /* Look for non-existing item in populated list */
+  /* Look for nonexistent item in populated list */
   inserted = pSHLWAPI_22(list, 99999999);
-  ok(inserted == NULL, "found a non-existing item\n");
+  ok(inserted == NULL, "found a nonexistent item\n");
 
   while (item->ulSize)
   {
@@ -393,7 +393,7 @@ static void test_CList(void)
     item++;
   }
 
-  /* Look for non-existing item in empty list */
+  /* Look for nonexistent item in empty list */
   inserted = pSHLWAPI_22(list, 99999999);
   ok(inserted == NULL, "found an item in empty list\n");
 
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index af9d31fd96..0da0751a5c 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1296,7 +1296,7 @@ HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, D3DDEVT
        The following fields apply to d3d9 only
        ------------------------------------------------ */
     if (This->dxVersion > 8) {
-        FIXME("Caps support for directx9 is non-existent at the moment!\n");
+        FIXME("Caps support for directx9 is nonexistent at the moment!\n");
         pCaps->DevCaps2 = 0;
         pCaps->MaxNpatchTessellationLevel = 0;
         pCaps->MasterAdapterOrdinal = 0;
diff --git a/dlls/winedos/ppdev.c b/dlls/winedos/ppdev.c
index a56c56e9ff..ee3b4f4264 100644
--- a/dlls/winedos/ppdev.c
+++ b/dlls/winedos/ppdev.c
@@ -147,7 +147,7 @@ char IO_pp_init(void)
 	if (ioctl (fd,PPCLAIM,0))
 	  {
 	    ERR("PPCLAIM rejected %s\n",buffer);
-	    ERR("Perhaps the device is already in use or non-existent\n");
+	    ERR("Perhaps the device is already in use or nonexistent\n");
 	    continue;
 	  }
 	if (nports > 0)
@@ -176,7 +176,7 @@ char IO_pp_init(void)
 	if (ioctl (fd,PPRELEASE,0))
 	  {
 	    ERR("PPRELEASE rejected %s\n",buffer);
-	    ERR("Perhaps the device is already in use or non-existent\n");
+	    ERR("Perhaps the device is already in use or nonexistent\n");
 	    continue;
 	  }
 	PPDeviceList[nports].devicename = malloc(sizeof(buffer)+1);
diff --git a/documentation/configuring.sgml b/documentation/configuring.sgml
index 8eceecfff0..87cac98fe0 100644
--- a/documentation/configuring.sgml
+++ b/documentation/configuring.sgml
@@ -65,7 +65,7 @@
               is able to load its own internal DLLs
               (<filename>.so</filename> files) when the program
               asks for a DLL, Wine does not simulate the presence of
-              non-existent files.
+              nonexistent files.
             </para>
           </listitem>
         </itemizedlist>
diff --git a/programs/wcmd/En.rc b/programs/wcmd/En.rc
index 6a680ff5e5..80874cfe12 100644
--- a/programs/wcmd/En.rc
+++ b/programs/wcmd/En.rc
@@ -71,7 +71,7 @@ batch file.\n\
 The label which is the target of a GOTO may be up to 255 characters\n\
 long but may not include spaces (this is different from other operating\n\
 systems). If two or more identical labels exist in a batch file the\n\
-first one will always be executed. Attempting to GOTO a non-existent\n\
+first one will always be executed. Attempting to GOTO a nonexistent\n\
 label terminates the batch file execution.\n\
 \n\
 GOTO has no effect when used interactively.\n"
diff --git a/programs/wcmd/Ru.rc b/programs/wcmd/Ru.rc
index 2812fb18db..d3b2572f34 100644
--- a/programs/wcmd/Ru.rc
+++ b/programs/wcmd/Ru.rc
@@ -70,7 +70,7 @@ batch file.\n\
 The label which is the target of a GOTO may be up to 255 characters\n\
 long but may not include spaces (this is different from other operating\n\
 systems). If two or more identical labels exist in a batch file the\n\
-first one will always be executed. Attempting to GOTO a non-existent\n\
+first one will always be executed. Attempting to GOTO a nonexistent\n\
 label terminates the batch file execution.\n\
 \n\
 GOTO has no effect when used interactively.\n"
diff --git a/programs/wcmd/Si.rc b/programs/wcmd/Si.rc
index 8f59601203..58fa696dfc 100644
--- a/programs/wcmd/Si.rc
+++ b/programs/wcmd/Si.rc
@@ -71,7 +71,7 @@ batch file.\n\
 The label which is the target of a GOTO may be up to 255 characters\n\
 long but may not include spaces (this is different from other operating\n\
 systems). If two or more identical labels exist in a batch file the\n\
-first one will always be executed. Attempting to GOTO a non-existent\n\
+first one will always be executed. Attempting to GOTO a nonexistent\n\
 label terminates the batch file execution.\n\
 \n\
 GOTO has no effect when used interactively.\n"
diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c
index 5132975c73..7a878e74f8 100644
--- a/tools/winebuild/spec32.c
+++ b/tools/winebuild/spec32.c
@@ -262,7 +262,7 @@ static int output_exports( FILE *outfile, int nr_exports, DLLSPEC *spec )
             unsigned int j, args, mask = 0;
             const char *name;
 
-            /* skip non-existent entry points */
+            /* skip nonexistent entry points */
             if (!odp) goto ignore;
             /* skip non-functions */
             if ((odp->type != TYPE_STDCALL) && (odp->type != TYPE_CDECL)) goto ignore;