Skip to content

Commit 6d5cd3b

Browse files
authored
Merge pull request #587 from cuu508/master
Fix typos
2 parents 13a210f + 420e85c commit 6d5cd3b

File tree

24 files changed

+48
-46
lines changed

24 files changed

+48
-46
lines changed

contrib/kubernetes/chart/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ load balancer in front of the nodes.
99

1010
## Requirement
1111

12-
In order to run maddy properly, you need to have TLS secret undet name maddy present in the cluster. If you have commercial
12+
In order to run maddy properly, you need to have TLS secret under name maddy present in the cluster. If you have commercial
1313
certificate, you can create it by the following command:
1414

1515
```sh
@@ -20,9 +20,9 @@ If you use cert-manager, just create the secret under name maddy.
2020

2121
## Replication
2222

23-
Default for this chart is 1 replica of maddy. If you try to increse this, you will probably get an error because of
23+
Default for this chart is 1 replica of maddy. If you try to increase this, you will probably get an error because of
2424
the busy ports 25, 143, 587, etc. We do not support this feature at the moment, so please use just 1 replica. Like said
25-
at the begining of this document, multiple replicas would probably require to switch do DaemonSet which would further require
25+
at the beginning of this document, multiple replicas would probably require to switch do DaemonSet which would further require
2626
to have TCP load balancer and shared storage between all replicas. This is not supported by this chart, sorry.
2727
This chart is used on one node cluster and then installation is straight forward, like described bellow, but if you have
2828
multiple node cluster, please use taints and tolerations to select the desired node. This chart supports tolerations to

dist/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Additionally, unit files apply strict sandboxing, limiting maddy permissions on
2222
the system to a bare minimum. Subset of these options makes it impossible for
2323
privileged authentication helper binaries to gain required permissions, so you
2424
may have to disable it when using system account-based authentication with
25-
maddy running as a unprivilieged user.
25+
maddy running as a unprivileged user.
2626

2727
## fail2ban configuration
2828

docs/internals/unicode.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,4 @@ mentioned above).
9393

9494
Clients that want to implement proper handling for Unicode strings may assume
9595
maddy does not handle them properly in e.g. SEARCH commands and so such clients
96-
may download messsages and process them locally.
96+
may download messages and process them locally.

docs/multiple-domains.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ the [introduction tutorial](tutorials/setting-up.md).
2828

2929
Also note that you do not really need a separate TLS certificate for each
3030
managed domain. You can have one hostname e.g. mail.example.org set as an MX
31-
record for mulitple domains.
31+
record for multiple domains.
3232

3333
**If you want multiple domains to share username namespace**, you should change
3434
several more options.
@@ -53,7 +53,7 @@ maddy imap-acct create [email protected]
5353
"user"**, you can set `storage_map` in IMAP endpoint and `delivery_map` in
5454
storage backend to use `email_locapart`:
5555
```
56-
straoge.imapsql local_mailboxes {
56+
storage.imapsql local_mailboxes {
5757
...
5858
delivery_map email_localpart # deliver "user@*" to "user"
5959
}

docs/reference/auth/netauth.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ auth.netauth {}
3737

3838
OPTIONAL.
3939

40-
Group that entities must posess to be able to use maddy services.
40+
Group that entities must possess to be able to use maddy services.
4141
This can be used to provide email to just a subset of the entities
4242
present in NetAuth.
4343

docs/reference/checks/authorize_sender.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ Normalization function to apply to authorization username before
9494
further processing.
9595

9696
Available options:
97-
- `auto` `precis_casefold_email` for valid emails, `precise_casefold` otherwise.
97+
98+
- `auto` `precis_casefold_email` for valid emails, `precis_casefold` otherwise.
9899
- `precis_casefold_email` PRECIS UsernameCaseMapped profile + U-labels form for domain
99100
- `precis_casefold` PRECIS UsernameCaseMapped profile for the entire string
100101
- `precis_email` PRECIS UsernameCasePreserved profile + U-labels form for domain

docs/reference/checks/command.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,5 +127,5 @@ the message pipeline action.
127127

128128
Two codes are defined implicitly, exit code 1 causes the message to be rejected
129129
with a permanent error, exit code 2 causes the message to be quarantined. Both
130-
action can be overriden using the 'code' directive.
130+
action can be overridden using the 'code' directive.
131131

docs/reference/checks/dkim.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ check.dkim {
1919
**Syntax**: debug _boolean_ <br>
2020
**Default**: global directive value
2121

22-
Log both successfull and unsuccessful check executions instead of just
22+
Log both successful and unsuccessful check executions instead of just
2323
unsuccessful.
2424

2525
**Syntax**: required\_fields _string..._ <br>

docs/reference/checks/dnsbl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ The check.dnsbl module implements checking of source IP and hostnames against a
44
of DNS-based Blackhole lists (DNSBLs).
55

66
Its configuration consists of module configuration directives and a set
7-
of blocks specifing lists to use and kind of lookups to perform on them.
7+
of blocks specifying lists to use and kind of lookups to perform on them.
88

99
```
1010
check.dnsbl {

docs/reference/checks/misc.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ Action to take when check fails. See Check actions for details.
1515
**Syntax**: debug _boolean_ <br>
1616
**Default**: global directive value
1717

18-
Log both sucessfull and unsucessfull check executions instead of just
19-
unsucessfull.
18+
Log both successful and unsuccessful check executions instead of just
19+
unsuccessful.
2020

2121
## require\_mx\_record
2222

docs/reference/checks/spf.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -46,38 +46,38 @@ Enable verbose logging for check.spf.
4646
Make policy decision on MAIL FROM stage (before the message body is received).
4747
This makes it impossible to apply DMARC override (see above).
4848

49-
**Syntax**: none\_action reject|qurantine|ignore <br>
49+
**Syntax**: none\_action reject|quarantine|ignore <br>
5050
**Default**: ignore
5151

5252
Action to take when SPF policy evaluates to a 'none' result.
5353

5454
See [https://tools.ietf.org/html/rfc7208#section-2.6](https://tools.ietf.org/html/rfc7208#section-2.6) for meaning of
5555
SPF results.
5656

57-
**Syntax**: neutral\_action reject|qurantine|ignore <br>
57+
**Syntax**: neutral\_action reject|quarantine|ignore <br>
5858
**Default**: ignore
5959

6060
Action to take when SPF policy evaluates to a 'neutral' result.
6161

6262
See [https://tools.ietf.org/html/rfc7208#section-2.6](https://tools.ietf.org/html/rfc7208#section-2.6) for meaning of
6363
SPF results.
6464

65-
**Syntax**: fail\_action reject|qurantine|ignore <br>
65+
**Syntax**: fail\_action reject|quarantine|ignore <br>
6666
**Default**: quarantine
6767

6868
Action to take when SPF policy evaluates to a 'fail' result.
6969

70-
**Syntax**: softfail\_action reject|qurantine|ignore <br>
70+
**Syntax**: softfail\_action reject|quarantine|ignore <br>
7171
**Default**: ignore
7272

7373
Action to take when SPF policy evaluates to a 'softfail' result.
7474

75-
**Syntax**: permerr\_action reject|qurantine|ignore <br>
75+
**Syntax**: permerr\_action reject|quarantine|ignore <br>
7676
**Default**: reject
7777

7878
Action to take when SPF policy evaluates to a 'permerror' result.
7979

80-
**Syntax**: temperr\_action reject|qurantine|ignore <br>
80+
**Syntax**: temperr\_action reject|quarantine|ignore <br>
8181
**Default**: reject
8282

8383
Action to take when SPF policy evaluates to a 'temperror' result.

docs/reference/endpoints/imap.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ imap tcp://0.0.0.0:143 tls://0.0.0.0:993 {
3131
**Default**: global directive value
3232

3333
TLS certificate & key to use. Fine-tuning of other TLS properties is possible
34-
by specifing a configuration block and options inside it:
34+
by specifying a configuration block and options inside it:
3535
```
3636
tls cert.crt key.key {
3737
protocols tls1.2 tls1.3

docs/reference/endpoints/smtp.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Server name to use in SMTP banner.
4949
**Default**: global directive value
5050

5151
TLS certificate & key to use. Fine-tuning of other TLS properties is possible
52-
by specifing a configuration block and options inside it:
52+
by specifying a configuration block and options inside it:
5353
```
5454
tls cert.crt key.key {
5555
protocols tls1.2 tls1.3
@@ -111,7 +111,7 @@ clients that don't expect an error early in session.
111111
**Default**: 5
112112

113113
Amount of RCPT-time errors that should be logged. Further errors will be
114-
handled silently. This is to prevent log flooding during email dictonary
114+
handled silently. This is to prevent log flooding during email dictionary
115115
attacks (address probing).
116116

117117
**Syntax**: max\_received _integer_ <br>
@@ -202,7 +202,7 @@ for all messages ("all"), per-sender IP ("ip"), per-sender domain ("source") or
202202
per-recipient domain ("destination"). Having a scope other than "all" means
203203
that the restriction will be enforced independently for each group determined
204204
by scope. E.g. "ip rate 20" means that the same IP cannot send more than 20
205-
messages in a scond. "destination concurrency 5" means that no more than 5
205+
messages per second. "destination concurrency 5" means that no more than 5
206206
messages can be sent in parallel to a single domain.
207207

208208
**Note**: At the moment, SMTP endpoint on its own does not support per-recipient
@@ -233,7 +233,7 @@ messages can enter the server through both endpoints in one second.
233233
# Submission module (submission)
234234

235235
Module 'submission' implements all functionality of the 'smtp' module and adds
236-
certain message preprocessing on top of it, additionaly authentication is
236+
certain message preprocessing on top of it, additionally authentication is
237237
always required.
238238

239239
'submission' module checks whether addresses in header fields From, Sender, To,

docs/reference/global-config.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ Normalization function to apply to SASL usernames before mapping
6565
them to storage accounts.
6666

6767
Available options:
68-
- `auto` `precis_casefold_email` for valid emails, `precise_casefold` otherwise.
68+
69+
- `auto` `precis_casefold_email` for valid emails, `precis_casefold` otherwise.
6970
- `precis_casefold_email` PRECIS UsernameCaseMapped profile + U-labels form for domain
7071
- `precis_casefold` PRECIS UsernameCaseMapped profile for the entire string
7172
- `precis_email` PRECIS UsernameCasePreserved profile + U-labels form for domain

docs/reference/modifiers/dkim.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,5 +195,5 @@ require\_sender\_match checks. Only first address will be checked, however.
195195

196196
Sign emails from subdomains using a top domain key.
197197

198-
Allows only one domain to be specified (can be workarounded using modify.dkim
198+
Allows only one domain to be specified (can be worked around by using modify.dkim
199199
multiple times).

docs/reference/storage/imap-filters.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ modifying IMAP-specific message attributes. In particular, it allows
66
code to change target folder and add IMAP flags (keywords) to the message.
77

88
There is no way to reject message using IMAP filters, this should be done
9-
eariler in SMTP pipeline logic. Quarantined messages are not processed
9+
earlier in SMTP pipeline logic. Quarantined messages are not processed
1010
by IMAP filters and are unconditionally delivered to Junk folder (or other
1111
folder with \Junk special-use attribute).
1212

@@ -44,7 +44,7 @@ access to the SMTP envelope recipient (before and after any rewrites),
4444

4545
Note that if you use provided systemd units on Linux, maddy executable is
4646
sandboxed - all commands will be executed with heavily restricted filesystem
47-
acccess and other privileges. Notably, /tmp is isolated and all directories
47+
access and other privileges. Notably, /tmp is isolated and all directories
4848
except for /var/lib/maddy and /run/maddy are read-only. You will need to modify
4949
systemd unit if your command needs more privileges.
5050

docs/reference/targets/queue.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ limits amount of messages tried to be delivered concurrently.
5656
**Default**: 20
5757

5858
Attempt delivery up to _integer_ times. Note that no more attempts will be done
59-
is permanent error occured during previous attempt.
59+
is permanent error occurred during previous attempt.
6060

61-
Delay before the next attempt will be increased exponentally using the
61+
Delay before the next attempt will be increased exponentially using the
6262
following formula: 15mins \* 1.2 ^ (n - 1) where n is the attempt number.
6363
This gives you approximately the following sequence of delays:
6464
18mins, 21mins, 25mins, 31mins, 37mins, 44mins, 53mins, 64mins, ...
@@ -67,7 +67,7 @@ This gives you approximately the following sequence of delays:
6767
**Default**: not specified
6868

6969
This configuration contains pipeline configuration to be used for generated DSN
70-
(Delivery Status Notifiaction) messages.
70+
(Delivery Status Notification) messages.
7171

7272
If this is block is not present in configuration, DSNs will not be generated.
7373
Note, however, this is not what you want most of the time.

docs/reference/targets/remote.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ mtasts {
138138
```
139139

140140
If the mx\_auth directive is not specified, no mechanisms are enabled. Note
141-
that, however, this makes outbound SMTP vulnerable to a numberous downgrade
141+
that, however, this makes outbound SMTP vulnerable to a numerous downgrade
142142
attacks and hence not recommended.
143143

144144
It is possible to share the same set of policies for multiple 'remote' module
@@ -201,9 +201,9 @@ Filesystem directory to use for policies caching if 'cache' is set to 'fs'.
201201

202202
Checks whether MX records are signed. Sets MX level to "dnssec" is they are.
203203

204-
maddy does not validate DNSSEC signatures on its own. Instead it reslies on
204+
maddy does not validate DNSSEC signatures on its own. Instead it relies on
205205
the upstream resolver to do so by causing lookup to fail when verification
206-
fails and setting the AD flag for signed and verfified zones. As a safety
206+
fails and setting the AD flag for signed and verified zones. As a safety
207207
measure, if the resolver is not 127.0.0.1 or ::1, the AD flag is ignored.
208208

209209
DNSSEC is currently not supported on Windows and other platforms that do not

docs/seclevels.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ maddy defines two values indicating how "secure" delivery of message will be:
4545
- TLS security level
4646

4747
These values correspond to the problems described above. On delivery, the
48-
estabilished connection to the remote server is "ranked" using these values and
48+
established connection to the remote server is "ranked" using these values and
4949
then they are compared against a number of policies (including local
5050
configuration). If the effective value is lower than the required one, the
5151
connection is closed and next candidate server is used. If all connections fail
@@ -67,14 +67,14 @@ attacks
6767
- MX level: None. MX candidate was returned as a result of DNS lookup for the
6868
recipient domain, no additional checks done.
6969
- MX level: MTA-STS. Used MX matches the MTA-STS policy published by the
70-
recepient domain (even one in testing mode).
70+
recipient domain (even one in testing mode).
7171
- MX level: DNSSEC. MX record is signed.
7272

73-
- TLS level: None. Plaintext connection was estabilished, TLS is not available
73+
- TLS level: None. Plaintext connection was established, TLS is not available
7474
or failed.
75-
- TLS level: Encrypted. TLS connection was estabilished, the server certificate
75+
- TLS level: Encrypted. TLS connection was established, the server certificate
7676
failed X.509 and DANE verification.
77-
- TLS level: Authenticated. TLS connection was estabilished, the server
77+
- TLS level: Authenticated. TLS connection was established, the server
7878
certificate passes X.509 **or** DANE verification.
7979

8080
**Note 1:** Persistent attacker able to control network connection can

docs/third-party/dovecot.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Dovecot
22

33
Builtin maddy IMAP server may not match your requirements in terms of
4-
performance, reliabilty or anything. For this reason it is possible to
4+
performance, reliability or anything. For this reason it is possible to
55
integrate it with any external IMAP server that implements necessary
66
protocols. Here is how to do it for Dovecot.
77

@@ -69,7 +69,7 @@ smtp tcp://127.0.0.1:587 {
6969
deliver_to &remote_queue
7070
}
7171
```
72-
And configure IMAP servers's Submission service to forward outbound messages
72+
And configure IMAP server's Submission service to forward outbound messages
7373
there.
7474

7575
Depending on how Submission service is implemented you may also need to route

docs/third-party/mailman3.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ lmtp_port: 8024
2020

2121
After that, you will need to configure maddy to send messages to Mailman.
2222

23-
The preferrable way of doing so is destination_in and table.regexp:
23+
The preferable way of doing so is destination_in and table.regexp:
2424
```
2525
msgpipeline local_routing {
2626
destination_in regexp "first-mailinglist(-(bounces\+.*|confirm\+.*|join|leave|owner|request|subscribe|unsubscribe))[email protected]" {

docs/third-party/smtp-servers.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ lmtp unix:/run/maddy/lmtp.sock {
4343
Look up documentation for your SMTP server on how to make it
4444
send messages using LMTP to /run/maddy/lmtp.sock.
4545

46-
To handle authentiation for Submission (client-server SMTP) SMTP server
46+
To handle authentication for Submission (client-server SMTP) SMTP server
4747
needs to access credentials database used by maddy. maddy implements
4848
server side of Dovecot authentication protocol so you can use
4949
it if SMTP server implements "Dovecot SASL" client.

docs/tutorials/alias-to-remote.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ msgpipeline local_routing {
8888
## Bounce handling
8989

9090
Once the message is delivered to `remote_queue`, it will follow the usual path
91-
for outbound delivery, including queueing and multiple attempts. This also
91+
for outbound delivery, including queuing and multiple attempts. This also
9292
means bounce messages will be generated on failures. When accepting messages
9393
from arbitrary senders via the 25 port, the DSN recipient will be whatever
9494
sender specifies in the MAIL FROM command. This is prone to [collateral spam]

internal/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ maddy source tree
44
Main maddy code base lives here. No packages are intended to be used in
55
third-party software hence API is not stable.
66

7-
Subdirectories are organised as follows:
7+
Subdirectories are organized as follows:
88
```
99
/
1010
auxiliary libraries

0 commit comments

Comments
 (0)