From 209655e30a82cdf172211278e01807024eed4130 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Tue, 8 Jan 2013 15:44:45 +0100
Subject: Add +stbt erl command line switch

---
 erts/doc/src/erl.xml | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'erts/doc/src/erl.xml')

diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index f931445a3e..5714383b0f 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -657,7 +657,24 @@
         <taglist>
           <tag><marker id="+sbt"><c>+sbt BindType</c></marker></tag>
           <item>
-            <p>Set scheduler bind type. Currently valid <c>BindType</c>s:
+            <p>Set scheduler bind type.</p>
+	    <p>Schedulers can also be bound using the
+	    <seealso marker="#+stbt">+stbt</seealso> flag. The only difference
+	    between these two flags is how the following errors are handled:</p>
+	    <list>
+	      <item>Binding of schedulers is not supported on the specific
+	      platform.</item>
+	      <item>No available CPU topology. That is the runtime system
+	      was not able to automatically detected the CPU topology, and
+	      no <seealso marker="#+sct">user defined CPU topology</seealso>
+	      was set.</item>
+	    </list>
+	    <p>If any of these errors occur when <c>+sbt</c> has been passed,
+	    the runtime system will print an error message, and refuse to
+	    start. If any of these errors occur when <c>+stbt</c> has been
+	    passed, the runtime system will silently ignore the error, and
+	    start up using unbound schedulers.</p>
+	    <p>Currently valid <c>BindType</c>s:
 	    </p>
 	    <taglist>
 	      <tag><c>u</c></tag>
@@ -907,6 +924,14 @@
 	    <p>For more information, see
 	    <seealso marker="erlang#system_info_cpu_topology">erlang:system_info(cpu_topology)</seealso>.</p>
           </item>
+          <tag><marker id="+stbt"><c>+stbt BindType</c></marker></tag>
+          <item>
+            <p>Try to set scheduler bind type. The same as the
+	    <seealso marker="#+sbt">+sbt</seealso> flag with the exception of
+	    how some errors are handled. For more information, see the
+	    documentation of the <seealso marker="#+sbt">+sbt</seealso> flag.
+	    </p>
+	  </item>
 	  <tag><marker id="+sws"><c>+sws default|legacy|proposal</c></marker></tag>
 	  <item>
              <p>Set scheduler wakeup strategy. Default is <c>legacy</c> (has been
-- 
cgit v1.2.3