The R14A release

Final merge of all unexpected differences from dev to release.

erts/doc/src/notes.xml

@@ -520,6 +520,41 @@
 
 </section>
 
+<section><title>Erts 5.7.5.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+            Driver threads, such as async threads, using <seealso
+            marker="erl_driver#ErlDrvPDL">port data locks</seealso>
+            peeked at the port status field without proper locking
+            when looking up the driver queue.</p>
+          <p>
+            Own Id: OTP-8475</p>
+        </item>
+        <item>
+          <p>
+            A call to the BIF <c>unregister(RegName)</c> when a port
+            had the name <c>RegName</c> registered in the runtime
+            system without SMP support caused a runtime system crash.
+            (Thanks to Per Hedeland for the bugfix and test case.)</p>
+          <p>
+            Own Id: OTP-8487</p>
+        </item>
+        <item>
+          <p>
+            Fix memory management bug causing crash of non-SMP
+            emulator with async threads enabled. The bug did first
+            appear in R13B03.</p>
+          <p>
+            Own Id: OTP-8591 Aux Id: seq11554 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 5.7.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>

lib/erl_docgen/doc/src/notes.xml

@@ -29,7 +29,25 @@
     <file>notes.xml</file>
   </header>
   <p>This document describes the changes made to the erl_docgen application.</p>
-    <section><title>Erl_Docgen 0.2</title>
+    <section><title>erl_docgen 0.2.1</title>
+
+	<section><title>Fixed Bugs and Malfunctions</title>
+	  <list>
+	    <item>
+	      <p>
+                The text within code examples (CODE and PRE tags) will not be 
+                space normalized for man pages.
+              </p>
+	      <p>
+	        Own Id: OTP-8476
+              </p>
+	    </item>
+	  </list>
+	</section>
+
+    </section>
+
+    <section><title>erl_docgen 0.2</title>
 
 	<section><title>Improvements and New Features</title>
 	  <list>

lib/erl_docgen/priv/xsl/db_man.xsl

@@ -336,6 +336,16 @@
     <xsl:text>&gt;</xsl:text>
   </xsl:template>
 
+  <!-- Do not noramlize any text within pre and code tags. -->
+  <xsl:template match="pre/text()">
+    <xsl:value-of select="."/>
+  </xsl:template>
+
+  <xsl:template match="code/text()">
+    <xsl:value-of select="."/>
+  </xsl:template>
+
+
   <!-- Replace ' by \&' ans . by \&. -->
   <xsl:template match="text()">
     <xsl:variable name="startstring">

lib/erl_docgen/vsn.mk

@@ -17,6 +17,6 @@
 # %CopyrightEnd%
 #
 
-ERL_DOCGEN_VSN = 0.2
+ERL_DOCGEN_VSN = 0.2.1
 
 TICKETS	= 

lib/kernel/doc/src/notes.xml

@@ -114,6 +114,37 @@
 
 </section>
 
+<section><title>Kernel 2.13.5.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+            A bug introduced in Kernel 2.13.5.2 has been fixed.</p>
+          <p>
+	    Own Id: OTP-8686 Aux Id: OTP-8643</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Kernel 2.13.5.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+            Under certain circumstances the net kernel could hang.
+            (Thanks to Scott Lystig Fritchie.)</p>
+          <p>
+	    Own Id: OTP-8643 Aux Id: seq11584</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Kernel 2.13.5.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>

lib/kernel/vsn.mk

@@ -1,4 +1,4 @@
-# 
+#
 # %CopyrightBegin%
 #
 # Copyright Ericsson AB 1997-2010. All Rights Reserved.
@@ -15,6 +15,6 @@
 # under the License.
 #
 # %CopyrightEnd%
-# 
+#
 
 KERNEL_VSN = 2.14