Skip to content

Commit fda897f

Browse files
committed
docs: fix proselint complaints
1 parent 6e0dbe8 commit fda897f

16 files changed

+68
-71
lines changed

README

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ README
1313

1414
libcurl is the library curl is using to do its job. It is readily
1515
available to be used by your software. Read the libcurl.3 man page to
16-
learn how!
16+
learn how.
1717

1818
You find answers to the most frequent questions we get in the FAQ document.
1919

@@ -36,15 +36,15 @@ WEBSITE
3636

3737
GIT
3838

39-
To download the very latest source off the GIT server do this:
39+
To download the latest source code off the GIT server do this:
4040

4141
git clone https://github.com/curl/curl.git
4242

4343
(you will get a directory named curl created, filled with the source code)
4444

4545
SECURITY PROBLEMS
4646

47-
Report suspected security problems via our HackerOne page and not in public!
47+
Report suspected security problems via our HackerOne page and not in public.
4848

4949
https://hackerone.com/curl
5050

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ To download the latest source from the Git server do this:
6464
## Security problems
6565

6666
Report suspected security problems via [our HackerOne
67-
page](https://hackerone.com/curl) and not in public!
67+
page](https://hackerone.com/curl) and not in public.
6868

6969
## Notice
7070

docs/CHECKSRC.md

+6-7
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ warnings are:
4141
more appropriate `char *name` style. The asterisk should sit right next to
4242
the name without a space in between.
4343

44-
- `BADCOMMAND`: There's a bad `!checksrc!` instruction in the code. See the
44+
- `BADCOMMAND`: There's a bad `checksrc` instruction in the code. See the
4545
**Ignore certain warnings** section below for details.
4646

4747
- `BANNEDFUNC`: A banned function was used. The functions sprintf, vsprintf,
@@ -56,7 +56,7 @@ warnings are:
5656

5757
- `COMMANOSPACE`: a comma without following space
5858

59-
- `COPYRIGHT`: the file is missing a copyright statement!
59+
- `COPYRIGHT`: the file is missing a copyright statement
6060

6161
- `CPPCOMMENTS`: `//` comment detected, that is not C89 compliant
6262

@@ -113,7 +113,7 @@ warnings are:
113113

114114
- `SPACESEMICOLON`: there was a space before semicolon, ` ;`.
115115

116-
- `TABS`: TAB characters are not allowed!
116+
- `TABS`: TAB characters are not allowed
117117

118118
- `TRAILINGSPACE`: Trailing whitespace on the line
119119

@@ -146,10 +146,9 @@ different ways to do this.
146146
### Inline ignore
147147

148148
You can control what to ignore within a specific source file by providing
149-
instructions to checksrc in the source code itself. You need a magic marker
150-
that is `!checksrc!` followed by the instruction. The instruction can ask to
151-
ignore a specific warning N number of times or you ignore all of them until
152-
you mark the end of the ignored section.
149+
instructions to checksrc in the source code itself. See examples below. The
150+
instruction can ask to ignore a specific warning N number of times or you
151+
ignore all of them until you mark the end of the ignored section.
153152

154153
Inline ignores are only done for that single specific source code file.
155154

docs/CONTRIBUTE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,8 @@ still fine.
291291
This means that all files need to have their license and copyright information
292292
clearly stated. Ideally by having the standard curl source code header, with
293293
an accurate copyright year range and the SPDX-License-Identifier included. If
294-
the header does not work, you can use a smaller header or as a last resort add
295-
the information for a specific file to the `.reuse/dep5` file.
294+
the header does not work, you can use a smaller header or add the information
295+
for a specific file to the `.reuse/dep5` file.
296296

297297
We update copyright year ranges to end on the year of the most recent change
298298
of the individual file.

docs/DEPRECATE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ how your use case cannot be satisfied properly using a workaround.
1010

1111
We remove support for building curl with the NSS TLS library in August 2023.
1212

13-
- There are very few users left who use curl+NSS
14-
- NSS has very few users outside of curl as well (primarily Firefox)
13+
- There are few users left who use curl+NSS
14+
- NSS has few users outside of curl as well (primarily Firefox)
1515
- NSS is harder than ever to find documentation for
1616
- NSS was always "best" used with Red Hat Linux when they provided additional
1717
features on top of the regular NSS that is not shipped by the vanilla library

docs/HISTORY.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,11 @@ curl_formparse() function
184184
August: Curl and libcurl 7.12.1
185185

186186
Public curl release number: 82
187-
Releases counted from the very beginning: 109
187+
Releases counted from the beginning: 109
188188
Available command line options: 96
189189
Available curl_easy_setopt() options: 120
190190
Number of public functions in libcurl: 36
191-
Amount of public website mirrors: 12
191+
Amount of public website mirrors: 12
192192
Number of known libcurl bindings: 26
193193

194194
2005

docs/HTTP3.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ development and experimenting.
253253
## Prerequisite(s)
254254

255255
An existing local HTTP/1.1 server that hosts files. Preferably also a few huge
256-
ones. You can easily create huge local files like `truncate -s=8G 8GB` - they
256+
ones. You can easily create huge local files like `truncate -s=8G 8GB` - they
257257
are huge but do not occupy that much space on disk since they are just big
258258
holes.
259259

docs/INTERNALS.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ Library Symbols
6464

6565
All symbols used internally in libcurl must use a `Curl_` prefix if they are
6666
used in more than a single file. Single-file symbols must be made static.
67-
Public ("exported") symbols must use a `curl_` prefix. (There are exceptions,
68-
but they are to be changed to follow this pattern in future versions.) Public
69-
API functions are marked with `CURL_EXTERN` in the public header files so
70-
that all others can be hidden on platforms where this is possible.
67+
Public ("exported") symbols must use a `curl_` prefix. Public API functions
68+
are marked with `CURL_EXTERN` in the public header files so that all others
69+
can be hidden on platforms where this is possible.

docs/SECURITY-PROCESS.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ stall and never end, so applications that cannot deal with never-ending
158158
transfers already need to have counter-measures established.
159159

160160
If the problem avoids the regular counter-measures when it causes a never-
161-
ending transfer, it might very well be a security problem.
161+
ending transfer, it might be a security problem.
162162

163163
## Not practically possible
164164

@@ -208,7 +208,7 @@ security vulnerabilities.
208208

209209
- not all systems allow the arguments to be blanked in the first place
210210
- since curl blanks the argument itself they will be readable for a short
211-
moment in time no matter what
211+
moment no matter what
212212
- virtually every argument can contain sensitive data, depending on use
213213
- blanking all arguments would make it impractical for users to differentiate
214214
curl command lines in process listings

docs/WEBSOCKET.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ WebSocket myself.
102102
Here are the reasons why I have decided to move forward with WebSocket in
103103
curl **without using libWebSocket**:
104104

105-
- doxygen generated docs only makes them very hard to navigate. No tutorial,
106-
no clearly written explanatory pages for specific functions.
105+
- doxygen generated docs only makes them hard to navigate. No tutorial, no
106+
clearly written explanatory pages for specific functions.
107107

108108
- seems (too) tightly integrated with a specific TLS library, while we want to
109109
support WebSocket with whatever TLS library libcurl was already made to

docs/examples/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ want you do reorganize them like:
2727

2828
`curl-config --cc` -o example example.c `curl-config --cflags --libs`
2929

30-
**Please** do not use the `curl.se` site as a test target for your
31-
libcurl applications/experiments. Even if some of the examples use that site
32-
as a URL at some places, it does not mean that the URLs work or that we expect
33-
you to actually torture our website with your tests! Thanks.
30+
**Please** do not use the `curl.se` site as a test target for your libcurl
31+
applications/experiments. Even if some of the examples use that site as a URL
32+
at some places, it does not mean that the URLs work or that we expect you to
33+
actually torture our website with your tests. Thanks.
3434

3535
## Examples
3636

docs/libcurl/ABI.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ ABI - Application Binary Interface
3939
During the first seven years of libcurl releases, there have only been four
4040
ABI breakages.
4141

42-
We are determined to bump the SONAME as rarely as possible. Ideally, we
43-
never do it again.
42+
We are determined to bump the SONAME as rarely as possible. Ideally, we never
43+
do it again.
4444

4545
## Downgrades
4646

tests/FILEFORMAT.md

+22-22
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ SPDX-License-Identifier: curl
66

77
# curl test suite file format
88

9-
The curl test suite's file format is very simple and extensible, closely
10-
resembling XML. All data for a single test case resides in a single ASCII
11-
file. Labels mark the beginning and the end of all sections, and each label
12-
must be written in its own line. Comments are either XML-style (enclosed with
13-
`<!--` and `-->`) or shell script style (beginning with `#`) and must appear
14-
on their own lines and not alongside actual test data. Most test data files
15-
are syntactically valid XML, although a few files are not (lack of support for
9+
The curl test suite's file format is simple and extendable, closely resembling
10+
XML. All data for a single test case resides in a single ASCII file. Labels
11+
mark the beginning and the end of all sections, and each label must be written
12+
in its own line. Comments are either XML-style (enclosed with `<!--` and
13+
`-->`) or shell script style (beginning with `#`) and must appear on their own
14+
lines and not alongside actual test data. Most test data files are
15+
syntactically valid XML, although a few files are not (lack of support for
1616
character entities and the preservation of CR/LF characters at the end of
1717
lines are the biggest differences).
1818

@@ -185,11 +185,11 @@ that will be checked/used if specified.
185185

186186
### `<keywords>`
187187
A newline-separated list of keywords describing what this test case uses and
188-
tests. Try to use already used keywords. These keywords will be used for
188+
tests. Try to use already used keywords. These keywords will be used for
189189
statistical/informational purposes and for choosing or skipping classes of
190-
tests. "Keywords" must begin with an alphabetic character, "-", "[" or "{"
191-
and may actually consist of multiple words separated by spaces which are
192-
treated together as a single identifier.
190+
tests. Keywords must begin with an alphabetic character, `-`, `[` or `{` and
191+
may actually consist of multiple words separated by spaces which are treated
192+
together as a single identifier.
193193

194194
When using curl built with Hyper, the keywords must include HTTP or HTTPS for
195195
'hyper mode' to kick in and make line ending checks work for tests.
@@ -245,7 +245,7 @@ Send back this contents instead of the <data> one. The num is set by:
245245
Dynamically changing num in this way allows the test harness to be used to
246246
test authentication negotiation where several different requests must be sent
247247
to complete a transfer. The response to each request is found in its own data
248-
section. Validating the entire negotiation sequence can be done by specifying
248+
section. Validating the entire negotiation sequence can be done by specifying
249249
a datacheck section.
250250

251251
### `<connect>`
@@ -369,7 +369,7 @@ What server(s) this test case requires/uses. Available servers:
369369
- `socks4`
370370
- `socks5`
371371

372-
Give only one per line. This subsection is mandatory.
372+
Give only one per line. This subsection is mandatory.
373373

374374
### `<features>`
375375
A list of features that MUST be present in the client/library for this test to
@@ -437,9 +437,9 @@ Features testable here are:
437437
- `wolfssh`
438438
- `wolfssl`
439439

440-
as well as each protocol that curl supports. A protocol only needs to be
441-
specified if it is different from the server (useful when the server
442-
is `none`).
440+
as well as each protocol that curl supports. A protocol only needs to be
441+
specified if it is different from the server (useful when the server is
442+
`none`).
443443

444444
### `<killserver>`
445445
Using the same syntax as in `<server>` but when mentioned here these servers
@@ -505,20 +505,20 @@ Set `option="no-include"` to prevent the test script to slap on the
505505
`--include` argument.
506506

507507
Set `option="binary-trace"` to use `--trace` instead of `--trace-ascii` for
508-
tracing. Suitable for binary-oriented protocols such as MQTT.
508+
tracing. Suitable for binary-oriented protocols such as MQTT.
509509

510510
Set `timeout="secs"` to override default server logs advisor read lock
511-
timeout. This timeout is used by the test harness, once that the command has
511+
timeout. This timeout is used by the test harness, once that the command has
512512
completed execution, to wait for the test server to write out server side log
513513
files and remove the lock that advised not to read them. The "secs" parameter
514514
is the not negative integer number of seconds for the timeout. This `timeout`
515515
attribute is documented for completeness sake, but is deep test harness stuff
516-
and only needed for very singular and specific test cases. Avoid using it.
516+
and only needed for singular and specific test cases. Avoid using it.
517517

518518
Set `delay="secs"` to introduce a time delay once that the command has
519519
completed execution and before the `<postcheck>` section runs. The "secs"
520520
parameter is the not negative integer number of seconds for the delay. This
521-
'delay' attribute is intended for very specific test cases, and normally not
521+
'delay' attribute is intended for specific test cases, and normally not
522522
needed.
523523

524524
### `<file name="log/filename" [nonewline="yes"]>`
@@ -542,7 +542,7 @@ example.
542542

543543
### `<strip>`
544544
One regex per line that is removed from the protocol dumps before the
545-
comparison is made. This is very useful to remove dependencies on dynamically
545+
comparison is made. This is useful to remove dependencies on dynamically
546546
changing protocol data such as port numbers or user-agent strings.
547547

548548
### `<strippart>`
@@ -582,7 +582,7 @@ If 'nonewline' is set, we will cut off the trailing newline of this given data
582582
before comparing with the one actually received by the client
583583

584584
### `<file name="log/filename" [mode="text"]>`
585-
The file's contents must be identical to this after the test is complete. Use
585+
The file's contents must be identical to this after the test is complete. Use
586586
the mode="text" attribute if the output is in text mode on platforms that have
587587
a text/binary difference.
588588

tests/README.md

+13-14
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,15 @@ SPDX-License-Identifier: curl
113113
Tests which use the ssh test server, SCP/SFTP/SOCKS tests, might be badly
114114
influenced by the output of system wide or user specific shell startup
115115
scripts, .bashrc, .profile, /etc/csh.cshrc, .login, /etc/bashrc, etc. which
116-
output text messages or escape sequences on user login. When these shell
116+
output text messages or escape sequences on user login. When these shell
117117
startup messages or escape sequences are output they might corrupt the
118118
expected stream of data which flows to the sftp-server or from the ssh
119-
client which can result in bad test behavior or even prevent the test
120-
server from running.
119+
client which can result in bad test behavior or even prevent the test server
120+
from running.
121121

122122
If the test suite ssh or sftp server fails to start up and logs the message
123123
'Received message too long' then you are certainly suffering the unwanted
124-
output of a shell startup script. Locate, cleanup or adjust the shell
124+
output of a shell startup script. Locate, cleanup or adjust the shell
125125
script.
126126

127127
### Memory test
@@ -137,18 +137,17 @@ SPDX-License-Identifier: curl
137137

138138
runtests.pl's `-t` option will enable torture testing mode, which runs each
139139
test many times and makes each different memory allocation fail on each
140-
successive run. This tests the out of memory error handling code to ensure
140+
successive run. This tests the out of memory error handling code to ensure
141141
that memory leaks do not occur even in those situations. It can help to
142142
compile curl with `CPPFLAGS=-DMEMDEBUG_LOG_SYNC` when using this option, to
143143
ensure that the memory log file is properly written even if curl crashes.
144144

145145
### Debug
146146

147147
If a test case fails, you can conveniently get the script to invoke the
148-
debugger (gdb) for you with the server running and the exact same command
149-
line parameters that failed. Just invoke `runtests.pl <test number> -g` and
150-
then just type 'run' in the debugger to perform the command through the
151-
debugger.
148+
debugger (gdb) for you with the server running and the same command line
149+
parameters that failed. Just invoke `runtests.pl <test number> -g` and then
150+
just type 'run' in the debugger to perform the command through the debugger.
152151

153152
### Logs
154153

@@ -166,8 +165,8 @@ SPDX-License-Identifier: curl
166165
### Code coverage
167166

168167
gcc provides a tool that can determine the code coverage figures for the
169-
test suite. To use it, configure curl with `CFLAGS='-fprofile-arcs
170-
-ftest-coverage -g -O0'`. Make sure you run the normal and torture tests to
168+
test suite. To use it, configure curl with `CFLAGS='-fprofile-arcs
169+
-ftest-coverage -g -O0'`. Make sure you run the normal and torture tests to
171170
get more full coverage, i.e. do:
172171

173172
make test
@@ -179,14 +178,14 @@ SPDX-License-Identifier: curl
179178
ggcov -r lib src
180179

181180
The text mode tool gcov may also be used, but it doesn't handle object files
182-
in more than one directory very well.
181+
in more than one directory correctly.
183182

184183
### Remote testing
185184

186185
The runtests.pl script provides some hooks to allow curl to be tested on a
187-
machine where perl can not be run. The test framework in this case runs on
186+
machine where perl can not be run. The test framework in this case runs on
188187
a workstation where perl is available, while curl itself is run on a remote
189-
system using ssh or some other remote execution method. See the comments at
188+
system using ssh or some other remote execution method. See the comments at
190189
the beginning of runtests.pl for details.
191190

192191
## Test case numbering

tests/unit/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ We put tests that focus on an area or a specific function into a single C
3636
source file. The source file should be named 'unitNNNN.c' where NNNN is a
3737
previously unused number.
3838

39-
Add your test to `tests/unit/Makefile.inc` (if it is a unit test). Add your
39+
Add your test to `tests/unit/Makefile.inc` (if it is a unit test). Add your
4040
test data file name to `tests/data/Makefile.inc`
4141

4242
You also need a separate file called `tests/data/testNNNN` (using the same
4343
number) that describes your test case. See the test1300 file for inspiration
4444
and the `tests/FILEFORMAT.md` documentation.
4545

46-
For the actual C file, here's a very simple example:
46+
For the actual C file, here's a simple example:
4747
~~~c
4848
#include "curlcheck.h"
4949

winbuild/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Open a Visual Studio Command prompt:
5959

6060
Using the **'VS [version] [platform] [type] Command Prompt'** menu entry:
6161
where [version] is the Visual Studio version, [platform] is e.g. x64 and
62-
[type] Native of Cross platform build. This type of command prompt may not
62+
[type] Native of Cross platform build. This type of command prompt may not
6363
exist in all Visual Studio versions.
6464

6565
See also: [Set the Path and Environment Variables for Command-Line Builds](https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line)

0 commit comments

Comments
 (0)