Skip to content

Commit 456a032

Browse files
committed
misc: address badwords complaints
1 parent c2d5cdb commit 456a032

File tree

20 files changed

+69
-68
lines changed

20 files changed

+69
-68
lines changed

build/autotools.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ One of the differences between linking with a static library compared to
6060
linking with a shared one is in how shared libraries handle their own
6161
dependencies while static ones do not. In order to link with library `xyz` as
6262
a shared library, it is basically a matter of adding `-lxyz` to the linker
63-
command line no matter which other libraries `xyz` itself was built to
64-
use. But, if that `xyz` is instead a static library we also need to specify
63+
command line no matter which other libraries `xyz` itself was built to use.
64+
However, if that `xyz` is instead a static library we also need to specify
6565
each dependency of `xyz` on the linker command line. curl's configure cannot
6666
keep up with or know all possible dependencies for all the libraries it can be
6767
made to build with, so users wanting to build with static libs mostly need to

cmdline/copyas.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ Chromium)._
2727

2828
## From Safari
2929

30-
In Safari, the "development" menu is not visible until you go into **preferences->Advanced** and enable it. But once you have done that, you can select **Show web inspector** in that development menu and get to see a new console pop up that is similar to the development tools of Firefox and Chrome.
30+
In Safari, the "development" menu is not visible until you go into
31+
**preferences->Advanced** and enable it. Once you have done that, you can
32+
select **Show web inspector** in that development menu and get to see a new
33+
console pop up that is similar to the development tools of Firefox and Chrome.
3134

3235
Select the network tab, reload the webpage and then you can right click the
3336
particular resources that you want to fetch with curl, as if you did it with

cmdline/exitcode.md

+20-21
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,17 @@ A basic Unix shell script could look like something like this:
4141
not enabled or was explicitly disabled at build-time. To make curl able
4242
to do this, you probably need another build of libcurl.
4343

44-
5. Couldn't resolve proxy. The address of the given proxy host could not be
44+
5. Could not resolve proxy. The address of the given proxy host could not be
4545
resolved. Either the given proxy name is just wrong, or the DNS server is
46-
misbehaving and does not know about this name when it should or perhaps
47-
even the system you run curl on is misconfigured so that it does not
48-
find/use the correct DNS server.
46+
misbehaving and does not know about this name when it should or perhaps even
47+
the system you run curl on is misconfigured so that it does not find/use the
48+
correct DNS server.
4949

50-
6. Couldn't resolve host. The given remote host's address was not
51-
resolved. The address of the given server could not be resolved. Either
52-
the given hostname is just wrong, or the DNS server is misbehaving and
53-
does not know about this name when it should or perhaps even the system you
54-
run curl on is misconfigured so that it does not find/use the correct DNS
55-
server.
50+
6. Could not resolve host. The given remote host's address was not resolved.
51+
The address of the given server could not be resolved. Either the given
52+
hostname is just wrong, or the DNS server is misbehaving and does not know
53+
about this name when it should or perhaps even the system you run curl on is
54+
misconfigured so that it does not find/use the correct DNS server.
5655

5756
7. Failed to connect to host. curl managed to get an IP address to the
5857
machine and it tried to set up a TCP connection to the host but
@@ -103,15 +102,15 @@ A basic Unix shell script could look like something like this:
103102
passive mode. You might be able to work-around this problem by using PORT
104103
instead, with the `--ftp-port` option.
105104

106-
15. FTP cannot get host. Couldn't use the host IP address we got in the
105+
15. FTP cannot get host. Could not use the host IP address we got in the
107106
227-line. This is most likely an internal error.
108107

109108
16. HTTP/2 error. A problem was detected in the HTTP2 framing layer. This is
110109
somewhat generic and can be one out of several problems, see the error
111110
message for details.
112111

113-
17. FTP could not set binary. Couldn't change transfer method to binary. This
114-
server is broken. curl needs to set the transfer to the correct mode
112+
17. FTP could not set binary. Could not change transfer method to binary.
113+
This server is broken. curl needs to set the transfer to the correct mode
115114
before it is started as otherwise the transfer cannot work.
116115

117116
18. Partial file. Only a part of the file was transferred. When the transfer
@@ -199,9 +198,9 @@ A basic Unix shell script could look like something like this:
199198
asking to resume a transfer that then ends up not possible to do, this
200199
error can get returned. For FILE, FTP or SFTP.
201200

202-
37. Couldn't read the given file when using the FILE:// scheme. Failed to
203-
open the file. The file could be non-existing or is it a permission
204-
problem perhaps?
201+
37. Could not read the given file when using the FILE:// scheme. Failed to
202+
open the file. The file could be non-existing or is it a permission problem
203+
perhaps?
205204

206205
38. LDAP cannot bind. LDAP "bind" operation failed, which is a necessary step
207206
in the LDAP operation and thus this means the LDAP query could not be
@@ -287,12 +286,12 @@ A basic Unix shell script could look like something like this:
287286
57. **Not used**
288287

289288
58. Problem with the local certificate. The client certificate had a problem
290-
so it could not be used. Permissions? The wrong pass phrase?
289+
so it could not be used. Permissions? The wrong passphrase?
291290

292-
59. Couldn't use the specified SSL cipher. The cipher names need to be
293-
specified exactly and they are also unfortunately specific to the
294-
particular TLS backend curl has been built to use. For the current list
295-
of support ciphers and how to write them, see the online docs at
291+
59. Could not use the specified SSL cipher. The cipher names need to be
292+
specified exactly and they are also unfortunately specific to the particular
293+
TLS backend curl has been built to use. For the current list of support
294+
ciphers and how to write them, see the online docs at
296295
[https://curl.se/docs/ssl-ciphers.html](https://curl.se/docs/ssl-ciphers.html).
297296

298297
60. Peer certificate cannot be authenticated with known CA certificates. This

cmdline/urls/ftptype.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ ASCII could then be made with:
1313

1414
curl "ftp://example.com/foo;type=A"
1515

16-
And while curl defaults to binary transfers for FTP, the URL format allows you
17-
to also specify the binary type with type=I:
16+
curl defaults to binary transfers for FTP, but the URL format allows you to
17+
specify the binary type with `type=I`:
1818

1919
curl "ftp://example.com/foo;type=I"
2020

cmdline/urls/globbing.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ Or download all the images of a chess board, indexed by two coordinates ranged
6464

6565
curl -O "http://example.com/chess-[0-7]x[0-7].jpg"
6666

67-
And you can, of course, mix ranges and series. Get a week's worth of logs for
68-
both the web server and the mail server:
67+
You can, of course, mix ranges and series. Get a week's worth of logs for both
68+
the web server and the mail server:
6969

7070
curl -O "http://example.com/{web,mail}-log[0-6].txt"
7171

helpers/sharing.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,9 @@ run its own thread and transfer data, but you still want the different
6262
transfers to share data. Then you need to set the mutex callbacks.
6363

6464
If you do not use threading and you *know* you access the shared object in a
65-
serial one-at-a-time manner you do not need to set any locks. But if there is
66-
ever more than one transfer that access share object at a time, it needs to
67-
get mutex callbacks setup to prevent data destruction and possibly even
68-
crashes.
65+
serial one-at-a-time manner you do not need to set any locks. If there is ever
66+
more than one transfer that access share object at a time, it needs to get
67+
mutex callbacks setup to prevent data destruction and possibly even crashes.
6968

7069
Since libcurl itself does not know how to lock things or even what threading
7170
model you are using, you must make sure to do mutex locks that only allows one

http/post/multipart.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ submitted. The particular boundary you see in this example has the random part
6363
`d74496d66958873e` but you, of course, get something different when you run
6464
curl (or when you submit such a form with a browser).
6565

66-
So after that initial set of headers follows the request body
66+
After that initial set of headers follows the request body
6767

6868
--------------------------d74496d66958873e
6969
Content-Disposition: form-data; name="person"

http/put.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ identifies the resource and you point out the local file to put there:
1111

1212
curl -T localfile http://example.com/new/resource/file
1313

14-
`-T` implies a PUT and tell curl which file to send off. But the similarities
14+
`-T` implies a PUT and tell curl which file to send off. The similarities
1515
between POST and PUT also allows you to send a PUT with a string by using the
1616
regular curl POST mechanism using `-d` but asking for it to use a PUT instead:
1717

http/redirects.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ a particular site, but since an HTTP redirect might move away to a different
107107
host curl limits what it sends away to other hosts than the original within
108108
the same transfer.
109109

110-
So if you want the credentials to also get sent to the following hostnames
111-
even though they are not the same as the original—presumably because you trust
112-
them and know that there is no harm in doing that—you can tell curl that it is
113-
fine to do so by using the `--location-trusted` option.
110+
If you want the credentials to also get sent to the following hostnames even
111+
though they are not the same as the original—presumably because you trust them
112+
and know that there is no harm in doing that—you can tell curl that it is fine
113+
to do so by using the `--location-trusted` option.
114114

115115
# Non-HTTP redirects
116116

http/response.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ in fact any other compression algorithm that curl understands) by using
9292

9393
A less common feature used with transfer encoding is compression.
9494

95-
Compression in itself is common. Over time the dominant and web compatible
96-
way to do compression for HTTP has become to use `Content-Encoding` as
97-
described in the section above. But HTTP was originally intended and specified
98-
to allow transparent compression as a transfer encoding, and curl supports
99-
this feature.
95+
Compression in itself is common. Over time the dominant and web compatible way
96+
to do compression for HTTP has become to use `Content-Encoding` as described
97+
in the section above. HTTP was originally intended and specified to allow
98+
transparent compression as a transfer encoding, and curl supports this
99+
feature.
100100

101101
The client then simply asks the server to do compression transfer encoding and
102102
if acceptable, it responds with a header indicating that it does and curl then

install/container.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Invoke curl with `podman`:
4242

4343
alias -s curl='podman run -it --rm docker.io/curlimages/curl'
4444

45-
And simply invoke `curl www.example.com` to make a request
45+
Simply invoke `curl www.example.com` to make a request
4646

4747
## Running curl in kubernetes
4848

install/linux.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ instead of `zypper`. To install the curl command-line utility:
100100

101101
transactional-update pkg install curl
102102

103-
And to install the libcurl development package:
103+
To install the libcurl development package:
104104

105105
transactional-update pkg install libcurl-devel
106106

libcurl/globalinit.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ global state so you should only call it once, and once your program is
1111
completely done using libcurl you can call `curl_global_cleanup()` to
1212
free and clean up the associated global resources the init call allocated.
1313

14-
libcurl is built to handle the situation where you skip the `curl_global_init()` call, but
15-
it does so by calling it itself instead (if you did not do it before any actual
16-
file transfer starts) and it then uses its own defaults. But beware that it is
17-
still not thread safe even then, so it might cause some "interesting" side
18-
effects for you. It is much better to call curl_global_init() yourself in a
19-
controlled manner.
14+
libcurl is built to handle the situation where you skip the
15+
`curl_global_init()` call, but it does so by calling it itself instead (if you
16+
did not do it before any actual file transfer starts) and it then uses its own
17+
defaults. Beware that it is still not thread safe even then, so it might cause
18+
some "interesting" side effects for you. It is much better to call
19+
curl_global_init() yourself in a controlled manner.
2020

project/comm.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ debugging or whatever.
1919
In this day, mailing lists may be considered the old style of communication —
2020
no fancy web forums or similar. Using a mailing list is therefore becoming an
2121
art that is not practiced everywhere and may be a bit strange and unusual to
22-
you. But fear not. It is just about sending emails to an address that then
23-
sends that email out to all the subscribers. Our mailing lists have at most a
24-
few thousand subscribers. If you are mailing for the first time, it might be
25-
good to read a few old mails first to get to learn the culture and what's
26-
considered good practice.
22+
you. It is just about sending emails to an address that then sends that email
23+
out to all the subscribers. Our mailing lists have at most a few thousand
24+
subscribers. If you are mailing for the first time, it might be good to read a
25+
few old mails first to get to learn the culture and what's considered good
26+
practice.
2727

2828
The mailing lists and the bug tracker have changed hosting providers a few
2929
times and there are reasons to suspect it might happen again in the future. It

protocols/http.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ A server always responds to an HTTP request unless something is wrong.
4343

4444
## The URL converted to a request
4545

46-
So when an HTTP client is given a URL to operate on, that URL is then used,
46+
When an HTTP client is given a URL to operate on, that URL is then used,
4747
picked apart and those parts are used in various places in the outgoing
4848
request to the server. Let's take an example URL:
4949

transfers/conn/keepalive.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
Once a TCP connection has been established, that connection is defined to be
44
valid until one side closes it. Once the connection has entered the connected
5-
state, it will remain connected indefinitely. But, in reality, the connection
6-
will not last indefinitely. Many firewalls or NAT systems close connections if
5+
state, it will remain connected indefinitely. In reality, the connection will
6+
not last indefinitely. Many firewalls or NAT systems close connections if
77
there has been no activity in some time period. The Keep Alive signal can be
88
used to refrain intermediate hosts from closing idle connection due to
99
inactivity.

transfers/drive/multi-socket.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ registered:
8989

9090
### timer_callback
9191

92-
The application is in control and waits for socket activity. But even without
92+
The application is in control and waits for socket activity. Even without
9393
socket activity there are things libcurl needs to do. Timeout things, calling
9494
the progress callback, starting over a retry or failing a transfer that takes
9595
too long, etc. To make that work, the application must also make sure to

transfers/drive/multi.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ codes*):
9090
Both these loops let you use one or more file descriptors of your own on which
9191
to wait, like if you read from your own sockets or a pipe or similar.
9292

93-
And again, you can add and remove easy handles to the multi handle at any
94-
point during the looping. Removing a handle mid-transfer aborts that transfer.
93+
Again: you can add and remove easy handles to the multi handle at any point
94+
during the looping. Removing a handle mid-transfer aborts that transfer.
9595

9696
## When is a single transfer done?
9797

usingcurl/connections/keepalive.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ frames" back and forth when it would otherwise be totally idle. It helps idle
1818
connections to detect breakage even when no traffic is moving over it, and
1919
helps intermediate systems not consider the connection dead.
2020

21-
curl uses TCP keepalive by default for the reasons mentioned here. But there
22-
might be times when you want to *disable* keepalive or you may want to change
23-
the interval between the TCP "pings" (curl defaults to 60 seconds). You can
24-
switch off keepalive with:
21+
curl uses TCP keepalive by default for the reasons mentioned here. There might
22+
be times when you want to *disable* keepalive or you may want to change the
23+
interval between the TCP "pings" (curl defaults to 60 seconds). You can switch
24+
off keepalive with:
2525

2626
curl --no-keepalive https://example.com/
2727

usingcurl/connections/name.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ want to send a test request to one specific server out of the load balanced
8080
set (`load1.example.com` for example) you can instruct curl to do that.
8181

8282
You *can* still use `--resolve` to accomplish this if you know the specific IP
83-
address of load1. But without having to first resolve and fix the IP address
83+
address of load1. Without having to first resolve and fix the IP address
8484
separately, you can tell curl:
8585

8686
curl --connect-to www.example.com:80:load1.example.com:80 \
@@ -110,6 +110,6 @@ end of the DNS communication to a specific IP address and with
110110
use for its DNS requests.
111111

112112
These `--dns-*` options are advanced and are only meant for people who know
113-
what they are doing and understand what these options do. But they offer
113+
what they are doing and understand what these options do. They offer
114114
customizable DNS name resolution operations.
115115

0 commit comments

Comments
 (0)