aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl/doc/src/systools.xml
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2018-03-05 14:54:42 +0100
committerGitHub <[email protected]>2018-03-05 14:54:42 +0100
commitf52f9f312d811e0a8b83b8427944f4e9b3ffd6b8 (patch)
tree695ff2dc9399806d19ed85d0809b78e18407961a /lib/sasl/doc/src/systools.xml
parent93b037b02e2863c93df6cf70ab96137822904df6 (diff)
parent1cf7851ccb002c95c0ef19a67807fb33895b723b (diff)
downloadotp-f52f9f312d811e0a8b83b8427944f4e9b3ffd6b8.tar.gz
otp-f52f9f312d811e0a8b83b8427944f4e9b3ffd6b8.tar.bz2
otp-f52f9f312d811e0a8b83b8427944f4e9b3ffd6b8.zip
Merge pull request #1560 from tsloughter/no_warn_sysconfig
Include sys.config.src in release tar file OTP-14950
Diffstat (limited to 'lib/sasl/doc/src/systools.xml')
-rw-r--r--lib/sasl/doc/src/systools.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sasl/doc/src/systools.xml b/lib/sasl/doc/src/systools.xml
index e7c3c499da..4842c732b1 100644
--- a/lib/sasl/doc/src/systools.xml
+++ b/lib/sasl/doc/src/systools.xml
@@ -349,10 +349,11 @@ myapp-1/ebin/myapp.app
the release version as specified in <c>Name.rel</c>.</p>
<p><c>releases/RelVsn</c> contains the boot script
<c>Name.boot</c> renamed to <c>start.boot</c> and, if found,
- the files <c>relup</c> and <c>sys.config</c>. These files
+ the files <c>relup</c> and <c>sys.config</c> or <c>sys.config.src</c>. These files
are searched for in the same directory as <c>Name.rel</c>,
in the current working directory, and in any directories
- specified using option <c>path</c>.</p>
+ specified using option <c>path</c>. In the case of <c>sys.config</c>
+ it is not included if <c>sys.config.src</c> is found.</p>
<p>If the release package is to contain a new Erlang runtime
system, the <c>bin</c> directory of the specified runtime
system <c>{erts,Dir}</c> is copied to <c>erts-ErtsVsn/bin</c>.</p>
@@ -397,4 +398,3 @@ myapp-1/ebin/myapp.app
<seealso marker="script"><c>script(4)</c></seealso></p>
</section>
</erlref>
-