From 5c4ff5777ebc535130720600922af25ebad1de0f Mon Sep 17 00:00:00 2001 From: "Adam D. Barratt" Date: Sun, 22 Sep 2019 18:38:43 +0100 Subject: [PATCH] eximconf.erb: consistently capitalise Exim and Debian Signed-off-by: Adam D. Barratt --- modules/exim/templates/eximconf.erb | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index c652add6d..c3ef30b6e 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -8,7 +8,7 @@ # The configuration file uses a set of rules to generate an # acceptable mail environment for debian.org machines. It deviates -# considerably from what could be considered a standard exim configuration. +# considerably from what could be considered a standard Exim configuration. # This configuration file brings in the necessary information from # other databases stored in /etc/exim4/ and the files distributed by ud-ldap @@ -37,7 +37,7 @@ # elsewhere. This is designed for use with small volume or # restricted machines that need to use a smarthost for mail # traffic. We will relay for them based on ssl cert validation -# but we need to teach exim how to route the mail to them. This is +# but we need to teach Exim how to route the mail to them. This is # that list. <%- end -%> @@ -50,9 +50,9 @@ # Further details can be found in each of the files. -# Useful exim commands: +# Useful Exim commands: # exim4 -qf - Try sending all messages right now, including frozen ones -# exim4 -bt foo@blah - Write what exim would do if it saw the address +# exim4 -bt foo@blah - Write what Exim would do if it saw the address # Great for testing virtual domains and forward files # Special Features for users: @@ -159,14 +159,14 @@ local_from_check = false # Some operating systems use the "gecos" field in the system password file # to hold other information in addition to users' real names. Exim looks up # this field when it is creating "sender" and "from" headers. If these options -# are set, exim uses "gecos_pattern" to parse the gecos field, and then +# are set, Exim uses "gecos_pattern" to parse the gecos field, and then # expands "gecos_name" as the user's name. $1 etc refer to sub-fields matched # by the pattern. gecos_pattern = ^([^,:]*) gecos_name = $1 -# This tells exim to immediately discard error messages (ie double bounces). +# This tells Exim to immediately discard error messages (ie double bounces). ignore_bounce_errors_after = 0s auto_thaw = 1d timeout_frozen_after=14d @@ -663,7 +663,7 @@ check_recipient: # sadly. etch's version attempts to hold the socket open, since that's what # postfix expects. Exim, on the other hand, expects the remote side to close # the socket when it's finished sending data, so it see each transaction as - # an incomplete read. I'm sure there's a way we could force exim to do + # an incomplete read. I'm sure there's a way we could force Exim to do # something sick and clever to force either the interpretation or the socket # closure, but I'm fairly sure it's now worth it, since the backport of # policyd-weight is trivial. @@ -1141,9 +1141,9 @@ system_aliases: # current one gets passed on instead. This covers the case where A is # aliased to B and B has a .forward file pointing to A. -# For standard debian setup of one group per user, it is acceptable---normal +# For standard Debian setup of one group per user, it is acceptable---normal # even---for .forward to be group writable. If you have everyone in one -# group, you should comment out the "modemask" line. Without it, the exim +# group, you should comment out the "modemask" line. Without it, the Exim # default of 022 will apply, which is probably what you want. userforward_verify: @@ -1368,7 +1368,7 @@ rt_otherwise: headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}\nSubject: ${if and {{first_delivery}{match {$h_subject:}{(?i)(.*?)\\\\[?debian rt\\\\]?[:\\s]*(.*)}}} {$1$2}{$h_subject:}}" <%- end -%> -# exim4 fails the router if it can't change to the user/group for delivery +# Exim fails the router if it can't change to the user/group for delivery # during verification. So we have to seperate the cases of verifying # the virts, and delivering to them. blah. @@ -1487,7 +1487,7 @@ out begin transports -# This transport is used for local delivery to user mailboxes. On debian +# This transport is used for local delivery to user mailboxes. On Debian # systems group mail is used so we can write to the /var/mail # directory. (The alternative, which most other unixes use, is to deliver # as the user's own group, into a sticky-bitted directory) -- 2.20.1