From 3c46116b5c639de14404c79a382ee8b650ab56a8 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 16 Dec 2021 09:35:22 +0100 Subject: [PATCH] language: expand contractions Spell them out --- cmdline/listopts.md | 2 +- cmdline/urls/fragment.md | 2 +- get/win-msys2.md | 2 +- http/auth.md | 2 +- http/browserlike.md | 2 +- http/modify/target.md | 2 +- http/multipart.md | 2 +- http/post.md | 2 +- libcurl-http/auth.md | 2 +- libcurl/callbacks/ftpmatch.md | 2 +- libcurl/curlcode.md | 2 +- libcurl/names.md | 4 ++-- libcurl/sharing.md | 2 +- libcurl/tlsoptions.md | 2 +- opensource/copyright.md | 4 ++-- project/bugs.md | 2 +- project/comm.md | 2 +- project/does.md | 2 +- project/users.md | 2 +- usingcurl/connections/name.md | 2 +- usingcurl/proxies/captive.md | 2 +- usingcurl/proxies/http.md | 2 +- usingcurl/returns.md | 8 ++++---- usingcurl/tftp.md | 2 +- usingcurl/version.md | 2 +- 25 files changed, 30 insertions(+), 30 deletions(-) diff --git a/cmdline/listopts.md b/cmdline/listopts.md index aa4fac1b55..f22039a7cd 100644 --- a/cmdline/listopts.md +++ b/cmdline/listopts.md @@ -11,7 +11,7 @@ an additional "category" to `-h` to get more options listed for that specific area. Use `curl -h category` to list all existing categories or `curl -h all` to list *all* available options. -Before curl 7.73.0, the help category system didn't exist and then `curl +Before curl 7.73.0, the help category system did not exist and then `curl --help` or simply `curl -h` would simply list all existing options in alphabetical order with a brief explanation next to each. diff --git a/cmdline/urls/fragment.md b/cmdline/urls/fragment.md index d393f664f2..9c9f86e2fd 100644 --- a/cmdline/urls/fragment.md +++ b/cmdline/urls/fragment.md @@ -1,6 +1,6 @@ # Fragment -URLs offer a fragment part. That's usually seen as a hash symbol (#) and a +URLs offer a fragment part. That is usually seen as a hash symbol (#) and a name for a specific name within a web page in browsers. An example of such a URL might look like: diff --git a/get/win-msys2.md b/get/win-msys2.md index e9c4cc3262..4a0a806012 100644 --- a/get/win-msys2.md +++ b/get/win-msys2.md @@ -61,7 +61,7 @@ This directory contains the PKGBUILD file and patches that are used for building makepkg-mingw --syncdeps --skippgpcheck ``` -That's it. The `--syncdeps` parameter will automatically check and prompt to install dependencies of `mingw-w64-curl` if these are not yet installed. Once the process is complete you will have 3 new files in the current directory, for example: +That is it. The `--syncdeps` parameter will automatically check and prompt to install dependencies of `mingw-w64-curl` if these are not yet installed. Once the process is complete you will have 3 new files in the current directory, for example: - `pacman -U mingw-w64-x86_64-curl-7.80.0-1-any.pkg.tar.zst` - `pacman -U mingw-w64-x86_64-curl-gnutls-7.80.0-1-any.pkg.tar.zst` diff --git a/http/auth.md b/http/auth.md index 4526cb4840..e9e2cda27a 100644 --- a/http/auth.md +++ b/http/auth.md @@ -35,7 +35,7 @@ When asking to do an HTTP transfer using a single (specified or implied), authentication method, curl will insert the authentication header already in the first request on the wire. -If you'd rather have curl first *test* if the authentication is really +If you would rather have curl first *test* if the authentication is really required, you can ask curl to figure that out and then automatically use the most safe method it knows about with `--anyauth`. This makes curl try the request unauthenticated, and then switch over to authentication if necessary: diff --git a/http/browserlike.md b/http/browserlike.md index 68c0f6bb5c..576f236abb 100644 --- a/http/browserlike.md +++ b/http/browserlike.md @@ -47,7 +47,7 @@ The site at https://example.com/ features a login prompt. The login on the web site is a HTML form to which you send a [HTTP POST](http-post.md) to. Save the response cookies and the response (HTML) output. -Although the login page is visible (if you'd use a browser) on +Although the login page is visible (if you would use a browser) on https://example.com/, the HTML form tag on that page informs you about which exact URL to send the POST to, using the `action` parameter. diff --git a/http/modify/target.md b/http/modify/target.md index 2296481cd8..3fdc59dcd6 100644 --- a/http/modify/target.md +++ b/http/modify/target.md @@ -2,7 +2,7 @@ When given an input URL such as `http://example.com/file`, the path section of the URL gets extracted and is turned into `/file` in the HTTP request line. -That item in the protocol is called the *request target* in HTTP. That's the +That item in the protocol is called the *request target* in HTTP. That is the resource this request will interact with. Normally this request target is extracted from the URL and then used in the request and as a user you do not need to think about it. diff --git a/http/multipart.md b/http/multipart.md index 56f03fb002..d6fe494f4d 100644 --- a/http/multipart.md +++ b/http/multipart.md @@ -112,7 +112,7 @@ to submit a multipart form as seen in HTML. 2. Use the "development tools" in your favorite browser and inspect the POST request in the network tab after you have submitted it. Then convert that HTTP data to a curl command line. Unfortunately, the [copy as - curl](../usingcurl/copyas.md) feature in the browsers usually don't actually + curl](../usingcurl/copyas.md) feature in the browsers usually do not actually do multipart formposts particularly well. 3. Inspect the source HTML and convert into a curl command line directly from diff --git a/http/post.md b/http/post.md index 8e0b11f9c6..64d09f252c 100644 --- a/http/post.md +++ b/http/post.md @@ -26,7 +26,7 @@ command line, you can also read it off a file name in standard curl style: ### Content-Type POSTing with curl's -d option will make it include a default header that looks -like `Content-Type: application/x-www-form-urlencoded`. That's what your +like `Content-Type: application/x-www-form-urlencoded`. That is what your typical browser will use for a plain POST. Many receivers of POST data do not care about or check the Content-Type diff --git a/libcurl-http/auth.md b/libcurl-http/auth.md index e01f5e100d..7a8d9aa3b6 100644 --- a/libcurl-http/auth.md +++ b/libcurl-http/auth.md @@ -19,7 +19,7 @@ separately: curl_easy_setopt(curl, CURLOPT_PASSWORD, "secret"); -That's all you need. This will make libcurl switch on its default +That is all you need. This will make libcurl switch on its default authentication method for this transfer: *HTTP Basic*. ## Authentication required diff --git a/libcurl/callbacks/ftpmatch.md b/libcurl/callbacks/ftpmatch.md index 5a4c830f5e..dd00c43169 100644 --- a/libcurl/callbacks/ftpmatch.md +++ b/libcurl/callbacks/ftpmatch.md @@ -65,6 +65,6 @@ The end chunk callback can only return success or error. ## FTP matching callback -If the default pattern matching function isn't to your liking, you can provide +If the default pattern matching function is not to your liking, you can provide your own replacement function by setting the `CURLOPT_FNMATCH_FUNCTION` option to your alternative. diff --git a/libcurl/curlcode.md b/libcurl/curlcode.md index 661ec50052..9ea44fcc97 100644 --- a/libcurl/curlcode.md +++ b/libcurl/curlcode.md @@ -1,6 +1,6 @@ ## CURLcode return code -Many libcurl functions return a CURLcode. That's a special libcurl typedeffed +Many libcurl functions return a CURLcode. That is a special libcurl typedeffed variable for error codes. It returns `CURLE_OK` (which has the value zero) if everything is fine and dandy and it returns a non-zero number if a problem was detected. There are almost one hundred `CURLcode` errors in use, and you can diff --git a/libcurl/names.md b/libcurl/names.md index d4c6e75bf0..6f9603ff18 100644 --- a/libcurl/names.md +++ b/libcurl/names.md @@ -1,14 +1,14 @@ # Name resolving Most transfers libcurl can do involves a name that first needs to be -translated to an Internet address. That's "name resolving". Using a numerical +translated to an Internet address. That is "name resolving". Using a numerical IP address directly in the URL usually avoids the name resolve phase, but in many cases it is not easy to manually replace the name with the IP address. libcurl tries hard to [re-use an existing connection](connectionreuse.md) rather than to create a new one. The function that checks for an existing connection to use is based purely on the -name and is performed before any name resolving is attempted. That's one of +name and is performed before any name resolving is attempted. That is one of the reasons the re-use is so much faster. A transfer using a reused connection will not resolve the host name again. diff --git a/libcurl/sharing.md b/libcurl/sharing.md index 3f19034a58..bcb9dbdf7d 100644 --- a/libcurl/sharing.md +++ b/libcurl/sharing.md @@ -2,7 +2,7 @@ Sometimes applications need to share data between transfers. All easy handles added to the same multi handle automatically get a lot of sharing done between -the handles in that same multi handle, but sometimes that's not exactly what +the handles in that same multi handle, but sometimes that is not exactly what you want. ## Multi handle diff --git a/libcurl/tlsoptions.md b/libcurl/tlsoptions.md index 59d3bcaf76..0bda594415 100644 --- a/libcurl/tlsoptions.md +++ b/libcurl/tlsoptions.md @@ -82,7 +82,7 @@ TLS (FTP, IMAP, POP3, and SMTP), you usually tell curl to use the non-TLS version of the protocol when specifying a URL and then ask curl to enable TLS with the `CURLOPT_USE_SSL` option. -This option allows a client to let curl continue if it cannot upgrade to TLS, but that's not a recommend path to walk as then you might be using an insecure +This option allows a client to let curl continue if it cannot upgrade to TLS, but that is not a recommend path to walk as then you might be using an insecure protocol without properly noticing. /* require use of SSL for this, or fail */ diff --git a/opensource/copyright.md b/opensource/copyright.md index b408af0682..9850e74881 100644 --- a/opensource/copyright.md +++ b/opensource/copyright.md @@ -4,7 +4,7 @@ Copyright is a legal right granted by the law of a country that gives the creator of an original work exclusive rights for its use and distribution. The copyright owner(s) can agree to allow others to use their work by -licensing it. That's what we do in the curl project. The copyright is the +licensing it. That is what we do in the curl project. The copyright is the foundation on which the licensing works. Daniel Stenberg is the owner of most copyrights in the curl project. @@ -28,7 +28,7 @@ work together on a software project. The curl project obeys national laws of the countries in which it works. However, it is a highly visible international project, downloadable and usable in effectively every country on earth, so some local laws could be broken -when using curl. That's just the nature of it and if uncertain, you should check +when using curl. That is just the nature of it and if uncertain, you should check your own local situation. There have been law suits involving technology that curl provides. One such diff --git a/project/bugs.md b/project/bugs.md index af13aa6b6d..c7fd8185bb 100644 --- a/project/bugs.md +++ b/project/bugs.md @@ -13,7 +13,7 @@ Any problem can be considered a bug. A weirdly phrased wording in the manual that prevents you from understanding something is a bug. A surprising side effect of combining multiple options can be a bug—or perhaps it should be better documented? Perhaps the option does not do at all what you expected it -to? That's a problem and we should fix it. +to? That is a problem and we should fix it. ### Problems must be known to get fixed diff --git a/project/comm.md b/project/comm.md index d313ebc7a3..9aa7493207 100644 --- a/project/comm.md +++ b/project/comm.md @@ -11,7 +11,7 @@ It is important to realize that we are all jointly taking care of the project, we fix problems and we add features. Sometimes a regular contributor grows bored and fades away, sometimes a new eager contributor steps out from the shadows and starts helping out more. To keep this ship going forward as well -as possible, it is important that we maintain open discussions and that's one +as possible, it is important that we maintain open discussions and that is one of the reasons why we frown upon users who take discussions privately or try to e-mail individual team members about development issues, questions, debugging or whatever. diff --git a/project/does.md b/project/does.md index a984920c57..26b0c6abc3 100644 --- a/project/does.md +++ b/project/does.md @@ -33,7 +33,7 @@ anything else than that it would output data on stdout, to the terminal, by default. The "everything is a pipe" mantra of standard Unix philosophy was something Daniel believed in. curl is like 'cat' or one of the other Unix tools; it sends data to stdout to make it easy to chain together with other tools to do -what you want. That's also why virtually all curl options that allow reading from +what you want. That is also why virtually all curl options that allow reading from a file or writing to a file, also have the ability to select doing it to stdout or from stdin. diff --git a/project/users.md b/project/users.md index 74370ec45b..6a758f1835 100644 --- a/project/users.md +++ b/project/users.md @@ -32,7 +32,7 @@ the Internet, the occasional "about box" or license agreement mentioning curl or that authors ask for help and tell us about their use. The curl license says users need to repeat it somewhere, like in the -documentation, but that's not easy for us to find in many cases and it's also +documentation, but that is not easy for us to find in many cases and it's also not easy for us to do anything about should they decide not to follow the small license requirement. diff --git a/usingcurl/connections/name.md b/usingcurl/connections/name.md index 2ee9ca4275..bd7683d30f 100644 --- a/usingcurl/connections/name.md +++ b/usingcurl/connections/name.md @@ -51,7 +51,7 @@ redirects or if you just want to have your command line work with multiple URLs. `--resolve` inserts the address into curl's DNS cache, so it will effectively -make curl believe that's the address it got when it resolved the name. +make curl believe that is the address it got when it resolved the name. When talking HTTPS, this will send SNI for the name in the URL and curl will verify the server's response to make sure it serves for the name in the URL. diff --git a/usingcurl/proxies/captive.md b/usingcurl/proxies/captive.md index ffcef70f9a..bae641ad26 100644 --- a/usingcurl/proxies/captive.md +++ b/usingcurl/proxies/captive.md @@ -1,6 +1,6 @@ # Captive portals -These are not proxies but they're blocking the way between you and the server +These are not proxies but they are blocking the way between you and the server you want to access. A "captive portal" is one of these systems that are popular to use in hotels, diff --git a/usingcurl/proxies/http.md b/usingcurl/proxies/http.md index 98cf40a583..b2e6bc3f29 100644 --- a/usingcurl/proxies/http.md +++ b/usingcurl/proxies/http.md @@ -53,7 +53,7 @@ What you can do instead then, is to "tunnel through" the HTTP proxy! ## HTTP proxy tunneling Most HTTP proxies allow clients to "tunnel through" it to a server on the other -side. That's exactly what's done every time you use HTTPS through the HTTP +side. That is exactly what's done every time you use HTTPS through the HTTP proxy. You tunnel through an HTTP proxy with curl using `-p` or `--proxytunnel`. diff --git a/usingcurl/returns.md b/usingcurl/returns.md index 931b1af380..39c95a14e2 100644 --- a/usingcurl/returns.md +++ b/usingcurl/returns.md @@ -103,14 +103,14 @@ A basic Unix shell script could look like something like this: passive mode. You might be able to work-around this problem by using PORT instead, with the `--ftp-port` option. - 15. FTP can't get host. Couldn't use the host IP address we got in the + 15. FTP cannot get host. Couldn't use the host IP address we got in the 227-line. This is most likely an internal error. 16. HTTP/2 error. A problem was detected in the HTTP2 framing layer. This is somewhat generic and can be one out of several problems, see the error message for details. - 17. FTP couldn't set binary. Couldn't change transfer method to binary. This + 17. FTP could not set binary. Couldn't change transfer method to binary. This server is broken. curl needs to set the transfer to the correct mode before it is started as otherwise the transfer cannot work. @@ -121,7 +121,7 @@ A basic Unix shell script could look like something like this: that curl got fewer bytes than advertised or that it got more. curl itself cannot know which number that is wrong or which is correct. If any. - 19. FTP couldn't download/access the given file. The RETR (or similar) + 19. FTP could not download/access the given file. The RETR (or similar) command failed. curl got an error from the server when trying to download the file. @@ -175,7 +175,7 @@ A basic Unix shell script could look like something like this: to curl. See also the [FTP uses two connections](ftp-twoconnections.md) section. - 31. FTP couldn't use REST. The REST command failed. This command is used for + 31. FTP could not use REST. The REST command failed. This command is used for resumed FTP transfers. curl needs to issue the REST command to do range or resumed transfers. The server is broken, try the same operation without range/resume as a crude work-around. diff --git a/usingcurl/tftp.md b/usingcurl/tftp.md index 0ae4fc4811..50c6e44ac7 100644 --- a/usingcurl/tftp.md +++ b/usingcurl/tftp.md @@ -34,7 +34,7 @@ You ask curl to use a different size than the default with curl --tftp-blksize 8192 tftp://localserver/file -It has been shown that there are server implementations that don't handle option +It has been shown that there are server implementations that do not handle option negotiation at all, so curl also has the ability to completely switch off all attempts of setting options. If you are in the unfortunate of working with such a server, use the flag like this: diff --git a/usingcurl/version.md b/usingcurl/version.md index c783f7ccb7..2c9e7148ea 100644 --- a/usingcurl/version.md +++ b/usingcurl/version.md @@ -61,7 +61,7 @@ and it can also show a secondary "Patch date" if it has been updated somehow after it was originally released. This says `[unreleased]` if curl was built another way than from a release -tarball, and as you can see above that's how Microsoft did it for Windows 10 +tarball, and as you can see above that is how Microsoft did it for Windows 10 and the curl project does not recommend it. ## Line 3: Protocols