diff --git a/CHANGELOG.md b/CHANGELOG.md index 3379de8..27b00a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,8 @@ * Add `--reply-code`, `--reply-status-code`, and `--reply-text` options to allow customising the SMTP reply when rejecting spam. -* Log a warning and do not truncate message body when `--max-message-size` is - misconfigured (must be ≥ `spamc` max size as documented). +* Log a warning and do not truncate the message body when `--max-message-size` + is misconfigured (must be ≥ `spamc` max size as documented). * Update dependencies in `Cargo.lock`. ## 0.1.2 (2020-06-07) diff --git a/Cargo.lock b/Cargo.lock index 6c197e1..3858d04 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -212,9 +212,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" +checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" [[package]] name = "unicode-xid" diff --git a/README.md b/README.md index 6c06f17..93c1159 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ SpamAssassin Milter can be installed using Cargo. The program will be installed in the local installation’s `bin` directory as usual: ``` -cargo install spamassassin-milter +cargo install --locked spamassassin-milter ``` Again, if your distribution does not provide pkg-config metadata, try using the @@ -81,8 +81,8 @@ then run the above install command with `PKG_CONFIG_PATH` set to that directory. Once installed, SpamAssassin Milter can be invoked as `spamassassin-milter`. `spamassassin-milter` takes one mandatory argument, namely the listening socket -of the milter (the socket to which the MTA will connect). The socket spec can be -in one of the formats inet:port@host or +of the milter (the socket to which the MTA will connect). The socket spec should +be in one of the formats inet:port@host or inet6:port@host (for IPv6), or unix:path, for a TCP or UNIX domain socket, respectively. @@ -234,8 +234,8 @@ submitted via a SASL-authenticated channel). ## Integration with mail delivery -A further component that can be useful with SpamAssassin Milter is a -[Sieve]-capable mail delivery service. A Sieve script can for example look at +A further component that may be useful with SpamAssassin Milter is a +[Sieve]-capable mail delivery service. A Sieve script may for example look at the `X-Spam-` SpamAssassin headers of the incoming message, and take action based on those. diff --git a/spamassassin-milter.8 b/spamassassin-milter.8 index 950c1e6..4926a52 100644 --- a/spamassassin-milter.8 +++ b/spamassassin-milter.8 @@ -70,7 +70,7 @@ If this option is not used, authenticated senders are trusted, and their messages are not processed with SpamAssassin. .TP .BR \-n ", " \-\-dry-run -Process messages as usual, but do not take action or apply any modifications. +Process messages normally, but do not take action or apply any modifications. Combined with .BR \-\-verbose , this gives accurate insight into what would happen if run without @@ -90,7 +90,8 @@ size configured for .BR spamc . Defaults to the .B spamc -default, 512000. +default, +.BR 512000 . .TP .BR \-B ", " \-\-preserve-body Suppress rewriting of spam message body.