diff options
author | Fredrik Gustafsson <[email protected]> | 2013-02-20 11:59:31 +0100 |
---|---|---|
committer | Fredrik Gustafsson <[email protected]> | 2013-02-20 11:59:31 +0100 |
commit | 53f9cfae0612b19e34ec7eb5a404709c449c162c (patch) | |
tree | 47c85618c4a8fdb49488daa8a5a12ec05c0b0e33 /erts/doc/src/erl.xml | |
parent | bc95be2fcdf9ecf27398a6240f2148388ec649ab (diff) | |
parent | d927cfe22aeda6d48bde0f92fb0605f07f5db94a (diff) | |
download | otp-53f9cfae0612b19e34ec7eb5a404709c449c162c.tar.gz otp-53f9cfae0612b19e34ec7eb5a404709c449c162c.tar.bz2 otp-53f9cfae0612b19e34ec7eb5a404709c449c162c.zip |
Merge branch 'fredrik/sws-doc-fix-R16B'
* fredrik/sws-doc-fix-R16B:
Changed documentation for +sws option
Diffstat (limited to 'erts/doc/src/erl.xml')
-rw-r--r-- | erts/doc/src/erl.xml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml index f354d68d45..5bfa518266 100644 --- a/erts/doc/src/erl.xml +++ b/erts/doc/src/erl.xml @@ -985,15 +985,12 @@ documentation of the <seealso marker="#+sbt">+sbt</seealso> flag. </p> </item> - <tag><marker id="+sws"><c>+sws default|legacy|proposal</c></marker></tag> + <tag><marker id="+sws"><c>+sws default|legacy</c></marker></tag> <item> - <p>Set scheduler wakeup strategy. Default is <c>legacy</c> (has been - used since OTP-R13B). The <c>proposal</c> strategy is the currently - proposed strategy for OTP-R16. Note that the <c>proposal</c> strategy - might change during OTP-R15. + <p> + Set scheduler wakeup strategy. Default strategy changed in erts-5.10/OTP-R16A. This strategy was previously known as <c>proposal</c> in OTP-R15. The <c>legacy</c> strategy was used as default from R13 up to and including R15. </p> - <p><em>NOTE:</em> This flag may be removed or changed at any time - without prior notice. + <p><em>NOTE:</em> This flag may be removed or changed at any time without prior notice. </p> </item> <tag><marker id="+swt"><c>+swt very_low|low|medium|high|very_high</c></marker></tag> |