aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/doc
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2018-06-15 09:58:51 +0200
committerGitHub <[email protected]>2018-06-15 09:58:51 +0200
commita939b26c1a62e0d1c0a35f084b69765d9b64dfa4 (patch)
tree3263af5cf651f751e3fd198f73123d22b52a8cee /lib/kernel/doc
parent115b0fa6d1374de08789a9431dc34c633663f598 (diff)
parentafee0fcc6a23da8ac31310606004fa42b6cf65a9 (diff)
downloadotp-a939b26c1a62e0d1c0a35f084b69765d9b64dfa4.tar.gz
otp-a939b26c1a62e0d1c0a35f084b69765d9b64dfa4.tar.bz2
otp-a939b26c1a62e0d1c0a35f084b69765d9b64dfa4.zip
Merge pull request #1838 from crownedgrouse/master
Included config files relative to sys.config directory OTP-15137
Diffstat (limited to 'lib/kernel/doc')
-rw-r--r--lib/kernel/doc/src/config.xml9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/kernel/doc/src/config.xml b/lib/kernel/doc/src/config.xml
index 8850c1736b..3f01170508 100644
--- a/lib/kernel/doc/src/config.xml
+++ b/lib/kernel/doc/src/config.xml
@@ -86,8 +86,13 @@
<tag><c>File = string()</c></tag>
<item>Name of another <c>.config</c> file.
Extension <c>.config</c> can be omitted. It is
- recommended to use absolute paths. A relative path is
- relative the current working directory of the emulator.</item>
+ recommended to use absolute paths. If a relative path is used,
+ <c>File</c> is searched, first, relative from <c>sys.config</c> directory, then relative
+ to the current working directory of the emulator, for backward compatibility.
+ This allow to use a <c>sys.config</c> pointing out other <c>.config</c> files in a release
+ or in a node started manually using <c>-config ...</c> with same result whatever
+ the current working directory.
+ </item>
</taglist>
<p>When traversing the contents of <c>sys.config</c> and a filename
is encountered, its contents are read and merged with the result