diff options
-rw-r--r-- | docs/FAQ | 6 | ||||
-rw-r--r-- | docs/TODO | 2 | ||||
-rw-r--r-- | lib/hash.c | 2 | ||||
-rw-r--r-- | lib/system_win32.c | 2 | ||||
-rw-r--r-- | packages/vms/config_h.com | 2 | ||||
-rw-r--r-- | packages/vms/readme | 4 | ||||
-rw-r--r-- | tests/data/test201 | 2 | ||||
-rw-r--r-- | tests/server/socksd.c | 2 |
8 files changed, 11 insertions, 11 deletions
@@ -1384,7 +1384,7 @@ FAQ 6. License Issues - curl and libcurl are released under a MIT/X derivate license. The license is + curl and libcurl are released under a MIT/X derivative license. The license is very liberal and should not impose a problem for your project. This section is just a brief summary for the cases we get the most questions. (Parts of this section was much enhanced by Bjorn Reese.) @@ -1399,7 +1399,7 @@ FAQ Yes! - Since libcurl may be distributed under the MIT/X derivate license, it can be + Since libcurl may be distributed under the MIT/X derivative license, it can be used together with GPL in any software. 6.2 I have a closed-source program, can I use the libcurl library? @@ -1424,7 +1424,7 @@ FAQ Yes! - The MIT/X derivate license practically allows you to do almost anything with + The MIT/X derivative license practically allows you to do almost anything with the sources, on the condition that the copyright texts in the sources are left intact. @@ -611,7 +611,7 @@ The alt-svc: header provides a set of alternative services for curl to use instead of the original. If the first attempted one fails, it should try the - next etc and if all alterantives fail go back to the original. + next etc and if all alternatives fail go back to the original. See https://github.com/curl/curl/issues/4908 diff --git a/lib/hash.c b/lib/hash.c index 051c17626..5d433ad1f 100644 --- a/lib/hash.c +++ b/lib/hash.c @@ -175,7 +175,7 @@ Curl_hash_pick(struct Curl_hash *h, void *key, size_t key_len) return NULL; } -#if defined(DEBUGBUILD) && defined(AGGRESIVE_TEST) +#if defined(DEBUGBUILD) && defined(AGGRESSIVE_TEST) void Curl_hash_apply(Curl_hash *h, void *user, void (*cb)(void *user, void *ptr)) diff --git a/lib/system_win32.c b/lib/system_win32.c index b377da7d8..2132f43ef 100644 --- a/lib/system_win32.c +++ b/lib/system_win32.c @@ -196,7 +196,7 @@ HMODULE Curl_load_library(LPCTSTR filename) pLoadLibraryEx(filename, NULL, LOAD_WITH_ALTERED_SEARCH_PATH) : LoadLibrary(filename); } - /* Detect if KB2533623 is installed, as LOAD_LIBARY_SEARCH_SYSTEM32 is only + /* Detect if KB2533623 is installed, as LOAD_LIBRARY_SEARCH_SYSTEM32 is only supported on Windows Vista, Windows Server 2008, Windows 7 and Windows Server 2008 R2 with this patch or natively on Windows 8 and above */ else if(pLoadLibraryEx && GetProcAddress(hKernel32, "AddDllDirectory")) { diff --git a/packages/vms/config_h.com b/packages/vms/config_h.com index 4049d9f06..6973eacf1 100644 --- a/packages/vms/config_h.com +++ b/packages/vms/config_h.com @@ -2129,7 +2129,7 @@ $! $write tf " /* Allow compiler builtins */" $write tf "/*-------------------------*/" $write tf "#ifdef __DECC_VER" -$write tf "#include <non_existant_dir:builtins.h>" +$write tf "#include <non_existent_dir:builtins.h>" $write tf "#endif" $! $write tf "" diff --git a/packages/vms/readme b/packages/vms/readme index be1278fca..0bb61663c 100644 --- a/packages/vms/readme +++ b/packages/vms/readme @@ -168,8 +168,8 @@ in other ways. Product files (.EXE, .H, .LIS, .MAP, .OBJ, .OLB, ...) should be produced in an architecture-specific subdirectory under this directory ([.ALPHA], [.IA64], [.VAX]). -The file curl_gnv_build_steps.txt contains information on buildling using -the GNV tool kit, building a shared libcurl, and producting a PCSI kit for +The file curl_gnv_build_steps.txt contains information on building using +the GNV tool kit, building a shared libcurl, and producing a PCSI kit for distribution. The curl_gnv_build_steps.text is included in the release notes file of the PCSI kit. diff --git a/tests/data/test201 b/tests/data/test201 index 254e2412e..8e9f190b7 100644 --- a/tests/data/test201 +++ b/tests/data/test201 @@ -21,7 +21,7 @@ file missing file:// file </name> <command> -file://localhost/%PWD/log/non-existant-file.txt +file://localhost/%PWD/log/non-existent-file.txt </command> </client> diff --git a/tests/server/socksd.c b/tests/server/socksd.c index e8b71bedf..34e02dd7a 100644 --- a/tests/server/socksd.c +++ b/tests/server/socksd.c @@ -48,7 +48,7 @@ * 0 - no auth * 1 - GSSAPI (not supported) * 2 - user + password - * "response [number]" - the decimal number to repsond to a connect + * "response [number]" - the decimal number to respond to a connect * SOCKS5: 0 is OK, SOCKS4: 90 is ok * */ |