4 files changed, 46 insertions, 17 deletions
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index 9724a1345a..f8f4d14436 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -495,7 +495,7 @@
           <c><![CDATA[werl]]></c>, not <c><![CDATA[erl]]></c> (<c><![CDATA[oldshell]]></c>). Note also that
           <c><![CDATA[Ctrl-Break]]></c> is used instead of <c><![CDATA[Ctrl-C]]></c> on Windows.</p>
       </item>
-      <tag><c><![CDATA[+c]]></c></tag>
+      <tag><marker id="+c"><c><![CDATA[+c]]></c></marker></tag>
       <item>
         <p>Disable compensation for sudden changes of system time.</p>
         <p>Normally, <c><![CDATA[erlang:now/0]]></c> will not immediately reflect
@@ -510,6 +510,9 @@
           reflect the current system time. Note that timers are based
           on <c><![CDATA[erlang:now/0]]></c>. If the system time jumps, timers
           then time out at the wrong time.</p>
+        <p><em>NOTE</em>: You can check whether the adjustment is enabled or
+          disabled by calling
+	  <seealso marker="erlang#system_info_tolerant_timeofday">erlang:system_info(tolerant_timeofday)</seealso>.</p>
       </item>
       <tag><c><![CDATA[+d]]></c></tag>
       <item>
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index e7e9b218f2..9ad42374bf 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -4842,6 +4842,8 @@ true</pre>
           <c><anno>Node</anno></c> does not exist, a useless pid is returned.
           Otherwise works like
           <seealso marker="#spawn_opt/4">spawn_opt/4</seealso>.</p>
+	  <note><p>The <c>monitor</c> option is currently not supported by
+	  <c>spawn_opt/5</c>.</p></note>
       </desc>
     </func>
     <func>
@@ -6293,6 +6295,13 @@ ok
               (<seealso marker="erts:erl_driver#driver_async">driver_async()</seealso>)
               as an integer.</p>
           </item>
+          <tag><marker id="system_info_tolerant_timeofday"><c>tolerant_timeofday</c></marker></tag>
+          <item>
+            <p>Returns whether compensation for sudden changes of system
+              time is <c>enabled</c> or <c>disabled</c>.</p>
+            <p>See also <seealso marker="erts:erl#+c">+c</seealso>
+              command line flag.</p>
+          </item>
           <tag><c>trace_control_word</c></tag>
           <item>
             <p>Returns the value of the node's trace control word.
diff --git a/erts/doc/src/erts_alloc.xml b/erts/doc/src/erts_alloc.xml
index c9eca39a99..1ade41f1aa 100644
--- a/erts/doc/src/erts_alloc.xml
+++ b/erts/doc/src/erts_alloc.xml
@@ -4,7 +4,7 @@
 <cref>
   <header>
     <copyright>
-      <year>2002</year><year>2013</year>
+      <year>2002</year><year>2014</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -531,15 +531,9 @@
        <p>Multiple, thread specific instances of the allocator.
        This option will only have any effect on the runtime system
        with SMP support. Default behaviour on the runtime system with
-       SMP support:</p>
-       <taglist>
-         <tag><c>ll_alloc</c></tag>
-	 <item><c>1</c> instance.</item>
-         <tag>Other allocators</tag>
-	 <item><c>NoSchedulers+1</c> instances. Each scheduler will use
-	 a lock-free instance of its own and other threads will use
-	 a common instance.</item>
-       </taglist>
+       SMP support is <c>NoSchedulers+1</c> instances. Each scheduler will use
+       a lock-free instance of its own and other threads will use
+       a common instance.</p>
        <p>It was previously (before ERTS version 5.9) possible to configure
        a smaller amount of thread specific instances than schedulers.
        This is, however, not possible any more.</p>
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index eba4cdf06f..6b3e41c1f2 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -30,6 +30,29 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 6.0.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix broken system monitoring of <c>large_heap</c> for
+	    non-smp VM. No message for <c>large_heap</c> was ever
+	    sent on non-smp VM. Bug exist since R16B.</p>
+          <p>
+	    Own Id: OTP-11852</p>
+        </item>
+        <item>
+          <p>
+	    Fixed type spec of <c>erlang:system_info/1</c>.</p>
+          <p>
+	    Own Id: OTP-11859 Aux Id: OTP-11615 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 6.0</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -572,9 +595,9 @@
 	    "hi" := V1, a := V2, b := V3} = M2. % match keys with
 	    values</c></item> </taglist></p>
           <p>
-	    For information on how to use Maps please see the
-	    <seealso marker="doc/reference_manual:maps">Reference
-	    Manual</seealso>.</p>
+	    For information on how to use Maps please see Map Expressions in the
+		<seealso marker="doc/reference_manual:expressions#map_expressions">
+			Reference Manual</seealso>.</p>
           <p>
 	    The current implementation is without the following
 	    features: <taglist> <item>No variable keys</item>
@@ -4831,7 +4854,7 @@
         <item>
           <p>
 	    The <c>configure</c> command line argument <seealso
-	    marker="doc/installation_guide:INSTALL#How-to-Build-and-Install-ErlangOTP_A-Closer-Look-at-the-individual-Steps_Configuring">--enable-ethread-pre-pentium4-compatibility</seealso>
+	    marker="doc/installation_guide:INSTALL#Advanced-configuration-and-build-of-ErlangOTP">--enable-ethread-pre-pentium4-compatibility</seealso>
 	    had no effect. This option is now also automatically
 	    enabled if required on the build machine.</p>
           <p>
@@ -5410,7 +5433,7 @@
 	    platforms than before. If <c>configure</c> warns about no
 	    atomic implementation available, try using the
 	    <c>libatomic_ops</c> library. Use the <seealso
-	    marker="doc/installation_guide:INSTALL#How-to-Build-and-Install-ErlangOTP_A-Closer-Look-at-the-individual-Steps_Configuring">--with-libatomic_ops=PATH</seealso>
+	    marker="doc/installation_guide:INSTALL#Advanced-configuration-and-build-of-ErlangOTP">--with-libatomic_ops=PATH</seealso>
 	    <c>configure</c> command line argument when specifying
 	    where the <c>libatomic_ops</c> installation is located.
 	    The <c>libatomic_ops</c> library can be downloaded from:
@@ -5428,7 +5451,7 @@
 	    the pentium 4 processor. If you want the runtime system
 	    to be compatible with older processors (back to 486) you
 	    need to pass the <seealso
-	    marker="doc/installation_guide:INSTALL#How-to-Build-and-Install-ErlangOTP_A-Closer-Look-at-the-individual-Steps_Configuring">--enable-ethread-pre-pentium4-compatibility</seealso>
+	    marker="doc/installation_guide:INSTALL#Advanced-configuration-and-build-of-ErlangOTP">--enable-ethread-pre-pentium4-compatibility</seealso>
 	    <c>configure</c> command line argument when configuring
 	    the system.</p>
           <p>