diff options
| author | Todd Lyons <tlyons@exim.org> | 2013-10-06 19:31:57 -0700 |
|---|---|---|
| committer | Todd Lyons <tlyons@exim.org> | 2013-10-06 19:31:57 -0700 |
| commit | ff57314ec0e6f83302fb2644ca16928322ff62a1 (patch) | |
| tree | 4f6761f85bac9650fe682a58a15595854c6bfd92 | |
| parent | 9fc5a3526034036897d836fbd373ae7af9c43bdc (diff) | |
| parent | 08fdff825ee583e6a76d707f368d909e3a396a11 (diff) | |
| download | exim4-ff57314ec0e6f83302fb2644ca16928322ff62a1.tar.gz | |
Merge branch 'master' of ssh://git.exim.org/home/git/exim
| -rw-r--r-- | doc/doc-docbook/spec.xfpt | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index 0d6ab9af6..31767bf55 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -15376,6 +15376,13 @@ live with. . Allow this long option name to split; give it unsplit as a fifth argument . for the automatic .oindex that is generated by .option. +. We insert " &~&~" which is both pretty nasty visually and results in +. non-searchable text. HowItWorks.txt mentions an option for inserting +. zero-width-space, which would be nicer visually and results in (at least) +. html that Firefox will split on when it's forced to reflow (rather than +. inserting a horizontal scrollbar). However, the text is still not +. searchable. NM changed this occurrence for bug 1197 to no longer allow +. the option name to split. .option "smtp_accept_max_per_connection" main integer 1000 &&& smtp_accept_max_per_connection @@ -15427,10 +15434,9 @@ also &%queue_only%&, &%queue_only_load%&, &%queue_smtp_domains%&, and the various &%-od%&&'x'& command line options. -. Allow this long option name to split; give it unsplit as a fifth argument -. for the automatic .oindex that is generated by .option. +. See the comment on smtp_accept_max_per_connection -.option "smtp_accept_queue_per_ &~&~connection" main integer 10 &&& +.option "smtp_accept_queue_per_connection" main integer 10 &&& smtp_accept_queue_per_connection .cindex "queueing incoming messages" .cindex "message" "queueing by message count" @@ -23604,7 +23610,7 @@ In practice, almost all rules start with a domain name pattern without a local part. .cindex "regular expressions" "in retry rules" -&*Warning*&: If you use a regular expression in a routing rule pattern, it +&*Warning*&: If you use a regular expression in a retry rule pattern, it must match a complete address, not just a domain, because that is how regular expressions work in address lists. .display |