diff --git a/CMake/CurlTests.c b/CMake/CurlTests.c index 425fb4bb78..2cf306b588 100644 --- a/CMake/CurlTests.c +++ b/CMake/CurlTests.c @@ -128,7 +128,7 @@ int main(void) #ifdef HAVE_FILE_OFFSET_BITS #include /* Check that off_t can represent 2**63 - 1 correctly. - We cannot simply define LARGE_OFF_T to be 9223372036854775807, + We cannot define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ #define LARGE_OFF_T (((off_t)1 << 62) - 1 + ((off_t)1 << 62)) diff --git a/REUSE.toml b/REUSE.toml index 4395fb0d4e..c2e8b79288 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -2,7 +2,7 @@ # SPDX-FileCopyrightText: Daniel Stenberg, , et al. # This file describes the licensing and copyright situation for files that -# cannot be annotated directly, for example because of being simply +# cannot be annotated directly, for example because of being # uncommentable. Unless this is the case, a file should be annotated directly. # # This follows the REUSE specification: https://reuse.software/spec-3.2/#reusetoml diff --git a/docs/CONTRIBUTE.md b/docs/CONTRIBUTE.md index a2019cb2a9..3168091930 100644 --- a/docs/CONTRIBUTE.md +++ b/docs/CONTRIBUTE.md @@ -150,7 +150,7 @@ the owner of that change until it has been merged. Respond on the list or on GitHub about the change and answer questions and/or fix nits/flaws. This is important. We take lack of replies as a sign that you -are not anxious to get your patch accepted and we tend to simply drop such +are not anxious to get your patch accepted and we tend to drop such changes. ## About pull requests @@ -195,7 +195,7 @@ Once your pull request has been approved it can be merged by a maintainer. For new features, or changes, we require that the *feature window* is open for the pull request to be merged. This is typically a three week period that starts ten days after a previous release. New features submitted as pull -requests while the window is closed simply have to wait until it opens to get +requests while the window is closed have to wait until it opens to get merged. If time passes without your approved pull request gets merged: feel free to diff --git a/docs/FAQ.md b/docs/FAQ.md index 96a45d6a80..13991285ca 100644 --- a/docs/FAQ.md +++ b/docs/FAQ.md @@ -107,8 +107,8 @@ will agree. If you want to add more protocols, we may agree. If you want someone else to do all the work while you wait for us to implement it for you, that is not a friendly attitude. We spend a considerable time already on maintaining and developing curl. In order to get more out of us, -you should consider trading in some of your time and effort in return. Simply -go to the [GitHub repository](https://github.com/curl/curl), fork the project, +you should consider trading in some of your time and effort in return. Go to +the [GitHub repository](https://github.com/curl/curl), fork the project, and create pull requests with your proposed changes. If you write the code, chances are better that it will get into curl faster. @@ -169,7 +169,7 @@ allows for others to learn from this (both current and future users thanks to the web based archives of the mailing lists), thus saving us from having to repeat ourselves even more. Thanks for respecting this. -If you have found or simply suspect a security problem in curl or libcurl, +If you have found or suspect a security problem in curl or libcurl, [submit all the details to us](https://curl.se/dev/vuln-disclosure.html). We keep the issue private while we investigate, confirm it, work and validate a fix and agree on a time schedule for publication etc. That way we produce a @@ -329,7 +329,7 @@ support for this protocol. This could have happened if the configure script that was run at build time could not find all libs and include files curl requires for SSL to work. If -the configure script fails to find them, curl is simply built without SSL +the configure script fails to find them, curl is built without SSL support. To get HTTPS support into a curl that was previously built but that reports @@ -685,7 +685,7 @@ them for the curl URL *globbing* system), use the `-g`/`--globoff` option: curl asks remote servers for the page you specify. If the page does not exist at the server, the HTTP protocol defines how the server should respond and -that means that headers and a page will be returned. That is simply how HTTP +that means that headers and a page will be returned. That is how HTTP works. By using the `--fail` option you can tell curl explicitly to not get any data @@ -966,7 +966,7 @@ to check your authentication protected webpages (that gets a 401 back) and so on. The specific HTTP response code does not constitute a problem or error for -curl. It simply sends and delivers HTTP as you asked and if that worked, +curl. It sends and delivers HTTP as you asked and if that worked, everything is fine and dandy. The response code is generally providing more higher level error information that curl does not care about. The error was not in the HTTP transfer. @@ -1049,7 +1049,7 @@ Yes, but you cannot open a FILE * and pass the pointer to a DLL and have that DLL use the FILE * (as the DLL and the client application cannot access each others' variable memory areas). If you set `CURLOPT_WRITEDATA` you must also use `CURLOPT_WRITEFUNCTION` as well to set a function that writes the file, even if -that simply writes the data to the specified FILE *. Similarly, if you use +all it does is write the data to the specified FILE *. Similarly, if you use `CURLOPT_READDATA` you must also specify `CURLOPT_READFUNCTION`. ## What about Keep-Alive or persistent connections? @@ -1259,7 +1259,7 @@ proven for many years. There is no need for you to reinvent them. ## Does libcurl use threads? -Put simply: no, libcurl will execute in the same thread you call it in. All +No, libcurl will execute in the same thread you call it in. All callbacks will be called in the same thread as the one you call libcurl in. If you want to avoid your thread to be blocked by the libcurl call, you make diff --git a/docs/HTTPSRR.md b/docs/HTTPSRR.md index 7e82806348..bb96526b39 100644 --- a/docs/HTTPSRR.md +++ b/docs/HTTPSRR.md @@ -35,7 +35,7 @@ be reused on subsequent uses of the same hostnames. ## limitations We have decided to work on the HTTPS RR support by following what seems to be -(widely) used, and simply wait with implementing the details of the record +(widely) used, and wait with implementing the details of the record that do not seem to be deployed. HTTPS RR is a DNS field with many odd corners and complexities and we might as well avoid them if no one seems to want them. diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 3c873ff1c0..ee567441bd 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -149,7 +149,7 @@ These options are provided to select the TLS backend to use. You can build curl with *multiple* TLS backends at your choice, but some TLS backends cannot be combined: if you build with an OpenSSL fork (or wolfSSL), -you cannot add another OpenSSL fork (or wolfSSL) simply because they have +you cannot add another OpenSSL fork (or wolfSSL) because they have conflicting identical symbol names. When you build with multiple TLS backends, you can select the active one at diff --git a/docs/MAIL-ETIQUETTE.md b/docs/MAIL-ETIQUETTE.md index 7a32e18a0f..9c2527d04d 100644 --- a/docs/MAIL-ETIQUETTE.md +++ b/docs/MAIL-ETIQUETTE.md @@ -48,7 +48,7 @@ All curl mailing lists require that you are subscribed to allow a mail to go through to all the subscribers. If you post without being subscribed (or from a different mail address than -the one you are subscribed with), your mail is simply silently discarded. You +the one you are subscribed with), your mail is silently discarded. You have to subscribe first, then post. The reason for this unfortunate and strict subscription policy is of course to diff --git a/docs/MANUAL.md b/docs/MANUAL.md index 17ecc145b2..e6f5123d2b 100644 --- a/docs/MANUAL.md +++ b/docs/MANUAL.md @@ -935,7 +935,7 @@ are persistent. ## Multiple Transfers With A Single Command Line As is mentioned above, you can download multiple files with one command line -by simply adding more URLs. If you want those to get saved to a local file +by adding more URLs. If you want those to get saved to a local file instead of printed to stdout, you need to add one save option for each URL you specify. Note that this also goes for the `-O` option (but not `--remote-name-all`). diff --git a/docs/TheArtOfHttpScripting.md b/docs/TheArtOfHttpScripting.md index 0c95c5df1c..7f300f0703 100644 --- a/docs/TheArtOfHttpScripting.md +++ b/docs/TheArtOfHttpScripting.md @@ -471,7 +471,7 @@ include a hint about where the browser should go next to find this page, or a new page keeping newly generated output. The header that tells the browser to redirect is `Location:`. -curl does not follow `Location:` headers by default, but simply displays such +curl does not follow `Location:` headers by default, but displays such pages in the same manner it displays all HTTP replies. It does however feature an option that makes it attempt to follow the `Location:` pointers. @@ -518,7 +518,7 @@ curl is to add them on the command line like: curl --cookie "name=Daniel" https://www.example.com Cookies are sent as common HTTP headers. This is practical as it allows curl -to record cookies simply by recording headers. Record cookies with curl by +to record cookies by recording headers. Record cookies with curl by using the [`--dump-header`](https://curl.se/docs/manpage.html#-D) (`-D`) option like: @@ -570,7 +570,7 @@ advanced features to do secure transfers over HTTP. curl supports encrypted fetches when built to use a TLS library and it can be built to use one out of a fairly large set of libraries - `curl -V` shows which one your curl was built to use (if any). To get a page from an HTTPS -server, simply run curl like: +server, run curl like: curl https://secure.example.com @@ -632,7 +632,7 @@ so on. If you use the [`--request`](https://curl.se/docs/manpage.html#-X) / modify curl's behavior. This means that if you for example use -d "data" to do a POST, you can modify the method to a `PROPFIND` with `-X` and curl still thinks it sends a POST. You can change the normal GET to a POST method by -simply adding `-X POST` in a command line like: +adding `-X POST` in a command line like: curl -X POST https://example.org/ diff --git a/docs/cmdline-opts/MANPAGE.md b/docs/cmdline-opts/MANPAGE.md index fb952fa275..1e4facd954 100644 --- a/docs/cmdline-opts/MANPAGE.md +++ b/docs/cmdline-opts/MANPAGE.md @@ -92,7 +92,7 @@ The `#` header can be used by non-option files and it produces a `.SH` output. If the `#` header is used for a command line option file, that header is -simply ignored in the generated output. It can still serve a purpose in the +ignored in the generated output. It can still serve a purpose in the source file as it helps the user identify what option the file is for. ### Variables diff --git a/docs/cmdline-opts/config.md b/docs/cmdline-opts/config.md index bce80a0da0..637918df75 100644 --- a/docs/cmdline-opts/config.md +++ b/docs/cmdline-opts/config.md @@ -42,7 +42,7 @@ Specify the filename to --config as minus "-" to make curl read the file from stdin. Note that to be able to specify a URL in the config file, you need to specify -it using the --url option, and not by simply writing the URL on its own line. +it using the --url option, and not by writing the URL on its own line. It could look similar to this: url = "https://curl.se/docs/" diff --git a/docs/cmdline-opts/http0.9.md b/docs/cmdline-opts/http0.9.md index 41b76ffd7c..65be14491c 100644 --- a/docs/cmdline-opts/http0.9.md +++ b/docs/cmdline-opts/http0.9.md @@ -21,7 +21,7 @@ Example: Accept an HTTP version 0.9 response. HTTP/0.9 is a response without headers and therefore you can also connect with -this to non-HTTP servers and still get a response since curl simply +this to non-HTTP servers and still get a response since curl transparently downgrades - if allowed. HTTP/0.9 is disabled by default (added in 7.66.0) diff --git a/docs/cmdline-opts/user.md b/docs/cmdline-opts/user.md index 9e7392f5a6..d7600e0310 100644 --- a/docs/cmdline-opts/user.md +++ b/docs/cmdline-opts/user.md @@ -20,7 +20,7 @@ Example: Specify the username and password to use for server authentication. Overrides --netrc and --netrc-optional. -If you simply specify the username, curl prompts for a password. +If you specify only the username, curl prompts for a password. The username and passwords are split up on the first colon, which makes it impossible to use a colon in the username with this option. The password can, @@ -37,8 +37,8 @@ Windows domain name in the username, in order for the server to successfully obtain a Kerberos Ticket. If you do not, then the initial authentication handshake may fail. -When using NTLM, the username can be specified simply as the username, without -the domain, if there is a single domain and forest in your setup for example. +When using NTLM, the username can be specified without the domain, if +there is a single domain and forest in your setup for example. To specify the domain name use either Down-Level Logon Name or UPN (User Principal Name) formats. For example, EXAMPLE\user and user@example.com diff --git a/docs/examples/ephiperfifo.c b/docs/examples/ephiperfifo.c index 1b5095a467..bda3054a36 100644 --- a/docs/examples/ephiperfifo.c +++ b/docs/examples/ephiperfifo.c @@ -53,7 +53,7 @@ * Note: * For the sake of simplicity, URL length is limited to 1023 chars. * - * This is purely a demo app, all retrieved data is simply discarded by + * This is purely a demo app, all retrieved data is discarded by * the write callback. */ #include diff --git a/docs/examples/evhiperfifo.c b/docs/examples/evhiperfifo.c index 9799e5c067..6ce47d51af 100644 --- a/docs/examples/evhiperfifo.c +++ b/docs/examples/evhiperfifo.c @@ -56,7 +56,7 @@ * Note: * For the sake of simplicity, URL length is limited to 1023 chars. * - * This is purely a demo app, all retrieved data is simply discarded by + * This is purely a demo app, all retrieved data is discarded by * the write callback. */ #include diff --git a/docs/examples/ghiper.c b/docs/examples/ghiper.c index aa41ef041d..3c88e75fba 100644 --- a/docs/examples/ghiper.c +++ b/docs/examples/ghiper.c @@ -50,7 +50,7 @@ * The fifo buffer is handled almost instantly, so you can even add more URL's * while the previous requests are still being downloaded. * - * This is purely a demo app, all retrieved data is simply discarded by + * This is purely a demo app, all retrieved data is discarded by * the write callback. * */ diff --git a/docs/examples/hiperfifo.c b/docs/examples/hiperfifo.c index 7d7c547036..cdef91357c 100644 --- a/docs/examples/hiperfifo.c +++ b/docs/examples/hiperfifo.c @@ -53,7 +53,7 @@ * Note: * For the sake of simplicity, URL length is limited to 1023 chars. * - * This is purely a demo app, all retrieved data is simply discarded by + * This is purely a demo app, all retrieved data is discarded by * the write callback. */ #include diff --git a/docs/examples/multi-debugcallback.c b/docs/examples/multi-debugcallback.c index af1713c260..f56c287773 100644 --- a/docs/examples/multi-debugcallback.c +++ b/docs/examples/multi-debugcallback.c @@ -111,7 +111,7 @@ static int my_trace(CURL *curl, curl_infotype type, } /* - * Simply download an HTTP file. + * Download an HTTP file. */ int main(void) { diff --git a/docs/examples/multi-double.c b/docs/examples/multi-double.c index 709b949903..987f1c0568 100644 --- a/docs/examples/multi-double.c +++ b/docs/examples/multi-double.c @@ -31,7 +31,7 @@ #include /* - * Simply download two HTTP files! + * Download two HTTP files! */ int main(void) { diff --git a/docs/examples/multi-single.c b/docs/examples/multi-single.c index 5f0380a6f4..6329dd4d38 100644 --- a/docs/examples/multi-single.c +++ b/docs/examples/multi-single.c @@ -32,7 +32,7 @@ #include /* - * Simply download an HTTP file. + * Download an HTTP file. */ int main(void) { diff --git a/docs/examples/synctime.c b/docs/examples/synctime.c index 32b06d3bc1..8ee5559068 100644 --- a/docs/examples/synctime.c +++ b/docs/examples/synctime.c @@ -45,7 +45,7 @@ * so there is no way to get an accurate time. * 4. This software could only provide an accuracy of +- a few seconds, * as Round-Trip delay time is not taken into consideration. - * Compensation of network, firewall/proxy delay cannot be simply divide + * Compensation of network, firewall/proxy delay cannot be done by dividing * the Round-Trip delay time by half. * 5. Win32 SetSystemTime() API sets your computer clock according to * GMT/UTC time. Therefore your computer timezone must be properly set. diff --git a/docs/internals/BUFQ.md b/docs/internals/BUFQ.md index 9874e5d2e1..9d926537d6 100644 --- a/docs/internals/BUFQ.md +++ b/docs/internals/BUFQ.md @@ -67,7 +67,7 @@ bool Curl_bufq_peek(const struct bufq *q, const unsigned char **pbuf, size_t *pl On returning TRUE, `pbuf` points to internal memory with `plen` bytes that one may read. This is only valid until another operation on `bufq` is performed. -Instead of reading `bufq` data, one may simply skip it: +Instead of reading `bufq` data, one may skip it: ```c void Curl_bufq_skip(struct bufq *q, size_t amount); diff --git a/docs/internals/CODE_STYLE.md b/docs/internals/CODE_STYLE.md index 4a947e03dd..31c333af82 100644 --- a/docs/internals/CODE_STYLE.md +++ b/docs/internals/CODE_STYLE.md @@ -19,7 +19,7 @@ Our C code has a few style rules. Most of them are verified and upheld by the by the build system when built after `./configure --enable-debug` has been used. -It is normally not a problem for anyone to follow the guidelines, simply copy +It is normally not a problem for anyone to follow the guidelines, copy the style already used in the source code and there are no particularly unusual rules in our set of rules. diff --git a/docs/internals/TLS-SESSIONS.md b/docs/internals/TLS-SESSIONS.md index 02441f3980..b108fbfcfb 100644 --- a/docs/internals/TLS-SESSIONS.md +++ b/docs/internals/TLS-SESSIONS.md @@ -104,7 +104,7 @@ then configures its TLS backend and *returns* the ticket to the cache. The cache needs to treat tickets from TLSv1.2 and 1.3 differently. 1.2 tickets should be reused, but 1.3 tickets SHOULD NOT (RFC 8446). The session cache -simply drops 1.3 tickets when they are returned after use, but keeps a 1.2 +drops 1.3 tickets when they are returned after use, but keeps a 1.2 ticket. When a ticket is *put* into the cache, there is also a difference. There diff --git a/docs/libcurl/curl_formadd.md b/docs/libcurl/curl_formadd.md index ca05f4310a..94e6c269bd 100644 --- a/docs/libcurl/curl_formadd.md +++ b/docs/libcurl/curl_formadd.md @@ -116,7 +116,7 @@ you must make sure strlen() on the data pointer returns zero. followed by a filename, causes that file to be read and its contents used as data in this part. This part does *not* automatically become a file -upload part simply because its data was read from a file. +upload part due to its data being read from a file. The specified file needs to kept around until the associated transfer is done. diff --git a/docs/libcurl/libcurl-thread.md b/docs/libcurl/libcurl-thread.md index 2f60390a66..8ef893f075 100644 --- a/docs/libcurl/libcurl-thread.md +++ b/docs/libcurl/libcurl-thread.md @@ -78,7 +78,7 @@ When using multiple threads you should set the CURLOPT_NOSIGNAL(3) option to 1L for all handles. Everything works fine except that timeouts cannot be honored during DNS lookups - which you can work around by building libcurl with c-ares or threaded-resolver support. c-ares is a library that -provides asynchronous name resolves. On some platforms, libcurl simply cannot +provides asynchronous name resolves. On some platforms, libcurl cannot function properly multi-threaded unless the CURLOPT_NOSIGNAL(3) option is set. diff --git a/docs/libcurl/libcurl-tutorial.md b/docs/libcurl/libcurl-tutorial.md index b9d1b6358e..77f01b22f1 100644 --- a/docs/libcurl/libcurl-tutorial.md +++ b/docs/libcurl/libcurl-tutorial.md @@ -200,9 +200,8 @@ preferred URL to transfer with CURLOPT_URL(3) in a manner similar to: Let's assume for a while that you want to receive data as the URL identifies a remote resource you want to get here. Since you write a sort of application that needs this transfer, I assume that you would like to get the data passed -to you directly instead of simply getting it passed to stdout. You write your +to you directly instead of getting it passed to stdout. You write your own function that matches this prototype: - ~~~c size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp); ~~~ @@ -225,7 +224,7 @@ and the function that gets invoked by libcurl. libcurl itself does not touch the data you pass with CURLOPT_WRITEDATA(3). libcurl offers its own default internal callback that takes care of the data -if you do not set the callback with CURLOPT_WRITEFUNCTION(3). It simply +if you do not set the callback with CURLOPT_WRITEFUNCTION(3). It outputs the received data to stdout. You can have the default callback write the data to a different file handle by passing a 'FILE *' to a file opened for writing with the CURLOPT_WRITEDATA(3) option. @@ -272,7 +271,7 @@ previous connection. For some protocols, downloading a file can involve a complicated process of logging in, setting the transfer mode, changing the current directory and finally transferring the file data. libcurl takes care of all that -complication for you. Given simply the URL to a file, libcurl takes care of +complication for you. Given the URL to a file, libcurl takes care of all the details needed to get the file moved from one machine to another. # Multi-threading Issues @@ -871,7 +870,7 @@ following an old tradition and are built up as "[protocol]_proxy" (note the lower casing). Which makes the variable 'http_proxy' checked for a name of a proxy to use when the input URL is HTTP. Following the same rule, the variable named 'ftp_proxy' is checked for FTP URLs. Again, the proxies are always HTTP -proxies, the different names of the variables simply allows different HTTP +proxies, the different names of the variables allow different HTTP proxies to be used. The proxy environment variable contents should be in the format @@ -1067,7 +1066,7 @@ think fit. Adding headers is this easy: ... and if you think some of the internally generated headers, such as Accept: or Host: do not contain the data you want them to contain, you can replace -them by simply setting them too: +them by setting them too: ~~~c headers = curl_slist_append(headers, "Accept: Agent-007"); @@ -1371,7 +1370,7 @@ on the multi_socket event based API, this description here is for the select() oriented one. To use this interface, you are better off if you first understand the basics -of how to use the easy interface. The multi interface is simply a way to make +of how to use the easy interface. The multi interface is a way to make multiple transfers at the same time by adding up multiple easy handles into a "multi stack". diff --git a/docs/libcurl/libcurl.md b/docs/libcurl/libcurl.md index 908e561c60..96f10656ee 100644 --- a/docs/libcurl/libcurl.md +++ b/docs/libcurl/libcurl.md @@ -106,7 +106,7 @@ link with the particular version of libcurl you have installed. See the *curl-config(1)* man page for further details. Unix-like operating system that ship libcurl as part of their distributions -often do not provide the curl-config tool, but simply install the library and +often do not provide the curl-config tool, but only install the library and headers in the common path for this purpose. Many Linux and similar systems use pkg-config to provide build and link diff --git a/docs/libcurl/opts/CURLINFO_COOKIELIST.md b/docs/libcurl/opts/CURLINFO_COOKIELIST.md index 04a618e860..88cbd64c37 100644 --- a/docs/libcurl/opts/CURLINFO_COOKIELIST.md +++ b/docs/libcurl/opts/CURLINFO_COOKIELIST.md @@ -31,7 +31,7 @@ CURLcode curl_easy_getinfo(CURL *handle, CURLINFO_COOKIELIST, Pass a pointer to a 'struct curl_slist *' to receive a linked-list of all cookies curl knows (expired ones, too). Do not forget to call curl_slist_free_all(3) on the list after it has been used. If there are no -cookies (cookies for the handle have not been enabled or simply none have been +cookies (cookies for the handle have not been enabled or none have been received) the 'struct curl_slist *' is made a NULL pointer. Cookies that were imported in the Set-Cookie format without a domain name are diff --git a/docs/libcurl/opts/CURLMOPT_MAXCONNECTS.md b/docs/libcurl/opts/CURLMOPT_MAXCONNECTS.md index 14934a9a40..b02029b59f 100644 --- a/docs/libcurl/opts/CURLMOPT_MAXCONNECTS.md +++ b/docs/libcurl/opts/CURLMOPT_MAXCONNECTS.md @@ -45,8 +45,8 @@ connections. Changing this value when there are transfers in progress is possible, and the new value is then used the next time checks are performed. Lowering the value -does not close down any active transfers, it simply does not allow new ones to -get made. +does not close down any active transfers, it prevents new ones from being +made. # DEFAULT diff --git a/docs/libcurl/opts/CURLMOPT_MAX_HOST_CONNECTIONS.md b/docs/libcurl/opts/CURLMOPT_MAX_HOST_CONNECTIONS.md index 26a0abd2aa..184830fd5d 100644 --- a/docs/libcurl/opts/CURLMOPT_MAX_HOST_CONNECTIONS.md +++ b/docs/libcurl/opts/CURLMOPT_MAX_HOST_CONNECTIONS.md @@ -50,7 +50,7 @@ making a new connection is permitted. Changing this value while there are transfers in progress is possible. The new value is then used the next time checks are performed. Lowering the value does -not close down any active transfers, it simply does not allow new ones to get +not close down any active transfers, it prevents new ones from being made. # DEFAULT diff --git a/docs/libcurl/opts/CURLMOPT_MAX_TOTAL_CONNECTIONS.md b/docs/libcurl/opts/CURLMOPT_MAX_TOTAL_CONNECTIONS.md index 7c4e5aa46a..5a8811da86 100644 --- a/docs/libcurl/opts/CURLMOPT_MAX_TOTAL_CONNECTIONS.md +++ b/docs/libcurl/opts/CURLMOPT_MAX_TOTAL_CONNECTIONS.md @@ -45,12 +45,12 @@ making a new connection is permitted. Changing this value while there are transfers in progress is possible. The new value is then used the next time checks are performed. Lowering the value does -not close down any active transfers, it simply does not allow new ones to get +not close down any active transfers, it prevents new ones from being made. # DEFAULT -0, which means that there is no limit. It is then simply controlled by the +0, which means that there is no limit. It is then controlled by the number of easy handles added concurrently and how much multiplexing is being done. diff --git a/docs/libcurl/opts/CURLOPT_CONNECT_ONLY.md b/docs/libcurl/opts/CURLOPT_CONNECT_ONLY.md index a3c1833bd1..19154bc844 100644 --- a/docs/libcurl/opts/CURLOPT_CONNECT_ONLY.md +++ b/docs/libcurl/opts/CURLOPT_CONNECT_ONLY.md @@ -32,7 +32,7 @@ Pass a long. If the parameter equals 1, it tells the library to perform all the required proxy authentication and connection setup, but no data transfer, and then return. -The option can be used to simply test a connection to a server, but is more +The option can be used to test a connection to a server, but is more useful when used with the CURLINFO_ACTIVESOCKET(3) option to curl_easy_getinfo(3) as the library can set up the connection and then the application can obtain the most recently used socket for special data diff --git a/docs/libcurl/opts/CURLOPT_HSTS.md b/docs/libcurl/opts/CURLOPT_HSTS.md index 667d159726..7afd63642c 100644 --- a/docs/libcurl/opts/CURLOPT_HSTS.md +++ b/docs/libcurl/opts/CURLOPT_HSTS.md @@ -33,7 +33,7 @@ name with this option also enables HSTS for this handle (the equivalent of setting *CURLHSTS_ENABLE* with CURLOPT_HSTS_CTRL(3)). If the given file does not exist or contains no HSTS entries at startup, the -HSTS cache simply starts empty. Setting the filename to NULL allows HSTS +HSTS cache starts empty. Setting the filename to NULL allows HSTS without reading from or writing to any file. NULL also makes libcurl clear the list of files to read HSTS data from, if any such were previously set. diff --git a/docs/libcurl/opts/CURLOPT_HTTPAUTH.md b/docs/libcurl/opts/CURLOPT_HTTPAUTH.md index f0bdc0f12e..e05c84183a 100644 --- a/docs/libcurl/opts/CURLOPT_HTTPAUTH.md +++ b/docs/libcurl/opts/CURLOPT_HTTPAUTH.md @@ -56,7 +56,7 @@ regular old-fashioned Basic method. HTTP Digest authentication with an IE flavor. Digest authentication is defined in RFC 2617 and is a more secure way to do authentication over public networks -than the regular old-fashioned Basic method. The IE flavor is simply that +than the regular old-fashioned Basic method. The IE flavor means that libcurl uses a special "quirk" that IE is known to have used before version 7 and that some servers require the client to use. diff --git a/docs/libcurl/opts/CURLOPT_POST.md b/docs/libcurl/opts/CURLOPT_POST.md index 4012e1f5ea..1bc634a04f 100644 --- a/docs/libcurl/opts/CURLOPT_POST.md +++ b/docs/libcurl/opts/CURLOPT_POST.md @@ -41,7 +41,7 @@ you must make sure to not set CURLOPT_POSTFIELDS(3) to anything but NULL. When providing data with a callback, you must transmit it using chunked transfer-encoding or you must set the size of the data with the CURLOPT_POSTFIELDSIZE(3) or CURLOPT_POSTFIELDSIZE_LARGE(3) -options. To enable chunked encoding, you simply pass in the appropriate +options. To enable chunked encoding, pass in the appropriate Transfer-Encoding header, see the post-callback.c example. You can override the default POST Content-Type: header by setting your own diff --git a/docs/libcurl/opts/CURLOPT_RTSP_REQUEST.md b/docs/libcurl/opts/CURLOPT_RTSP_REQUEST.md index 4e5a333c5b..c9c00a4b10 100644 --- a/docs/libcurl/opts/CURLOPT_RTSP_REQUEST.md +++ b/docs/libcurl/opts/CURLOPT_RTSP_REQUEST.md @@ -74,7 +74,7 @@ halted. (e.g. *npt=25*) ## CURL_RTSPREQ_TEARDOWN -This command terminates an RTSP session. Simply closing a connection does not +This command terminates an RTSP session. Closing a connection does not terminate the RTSP session since it is valid to control an RTSP session over different connections. diff --git a/docs/libcurl/opts/CURLOPT_SSL_VERIFYHOST.md b/docs/libcurl/opts/CURLOPT_SSL_VERIFYHOST.md index a76127c43d..2672f7846a 100644 --- a/docs/libcurl/opts/CURLOPT_SSL_VERIFYHOST.md +++ b/docs/libcurl/opts/CURLOPT_SSL_VERIFYHOST.md @@ -39,8 +39,8 @@ its identity. When CURLOPT_SSL_VERIFYHOST(3) is set to 1 or 2, the server certificate must indicate that it was made for the hostname or address curl connects to, or the -connection fails. Simply put, it means it has to have the same name in the -certificate as is used in the URL you operate against. +connection fails. The certificate has to have the same name as is used in the +URL you operate against. curl considers the server the intended one when the Common Name field or a Subject Alternate Name field in the certificate matches the hostname in the diff --git a/docs/libcurl/opts/CURLOPT_SSL_VERIFYPEER.md b/docs/libcurl/opts/CURLOPT_SSL_VERIFYPEER.md index 8aa5275bc8..23a7b6947f 100644 --- a/docs/libcurl/opts/CURLOPT_SSL_VERIFYPEER.md +++ b/docs/libcurl/opts/CURLOPT_SSL_VERIFYPEER.md @@ -50,7 +50,7 @@ When CURLOPT_SSL_VERIFYPEER(3) is enabled, and the verification fails to prove that the certificate is signed by a CA, the connection fails. When this option is disabled (set to zero), the CA certificates are not loaded -and the peer certificate verification is simply skipped. +and the peer certificate verification is skipped. Authenticating the certificate is not enough to be sure about the server. You typically also want to ensure that the server is the server you mean to be diff --git a/docs/libcurl/opts/CURLOPT_TRANSFERTEXT.md b/docs/libcurl/opts/CURLOPT_TRANSFERTEXT.md index f99dc8df5e..8e742abb1a 100644 --- a/docs/libcurl/opts/CURLOPT_TRANSFERTEXT.md +++ b/docs/libcurl/opts/CURLOPT_TRANSFERTEXT.md @@ -33,7 +33,7 @@ or similar. libcurl does not do a complete ASCII conversion when doing ASCII transfers over FTP. This is a known limitation/flaw that nobody has rectified. libcurl -simply sets the mode to ASCII and performs a standard transfer. +only sets the mode to ASCII and performs a standard transfer. # DEFAULT diff --git a/docs/libcurl/opts/CURLOPT_USERNAME.md b/docs/libcurl/opts/CURLOPT_USERNAME.md index 916c9dd831..faf7031949 100644 --- a/docs/libcurl/opts/CURLOPT_USERNAME.md +++ b/docs/libcurl/opts/CURLOPT_USERNAME.md @@ -41,8 +41,8 @@ include the domain name in order for the server to successfully obtain a Kerberos Ticket. If you do not then the initial part of the authentication handshake may fail. -When using NTLM, the username can be specified simply as the username without -the domain name should the server be part of a single domain and forest. +When using NTLM, the username can be specified without the domain name +should the server be part of a single domain and forest. To include the domain name use either Down-Level Logon Name or UPN (User Principal Name) formats. For example, **EXAMPLE\user** and diff --git a/docs/libcurl/opts/CURLOPT_USERPWD.md b/docs/libcurl/opts/CURLOPT_USERPWD.md index e3727baec9..d42a83e582 100644 --- a/docs/libcurl/opts/CURLOPT_USERPWD.md +++ b/docs/libcurl/opts/CURLOPT_USERPWD.md @@ -35,8 +35,8 @@ specify the username part with the domain name in order for the server to successfully obtain a Kerberos Ticket. If you do not then the initial part of the authentication handshake may fail. -When using NTLM, the username can be specified simply as the username without -the domain name should the server be part of a single domain and forest. +When using NTLM, the username can be specified without the domain name +should the server be part of a single domain and forest. To specify the domain name use either Down-Level Logon Name or UPN (User Principal Name) formats. For example **EXAMPLE\user** and **user@example.com** diff --git a/docs/runtests.md b/docs/runtests.md index 1683f8a7ec..79066d8ffd 100644 --- a/docs/runtests.md +++ b/docs/runtests.md @@ -136,14 +136,14 @@ Force the test to run even if mentioned in DISABLED. Run the given test(s) with gdb. This is best used on a single test case and curl built --disable-shared. This then fires up gdb with command line set to -run the specified test case. Simply (set a break-point and) type 'run' to +run the specified test case. Set a break-point if needed and type 'run' to start. ## `-gl` Run the given test(s) with lldb. This is best used on a single test case and curl built --disable-shared. This then fires up lldb with command line set to -run the specified test case. Simply (set a break-point and) type 'run' to +run the specified test case. Set a break-point if needed and type 'run' to start. ## `-gw` @@ -313,7 +313,7 @@ use. The test script checks most of these by itself to determine when it is safe to attempt to run each test. Those which cannot be run due to failed requirements -are simply skipped and listed at the completion of all test cases. In some +are skipped and listed at the completion of all test cases. In some unusual configurations, the test script cannot make the correct determination for all tests. In these cases, the problematic tests can be skipped using the "!keyword" skip feature documented earlier. diff --git a/docs/tests/TEST-SUITE.md b/docs/tests/TEST-SUITE.md index 324d191fc6..0c053b96d5 100644 --- a/docs/tests/TEST-SUITE.md +++ b/docs/tests/TEST-SUITE.md @@ -194,7 +194,7 @@ ensure that the memory log file is properly written even if curl crashes. If a test case fails, you can conveniently get the script to invoke the debugger (gdb) for you with the server running and the same command line -parameters that failed. Simply invoke `runtests.pl -g` and then +parameters that failed. Invoke `runtests.pl -g` and then type 'run' in the debugger to perform the command through the debugger. ### Logs diff --git a/docs/wcurl.md b/docs/wcurl.md index 4d311bd689..05f312f958 100644 --- a/docs/wcurl.md +++ b/docs/wcurl.md @@ -31,7 +31,7 @@ Added-in: n/a **wcurl** is a simple curl wrapper which lets you use curl to download files without having to remember any parameters. -Simply call **wcurl** with a list of URLs you want to download and **wcurl** +Call **wcurl** with a list of URLs you want to download and **wcurl** picks sane defaults. If you need anything more complex, you can provide any of curl's supported diff --git a/include/curl/curl.h b/include/curl/curl.h index 0ab405efe9..209716b334 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -1249,7 +1249,7 @@ typedef enum { CURLOPT(CURLOPT_QUOTE, CURLOPTTYPE_SLISTPOINT, 28), /* send FILE * or void * to store headers to, if you use a callback it - is simply passed to the callback unmodified */ + is passed to the callback unmodified */ CURLOPT(CURLOPT_HEADERDATA, CURLOPTTYPE_CBPOINT, 29), /* point to a file to read the initial cookies from, also enables diff --git a/lib/asyn-ares.c b/lib/asyn-ares.c index a4483c770f..4d063d9f26 100644 --- a/lib/asyn-ares.c +++ b/lib/asyn-ares.c @@ -563,10 +563,10 @@ static void async_ares_hostbyname_cb(void *user_data, the first place. Without modifying c-ares, we cannot know exactly where in its retry cycle we are. We could guess based on how much time has gone by, but it does not really matter. Happy Eyeballs tells - us that, given usable information in hand, we simply do not want to + us that, given usable information in hand, we do not want to wait "too much longer" after we get a result. - We simply wait an additional amount of time equal to the default c-ares + We wait an additional amount of time equal to the default c-ares query timeout. That is enough time for a typical parallel response to arrive without being "too long". Even on a network where one of the two types of queries is failing or timing out constantly, this will usually diff --git a/lib/asyn-base.c b/lib/asyn-base.c index f35e1c988c..44bf98c8e4 100644 --- a/lib/asyn-base.c +++ b/lib/asyn-base.c @@ -155,7 +155,7 @@ int Curl_ares_perform(ares_channel channel, timediff_t timeout_ms) nfds = 0; if(!nfds) - /* Call ares_process() unconditionally here, even if we simply timed out + /* Call ares_process() unconditionally here, even if we timed out above, as otherwise the ares name resolve will not timeout! */ ares_process_fd(channel, ARES_SOCKET_BAD, ARES_SOCKET_BAD); else { diff --git a/lib/asyn-thrdd.c b/lib/asyn-thrdd.c index e616a8cee2..c3ed8eacaa 100644 --- a/lib/asyn-thrdd.c +++ b/lib/asyn-thrdd.c @@ -521,7 +521,7 @@ static CURLcode asyn_thrdd_await(struct Curl_easy *data, /* * Until we gain a way to signal the resolver threads to stop early, we must - * simply wait for them and ignore their results. + * wait for them and ignore their results. */ void Curl_async_thrdd_shutdown(struct Curl_easy *data) { diff --git a/lib/cf-h1-proxy.c b/lib/cf-h1-proxy.c index 79b50a1c57..69e050b9d6 100644 --- a/lib/cf-h1-proxy.c +++ b/lib/cf-h1-proxy.c @@ -467,7 +467,7 @@ static CURLcode recv_CONNECT_resp(struct Curl_cfilter *cf, /* This means we are currently ignoring a response-body */ if(ts->cl) { - /* A Content-Length based body: simply count down the counter + /* A Content-Length based body: count down the counter and make sure to break out of the loop when we are done! */ ts->cl--; if(ts->cl <= 0) { diff --git a/lib/cf-socket.c b/lib/cf-socket.c index b921bcc04c..2ebbe4df4d 100644 --- a/lib/cf-socket.c +++ b/lib/cf-socket.c @@ -335,7 +335,7 @@ static CURLcode socket_open(struct Curl_easy *data, Curl_set_in_callback(data, FALSE); } else { - /* opensocket callback not set, so simply create the socket now */ + /* opensocket callback not set, so create the socket now */ #ifdef DEBUGBUILD if((addr->family == AF_INET6) && getenv("CURL_DBG_SOCK_FAIL_IPV6")) { failf(data, "CURL_DBG_SOCK_FAIL_IPV6: failed to open socket"); @@ -583,7 +583,7 @@ static CURLcode bindlocal(struct Curl_easy *data, struct connectdata *conn, * not as a hostname or ip address. * * The interface might be a VRF, eg: vrf-blue, which means it cannot be - * converted to an IP address and would fail Curl_if2ip. Simply try to + * converted to an IP address and would fail Curl_if2ip. Try to * use it straight away. */ if(setsockopt(sockfd, SOL_SOCKET, SO_BINDTODEVICE, diff --git a/lib/curlx/timeval.c b/lib/curlx/timeval.c index 03eb80341c..435804c299 100644 --- a/lib/curlx/timeval.c +++ b/lib/curlx/timeval.c @@ -98,7 +98,7 @@ void curlx_pnow(struct curltime *pnow) /* * Even when the configure process has truly detected monotonic clock * availability, it might happen that it is not actually available at - * runtime. When this occurs simply fallback to other time source. + * runtime. When this occurs, fallback to other time source. */ #ifdef HAVE_GETTIMEOFDAY else { diff --git a/lib/ftp.c b/lib/ftp.c index 8ff810ac8b..6047759e78 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -2917,7 +2917,7 @@ static CURLcode ftp_state_get_resp(struct Curl_easy *data, } else { if((instate == FTP_LIST) && (ftpcode == 450)) { - /* simply no matching files in the directory listing */ + /* no matching files in the directory listing */ ftp->transfer = PPTRANSFER_NONE; /* do not download anything */ ftp_state(data, ftpc, FTP_STOP); /* this phase is over */ } diff --git a/lib/http.c b/lib/http.c index 5d56552f94..188da5fd83 100644 --- a/lib/http.c +++ b/lib/http.c @@ -1667,7 +1667,7 @@ CURLcode Curl_http_done(struct Curl_easy *data, (data->req.bytecount + data->req.headerbytecount - data->req.deductheadercount) <= 0) { - /* If this connection is not simply closed to be retried, AND nothing was + /* If this connection is not closed to be retried, AND nothing was read from the HTTP server (that counts), this cannot be right so we return an error here */ failf(data, "Empty reply from server"); @@ -2025,7 +2025,7 @@ static CURLcode http_set_aptr_host(struct Curl_easy *data) if(*cookiehost == '[') { char *closingbracket; /* since the 'cookiehost' is an allocated memory area that will be - freed later we cannot simply increment the pointer */ + freed later we cannot increment the pointer */ memmove(cookiehost, cookiehost + 1, strlen(cookiehost) - 1); closingbracket = strchr(cookiehost, ']'); if(closingbracket) @@ -4064,7 +4064,7 @@ static CURLcode http_on_response(struct Curl_easy *data, * General treatment of errors when about to send data. Including : * "417 Expectation Failed", while waiting for 100-continue. * - * The check for close above is done simply because of something + * The check for close above is done because of something * else has already deemed the connection to get closed then * something else should have considered the big picture and we * avoid this check. diff --git a/lib/multi.c b/lib/multi.c index 11b3af6f79..6133736525 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -801,7 +801,7 @@ CURLMcode curl_multi_remove_handle(CURLM *m, CURL *d) /* multi_done() clears the association between the easy handle and the connection. - Note that this ignores the return code simply because there is + Note that this ignores the return code because there is nothing really useful to do with it anyway! */ (void)multi_done(data, data->result, premature); } @@ -2788,7 +2788,7 @@ static CURLMcode multi_perform(struct Curl_multi *multi, returncode = Curl_mntfy_dispatch_all(multi); /* - * Simply remove all expired timers from the splay since handles are dealt + * Remove all expired timers from the splay since handles are dealt * with unconditionally by this function and curl_multi_timeout() requires * that already passed/handled expire times are removed from the splay. * diff --git a/lib/slist.c b/lib/slist.c index 9bfd08ae2c..c6dcdc1af0 100644 --- a/lib/slist.c +++ b/lib/slist.c @@ -79,7 +79,7 @@ struct curl_slist *Curl_slist_append_nodup(struct curl_slist *list, * curl_slist_append() appends a string to the linked list. It always returns * the address of the first record, so that you can use this function as an * initialization function as well as an append function. If you find this - * bothersome, then simply create a separate _init function and call it + * bothersome, then create a separate _init function and call it * appropriately from within the program. */ struct curl_slist *curl_slist_append(struct curl_slist *list, const char *data) diff --git a/lib/smtp.c b/lib/smtp.c index eee044e375..60889858d3 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -247,7 +247,7 @@ static CURLcode smtp_parse_custom_request(struct Curl_easy *data, * * If an mailbox '@' separator cannot be located then the mailbox is considered * to be either a local mailbox or an invalid mailbox (depending on what the - * calling function deems it to be) then the input will simply be returned in + * calling function deems it to be) then the input will be returned in * the address part with the hostname being NULL. */ static CURLcode smtp_parse_address(const char *fqma, char **address, @@ -935,8 +935,8 @@ static CURLcode smtp_perform_mail(struct Curl_easy *data, Curl_free_idnconverted_hostname(&host); } else - /* An invalid mailbox was provided but we will simply let the server - worry about that and reply with a 501 error */ + /* An invalid mailbox was provided but we let the server worry + about that and reply with a 501 error */ from = curl_maprintf("<%s>%s", address, suffix); curlx_free(address); @@ -978,8 +978,8 @@ static CURLcode smtp_perform_mail(struct Curl_easy *data, Curl_free_idnconverted_hostname(&host); } else - /* An invalid mailbox was provided but we will simply let the server - worry about it */ + /* An invalid mailbox was provided but we let the server worry + about it */ auth = curl_maprintf("<%s>%s", address, suffix); curlx_free(address); } @@ -1106,8 +1106,8 @@ static CURLcode smtp_perform_rcpt_to(struct Curl_easy *data, result = Curl_pp_sendf(data, &smtpc->pp, "RCPT TO:<%s@%s>%s", address, host.name, suffix); else - /* An invalid mailbox was provided but we will simply let the server worry - about that and reply with a 501 error */ + /* An invalid mailbox was provided but we let the server worry about + that and reply with a 501 error */ result = Curl_pp_sendf(data, &smtpc->pp, "RCPT TO:<%s>%s", address, suffix); diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c index fe2ffaf55c..63f5735b83 100644 --- a/lib/vssh/libssh2.c +++ b/lib/vssh/libssh2.c @@ -1127,7 +1127,7 @@ static CURLcode ssh_state_pkey_init(struct Curl_easy *data, /* * Unless the user explicitly specifies a public key file, let * libssh2 extract the public key from the private key file. - * This is done by simply passing sshc->rsa_pub = NULL. + * This is done by passing sshc->rsa_pub = NULL. */ if(!out_of_memory && data->set.str[STRING_SSH_PUBLIC_KEY] && /* treat empty string the same way as NULL */ diff --git a/m4/zz40-xc-ovr.m4 b/m4/zz40-xc-ovr.m4 index 02c86c9eea..8d8251f334 100644 --- a/m4/zz40-xc-ovr.m4 +++ b/m4/zz40-xc-ovr.m4 @@ -410,7 +410,7 @@ else xc_tst_auto_separator=':' fi if test -z "$PATH_SEPARATOR"; then - # Simply use the auto-detected one when not already set. + # Use the auto-detected one when not already set. PATH_SEPARATOR=$xc_tst_auto_separator elif test "x$PATH_SEPARATOR" != "x$xc_tst_auto_separator"; then echo "$xc_msg_warn 'PATH_SEPARATOR' does not match auto-detected one." >&2 diff --git a/projects/vms/curl_crtl_init.c b/projects/vms/curl_crtl_init.c index 426d69066e..a044ee72e0 100644 --- a/projects/vms/curl_crtl_init.c +++ b/projects/vms/curl_crtl_init.c @@ -99,7 +99,7 @@ int SYS$CRELNM(const unsigned long *attr, const unsigned char *acmode, const struct itmlst_3 *item_list); -/* Take all the fun out of simply looking up a logical name */ +/* Take all the fun out of looking up a logical name */ static int sys_trnlnm(const char *logname, char *value, int value_len) { const $DESCRIPTOR(table_dsc, "LNM$FILE_DEV"); @@ -134,7 +134,7 @@ static int sys_trnlnm(const char *logname, char *value, int value_len) return status; } -/* How to simply create a logical name */ +/* How to create a logical name */ static int sys_crelnm(const char *logname, const char *value) { int ret_val; diff --git a/scripts/badwords.txt b/scripts/badwords.txt index 79ead7d817..366ee5e70e 100644 --- a/scripts/badwords.txt +++ b/scripts/badwords.txt @@ -90,6 +90,7 @@ will:rewrite to present tense 64-bits:64 bits very:rephrase using an alternative word just:rephrase using an alternative word +simply:rephrase using an alternative word Curl=curl cURL=curl Libcurl=libcurl diff --git a/scripts/checksrc.pl b/scripts/checksrc.pl index 2ae5232f4b..727a61c8bd 100755 --- a/scripts/checksrc.pl +++ b/scripts/checksrc.pl @@ -1189,7 +1189,7 @@ sub scanfile { # which are tracked in the Git repo and edited in the workdir, or # committed locally on the branch without being in upstream master. # - # The simple and naive test is to simply check for the current year, + # The simple and naive test is to check for the current year, # but updating the year even without an edit is against project policy # (and it would fail every file on January 1st). # diff --git a/src/tool_cb_prg.c b/src/tool_cb_prg.c index 461ac051fc..6c3a366fa6 100644 --- a/src/tool_cb_prg.c +++ b/src/tool_cb_prg.c @@ -176,7 +176,7 @@ int tool_progress_cb(void *clientp, } } - /* simply count invokes */ + /* count invokes */ bar->calls++; update_width(bar); diff --git a/tests/data/test1209 b/tests/data/test1209 index c3fc1b4d37..8eb540a22c 100644 --- a/tests/data/test1209 +++ b/tests/data/test1209 @@ -40,7 +40,7 @@ FTP PORT download, no data conn and no positive preliminary reply s/^EPRT \|1\|(\S*)/EPRT \|1\|/ -# The protocol part does not include QUIT simply because the error is +# The protocol part does not include QUIT because the error is # CURLE_OPERATION_TIMEDOUT (28) which is a generic timeout error without # specifically saying for which connection it concerns, and for timeouts libcurl # marks the control channel as "invalid". As this test case times out for the diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl index dfe1aaaa54..cfb65913d2 100755 --- a/tests/ftpserver.pl +++ b/tests/ftpserver.pl @@ -202,7 +202,7 @@ my $POP3_TIMESTAMP = "<1972.987654321\@curl>"; # sub exit_signal_handler { my $signame = shift; - # For now, simply mimic old behavior. + # For now, mimic old behavior. killsockfilters($piddir, $proto, $ipvnum, $idnum, $verbose); unlink($pidfile); unlink($portfile); diff --git a/tests/libtest/lib560.c b/tests/libtest/lib560.c index 56ca48716e..ef36049668 100644 --- a/tests/libtest/lib560.c +++ b/tests/libtest/lib560.c @@ -24,7 +24,7 @@ #include "first.h" /* - * Simply download an HTTPS file! + * Download an HTTPS file! * * This test was added after the HTTPS-using-multi-interface with OpenSSL * regression of 7.19.1 to hopefully prevent this embarrassing mistake from diff --git a/tests/runtests.pl b/tests/runtests.pl index 28eb0bd799..2a180bfeb4 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -111,7 +111,7 @@ my $ACURL=$VCURL; # what curl binary to use to talk to APIs (relevant for CI) my $CURLCONFIG="../curl-config"; # curl-config from current build # Normally, all test cases should be run, but at times it is handy to -# simply run a particular one: +# run a particular one: my $TESTCASES="all"; # To run specific test cases, set them like: diff --git a/tests/secureserver.pl b/tests/secureserver.pl index e771cc7d0f..4df9ce8cbb 100755 --- a/tests/secureserver.pl +++ b/tests/secureserver.pl @@ -261,7 +261,7 @@ if($stunnel_version < 400) { if($stunnel_version >= 319) { $socketopt = "-O a:SO_REUSEADDR=1"; } - # TODO: we do not use $host_ip in this old version. I simply find + # TODO: we do not use $host_ip in this old version. I find # no documentation how to. But maybe ipv6 is not available anyway? $cmd = "\"$stunnel\" -p $certfile -P $pidfile "; $cmd .= "-d $accept_port -r $target_port -f -D $loglevel "; diff --git a/tests/server/first.h b/tests/server/first.h index 39feb64d62..4cc65ede7e 100644 --- a/tests/server/first.h +++ b/tests/server/first.h @@ -24,7 +24,7 @@ * ***************************************************************************/ -/* Test servers simply are standalone programs that do not use libcurl +/* Test servers are standalone programs that do not use libcurl * library. For convenience and to ease portability of these servers, * some source code files from the libcurl subdirectory are also used * to build the servers. In order to achieve proper linkage of these diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c index df102c50e6..61d81aeff7 100644 --- a/tests/server/sockfilt.c +++ b/tests/server/sockfilt.c @@ -61,7 +61,7 @@ * enough for the purpose of this program. * * For the above reason and the specific needs of this program signals SIGHUP, - * SIGPIPE and SIGALRM will be simply ignored on systems where this can be + * SIGPIPE and SIGALRM will be ignored on systems where this can be * done. If possible, signals SIGINT and SIGTERM will be handled by this * program as an indication to cleanup and finish execution as soon as * possible. This will be achieved with a single signal handler diff --git a/tests/unit/unit1652.c b/tests/unit/unit1652.c index a078000365..80a9de8da1 100644 --- a/tests/unit/unit1652.c +++ b/tests/unit/unit1652.c @@ -36,7 +36,7 @@ static char input[4096]; static char output[4096]; /* - * This debugf callback is simply dumping the string into the static buffer + * This debugf callback dumps the string into the static buffer * for the unit test to inspect. Since we know that we are only dealing with * text we can afford the luxury of skipping the type check here. */