diff options
| author | Lukas Larsson <[email protected]> | 2017-04-25 11:01:10 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-04-25 11:01:10 +0200 |
| commit | 6b57999ee020e5b1ebd8781ad7008b14cdd49688 (patch) | |
| tree | 0adbdb7225eec95ea456d8cf74d5a210ce5f219d /erts/doc | |
| parent | 0eb103aa9e05b88e4c4337973b16ed2a7e0039f7 (diff) | |
| parent | 8434b76e48b4ad1fe47b1d38dc3cac0b50d7d52d (diff) | |
| download | otp-6b57999ee020e5b1ebd8781ad7008b14cdd49688.tar.gz otp-6b57999ee020e5b1ebd8781ad7008b14cdd49688.tar.bz2 otp-6b57999ee020e5b1ebd8781ad7008b14cdd49688.zip | |
Merge branch 'lukas/erts/deprecate-non-smp/OTP-14272'
* lukas/erts/deprecate-non-smp/OTP-14272:
erts: Fix testcases for smp +S 1:1
erts: Deprecate the non-smp emulators
Diffstat (limited to 'erts/doc')
| -rw-r--r-- | erts/doc/src/erl.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml index 29fef7348b..829acd1154 100644 --- a/erts/doc/src/erl.xml +++ b/erts/doc/src/erl.xml @@ -513,11 +513,11 @@ system with SMP support is available. <c>-smp auto</c> starts the Erlang runtime system with SMP support enabled if it is available and more than one logical processor is detected. - <c>-smp disable</c> starts a runtime system without SMP support.</p> + <c>-smp disable</c> starts a runtime system without SMP support. + The runtime system without SMP support is deprecated and will + be removed in a future major release.</p> <note> - <p>The runtime system with SMP support is not available on all - supported platforms. See also flag - <seealso marker="#+S"><c>+S</c></seealso>.</p> + <p>See also flag<seealso marker="#+S"><c>+S</c></seealso>.</p> </note> </item> <tag><c><![CDATA[-version]]></c> (emulator flag)</tag> |