diff options
| author | Hans Bolinder <[email protected]> | 2016-09-02 08:40:50 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2016-09-02 08:40:50 +0200 |
| commit | 507016a45878f414951ce0d0b5e4417ccff9cd0e (patch) | |
| tree | 5e266cd714f5c0410a53958c6c8a8d3c11697f5d /lib/sasl/doc/src/systools.xml | |
| parent | 38daafda48a5d3ecc20eddc3372daeedbe152f0f (diff) | |
| parent | db096ad15022ae4f9605fa42bf74780641dc6dac (diff) | |
| download | otp-507016a45878f414951ce0d0b5e4417ccff9cd0e.tar.gz otp-507016a45878f414951ce0d0b5e4417ccff9cd0e.tar.bz2 otp-507016a45878f414951ce0d0b5e4417ccff9cd0e.zip | |
Merge branch 'maint'
* maint:
doc: Correct errors introduced by Editorial changes
Diffstat (limited to 'lib/sasl/doc/src/systools.xml')
| -rw-r--r-- | lib/sasl/doc/src/systools.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sasl/doc/src/systools.xml b/lib/sasl/doc/src/systools.xml index 7446762de4..fa503fa573 100644 --- a/lib/sasl/doc/src/systools.xml +++ b/lib/sasl/doc/src/systools.xml @@ -85,7 +85,7 @@ </item> <item> <p>If the emulator needs to be restarted after upgrading or - downgrading, that is, if the <c>ERTS</c> version differs + downgrading, that is, if the ERTS version differs between <c>Name.rel</c> and <c>Name2.rel</c></p> </item> </list> @@ -201,10 +201,10 @@ between the applications. Where there are no dependencies, the order in the <c>.rel</c> file is kept.</p> <p>The function fails if the mandatory - applications <c>Kernel</c> and <c>STDLIB</c> are not + applications Kernel and STDLIB are not included in the <c>.rel</c> file and have start type <c>permanent</c> (which is default).</p> - <p>If <c>SASL</c> is not included as an application in + <p>If SASL is not included as an application in the <c>.rel</c> file, a warning is issued because such a release cannot be used in an upgrade. To turn off this warning, add option <c>no_warn_sasl</c>.</p> |