From 39d262b83fee69d4463bde978291a809b0f23c4a Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Tue, 26 Nov 2024 11:00:07 +0000 Subject: [PATCH 1/1] Docs: tidying --- doc/doc-docbook/spec.xfpt | 5 ++++- src/src/exim_msgdate.src | 4 ++-- src/src/eximstats.src | 12 ++++++------ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index 193884227..1b0dd8832 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -5216,7 +5216,7 @@ This can then be used in a &(redirect)& router setting like this: data = ${lookup mysql{ALIAS_QUERY}} .endd In earlier versions of Exim macros were sometimes used for domain, host, or -address lists. In Exim 4 these are handled better by named lists &-- see +address lists. In Exim version 4 these are handled better by named lists &-- see section &<>&. @@ -9259,6 +9259,8 @@ does not match the list. This may not always be what you want to happen. To change Exim's behaviour, the special items &`+include_unknown`& or &`+ignore_unknown`& may appear in the list (at top level &-- they are not recognized in an indirected file). +The effects of these special items do not propagate into referenced +named lists. .ilist If any item that follows &`+include_unknown`& requires information that @@ -9625,6 +9627,7 @@ longer case-independent. This does not affect the domain, which remains in lower case. However, although independent matches on the domain alone are still performed caselessly, regular expressions that match against an entire address become case-sensitive after &"+caseful"& has been seen. +The effects of &"+caseful"& propagate into any referenced named lists. .new This string may not be tainted. diff --git a/src/src/exim_msgdate.src b/src/src/exim_msgdate.src index 337f828ce..0066e60fb 100644 --- a/src/src/exim_msgdate.src +++ b/src/src/exim_msgdate.src @@ -605,7 +605,7 @@ The value is an integer between 0 and 16, or the value "none" which means there is no localhost_number. Do not confuse this with the L<--local|/l---local> option, which displays times - in the local timezone. +in the local timezone. =item B<--C> B @@ -614,7 +614,7 @@ We set C from the exim configfile. =item B<-dexim_path> -The test test harness passes the full path of the C binary, +The test harness passes the full path of the C binary, or here the C being tested. Not currently used. =back diff --git a/src/src/eximstats.src b/src/src/eximstats.src index 4776c85b7..84f100dcd 100644 --- a/src/src/eximstats.src +++ b/src/src/eximstats.src @@ -395,7 +395,7 @@ Show the delivery times (B
)for all the messages. Exim must have been configured to use the +deliver_time logging option for this option to work. -I is an optional list of times. Eg -show_dt1,2,4,8 will show +I is an optional list of times. E.g. -show_dt1,2,4,8 will show the number of messages with delivery times under 1 second, 2 seconds, 4 seconds, 8 seconds, and over 8 seconds. @@ -408,7 +408,7 @@ These figures will be skewed by pipelined messages so might not be that useful. Exim must have been configured to use the +queue_time_overall logging option for this option to work. -I is an optional list of times. Eg -show_rt1,2,4,8 will show +I is an optional list of times. E.g. -show_rt1,2,4,8 will show the number of messages with receipt times under 1 second, 2 seconds, 4 seconds, 8 seconds, and over 8 seconds. @@ -436,14 +436,14 @@ May be combined with B<-byhost> and/or B<-bydomain> and/or B<-byemail>. =item B<-pattern> I I Look for the specified pattern and count the number of lines in which it appears. -This option can be specified multiple times. Eg: +This option can be specified multiple times: -pattern 'Refused connections' '/refused connection/' =item B<-merge> -This option allows eximstats to merge old eximstat reports together. Eg: +This option allows eximstats to merge old eximstat reports together: eximstats mainlog.sun > report.sun.txt eximstats mainlog.mon > report.mon.txt @@ -520,8 +520,8 @@ we will output an error message if we don't find any. =item B<-d> Debug flag. This outputs the eval()'d parser onto STDOUT which makes it -easier to trap errors in the eval section. Remember to add 1 to the line numbers to allow for the -title! +easier to trap errors in the eval section. +Remember to add 1 to the line numbers to allow for the title! =back -- 2.30.2