Docs: Add .new/wen marker for relative includes (Bug 1971)

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index a2a02df4589c5105b8704e5dec665dfd75ce0c86..769b9e1c9885912cbed9d9d796ba032a112274b0 100644 (file)
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -4918,8 +4918,12 @@ using this syntax:
 .endd
 on a line by itself. Double quotes round the file name are optional. If you use
 the first form, a configuration error occurs if the file does not exist; the
 .endd
 on a line by itself. Double quotes round the file name are optional. If you use
 the first form, a configuration error occurs if the file does not exist; the

-second form does nothing for non-existent files. In all cases, an absolute file
+second form does nothing for non-existent files.
+.new
+The first form allows a relative name. It is resolved relative to
+the directory of the including file. For the second form an absolute file

 name is required.
 name is required.

+.wen

 
 Includes may be nested to any depth, but remember that Exim reads its
 configuration file often, so it is a good idea to keep them to a minimum.
 
 Includes may be nested to any depth, but remember that Exim reads its
 configuration file often, so it is a good idea to keep them to a minimum.


@@ -4937,11 +4941,6 @@ Include processing happens after macro processing (see below). Its effect is to
 process the lines of the included file as if they occurred inline where the
 inclusion appears.
 
 process the lines of the included file as if they occurred inline where the
 inclusion appears.
 

-Relative names are allowed with &`.include`&, and are resolved
-relative to the directory of the including file. For security reasons
-this is not allowed with &`.include_if_exists`&. To avoid confusion, it
-is strongly recommended to use absolute names only.
-

 
 
 .section "Macros in the configuration file" "SECTmacrodefs"
 
 
 .section "Macros in the configuration file" "SECTmacrodefs"

diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index 9281b366659dc4ec20d1a1632dd1ee4d8ba2d5d9..603351dc889a07e9de7b6d242e083924cdf34a0c 100644 (file)
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -3,12 +3,14 @@ New Features in Exim
 
 This file contains descriptions of new features that have been added to Exim.
 Before a formal release, there may be quite a lot of detail so that people can
 
 This file contains descriptions of new features that have been added to Exim.
 Before a formal release, there may be quite a lot of detail so that people can

-test from the snapshots or the CVS before the documentation is updated. Once
+test from the snapshots or the Git before the documentation is updated. Once

 the documentation is updated, this file is reduced to a short list.
 
 Version 4.89
 ------------
 
 the documentation is updated, this file is reduced to a short list.
 
 Version 4.89
 ------------
 

+ 1. Allow relative config file names for ".include"
+

 
 Version 4.88
 ------------
 
 Version 4.88
 ------------