aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src/erl.xml
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2010-08-30 12:09:27 +0200
committerRickard Green <[email protected]>2010-08-30 12:09:27 +0200
commit4f100fff5844f7af08b1d9be23e990e4a48b27de (patch)
treecc3ce0245cfb7d57bc68ec648631ddf3c2329faf /erts/doc/src/erl.xml
parentc4e5b4fe014cdfdddee8a37e2cee98677a6ec5ac (diff)
parentd389ff6f96cbd855e95a7455407b6140f1601d0f (diff)
downloadotp-4f100fff5844f7af08b1d9be23e990e4a48b27de.tar.gz
otp-4f100fff5844f7af08b1d9be23e990e4a48b27de.tar.bz2
otp-4f100fff5844f7af08b1d9be23e990e4a48b27de.zip
Merge branch 'rickard/cpu-info/OTP-8765' into dev
* rickard/cpu-info/OTP-8765: Initialize environment functionality after thread lib Fix faulty assertions Implement automatic detection of CPU topology on Windows Make it possible to reread and update detected CPU information
Diffstat (limited to 'erts/doc/src/erl.xml')
-rw-r--r--erts/doc/src/erl.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index 0e26d62548..f477280a6f 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -685,8 +685,8 @@
<seealso marker="erlang#system_flag_scheduler_bind_type">erlang:system_flag(scheduler_bind_type, default_bind)</seealso>.
</p></item>
</taglist>
- <p>Binding of schedulers are currently only supported on newer
- Linux and Solaris systems.</p>
+ <p>Binding of schedulers is currently only supported on newer
+ Linux, Solaris, and Windows systems.</p>
<p>If no CPU topology is available when the <c>+sbt</c> flag
is processed and <c>BindType</c> is any other type than
<c>u</c>, the runtime system will fail to start. CPU