Skip to content

Commit

Permalink
Fixed recurring language mistake.
Browse files Browse the repository at this point in the history
  • Loading branch information
stephanbosch committed Jan 19, 2016
1 parent 9e93a50 commit 2bb0c62
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions NEWS
Expand Up @@ -379,7 +379,7 @@ v0.3.0 16-02-2012 Stephan Bosch <stephan@rename-it.nl>
still recognized for backwards compatibility. Support for the ancient (pre
v1.1) name for this setting "global_script_path" is now dropped.
* Added means to prohibit use of redirect action. Setting sieve_max_redirects
to 0 now means that redirect is disallowed in stead of unlimited. Default
to 0 now means that redirect is disallowed instead of unlimited. Default
value remains four.
* Fixed interaction of Sieve include extension with ManageSieve. It is updated
to match new requirements in the draft include specification. Missing
Expand Down Expand Up @@ -605,7 +605,7 @@ v0.2.0 10-09-2010 Stephan Bosch <stephan@rename-it.nl>
- Imap4flags: fixed bug in setflag command; when parameter was a stringlist,
only the last item was actually set.
- Variables extension: fixed :length set modifier to recognize utf8 characters
in stead of octets.
instead of octets.
- Testsuite: prevented innocent warning messages, i.e. those that are part of
the test, from showing up by default.
- ManageSieve/Sieve storage: fixed error handling of PUTSCRIPT commmand; save
Expand Down Expand Up @@ -645,7 +645,7 @@ v0.1.16 30-04-2010 Stephan Bosch <stephan@rename-it.nl>
+ Vacation extension: the from address of the generated reply is now by
default equal to whatever known recipient alias matched the headers of the
message. If it is one of the aliases specified with :addresses, it is used
in stead of the envelope recipient address that was used before.
instead of the envelope recipient address that was used before.
+ Restructured and optimized the lexical scanner.
+ Added --with-docs configure option to allow disabling installation of
documentation.
Expand Down Expand Up @@ -791,7 +791,7 @@ v0.1.10 03-08-2009 Stephan Bosch <stephan@rename-it.nl>
- Fixed a bug in the derivation of the binary path from the script path. A
bare filename would yield a path relative to root.
- Fixed a bug in the value matching code. The context data now uses a proper
pool in stead of the data stack. Bug reported by Jan Sechser.
pool instead of the data stack. Bug reported by Jan Sechser.
- Fixed assertion fail in the include extension caused by missing
initialization upon binary load. This bug surfaces only for stored
binaries. Bug reported by Tom Hendrikx.
Expand All @@ -808,7 +808,7 @@ v0.1.9 22-07-2009 Stephan Bosch <stephan@rename-it.nl>
only built when the --with-unfinished-features switch is supplied during
configure.
+ Started building support for the ereject version of the reject action,
which has a preference to use an SMTP/LMTP protocol error in stead of a
which has a preference to use an SMTP/LMTP protocol error instead of a
bounce message. This is to be used to make the Sieve plugin honour Deliver's
-e parameter. This is not yet finished and not built by default.
+ Improved 'Permission denied' error messages just like Dovecot does,
Expand Down
2 changes: 1 addition & 1 deletion doc/extensions/spamtest-virustest.txt
Expand Up @@ -57,7 +57,7 @@ sieve_spamtest_max_value =
sieve_spamtest_max_header = <header-field> [ ":" <regexp> ]
Some spam scanners include the maximum score value in one of their status
headers. Using this setting, this maximum can be extracted from the message
itself in stead of specifying the maximum manually using the setting
itself instead of specifying the maximum manually using the setting
`sieve_spamtest_max_value' explained above. The syntax is identical to the
`sieve_spamtext_status_header' setting.

Expand Down
6 changes: 3 additions & 3 deletions doc/man/sieve-test.1.in
Expand Up @@ -19,10 +19,10 @@ Using the \fBsieve\-test\fP command, the execution of Sieve scripts can be
tested. This evaluates the script for the provided message, yielding a set of
Sieve actions. Unless the \fB\-e\fP option is specified, it does not actually
execute these actions, meaning that it does not store or forward the message
anywere. In stead, it prints a detailed list of what actions would normally take
anywere. Instead, it prints a detailed list of what actions would normally take
place. Note that, even when \fB\-e\fP is specified, no messages are ever
transmitted to remote SMTP recipients. The outgoing messages are always printed
to \fBstdout\fP in stead.
to \fBstdout\fP instead.
.PP
This is a very useful tool to debug the execution of Sieve scripts. It can be
used to verify newly installed scripts for the intended behaviour and it can
Expand Down Expand Up @@ -91,7 +91,7 @@ The final envelope recipient address. Some tests and actions will
use this as the script owner\(aqs e\-mail address. For example, this is what is
used by the vacation action to check whether a reply is appropriate. If the
\fB\-r\fP option is omitted, the orignal envelope recipient address will be used
in stead (see \fB\-a\fP option for more info).
instead (see \fB\-a\fP option for more info).
.TP
.BI \-s\ script\-file
Specify additional scripts to be executed before the main script. Multiple
Expand Down
2 changes: 1 addition & 1 deletion src/lib-sieve/plugins/variables/ext-variables-name.h
Expand Up @@ -26,7 +26,7 @@
* Various options exist to provide this feature. If the extension is entirely
* namespace-based there is actually not very much of a problem. The variable
* list can easily be extended with new argument-types that refer to a variable
* identifier in stead of an index in the variable's storage.
* identifier instead of an index in the variable's storage.
*/

#include "lib.h"
Expand Down
2 changes: 1 addition & 1 deletion src/managesieve-login/managesieve-proxy.c
Expand Up @@ -360,7 +360,7 @@ int managesieve_proxy_parse_line(struct client *client, const char *line)
if ( ret == 0 ) {
if ( response != MANAGESIEVE_RESPONSE_OK ) {
client_log_err(client, "proxy: "
"Remote sent unexpected NO/BYE in stead of capability response");
"Remote sent unexpected NO/BYE instead of capability response");
client_proxy_failed(client, TRUE);
return -1;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/compile/errors/if.sieve
Expand Up @@ -65,7 +65,7 @@ if true {
if if true {
}

# Else if in stead of elsif
# Else if instead of elsif

if true {
stop;
Expand Down

0 comments on commit 2bb0c62

Please sign in to comment.