From 1bc59d68f5d22650fa18aa064ed8e50fc9a6a216 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sun, 2 Nov 2014 19:49:55 +0300
Subject: Expose NIF version

This patch allows checking for NIF API version in a way similar to
driver version. E.g. by calling erlang:system_info(nif_version).

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
 erts/doc/src/erlang.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'erts/doc')

diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 111756407f..483d81cfb6 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -6144,6 +6144,11 @@ ok
               <seealso marker="#system_info_multi_scheduling">erlang:system_info(multi_scheduling)</seealso>, and
               <seealso marker="#system_info_schedulers">erlang:system_info(schedulers)</seealso>.</p>
           </item>
+          <tag><c>nif_version</c></tag>
+          <item>
+            <p>Returns a string containing the erlang NIF version
+              used by the runtime system. It will be on the form "&lt;major ver&gt;.&lt;minor ver&gt;".</p>
+          </item>
           <tag><marker id="system_info_otp_release"><c>otp_release</c></marker></tag>
           <item>
             <p>Returns a string containing the OTP release number of the
-- 
cgit v1.2.3


From f482c5cc6dc4c23d39319586c3e1049e859a6f01 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Tue, 4 Nov 2014 12:21:27 +0100
Subject: Prepare release

---
 erts/doc/src/notes.xml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'erts/doc')

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 743369951f..7bc39fd351 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -30,6 +30,31 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 6.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix bug when an migrated empty memory carrier is reused
+	    just before it should be destroyed by the thread that
+	    created it.</p>
+          <p>
+	    Own Id: OTP-12249</p>
+        </item>
+        <item>
+          <p>
+	    Repair run_erl terminal window size adjustment sent from
+	    to_erl. This was broken in OTP 17.0 which could lead to
+	    strange cursor behaviour in the to_erl shell.</p>
+          <p>
+	    Own Id: OTP-12275 Aux Id: seq12739 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 6.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3


From 3b7508f6e75fd304736145528b53652f839a9b46 Mon Sep 17 00:00:00 2001
From: Sina Samavati <sina.samv@gmail.com>
Date: Mon, 10 Nov 2014 16:01:53 +0330
Subject: Fix a typo in the zlib documentation

---
 erts/doc/src/zlib.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'erts/doc')

diff --git a/erts/doc/src/zlib.xml b/erts/doc/src/zlib.xml
index 11a7437f5a..da8ccdecdf 100644
--- a/erts/doc/src/zlib.xml
+++ b/erts/doc/src/zlib.xml
@@ -302,7 +302,7 @@ list_to_binary([B1,B2])</pre>
       <fsummary>Decompress data</fsummary>
       <desc>
         <p><c>inflate/2</c> decompresses as much data as possible.
-          It may some introduce some output latency (reading
+          It may introduce some output latency (reading
           input without producing any output).</p>
         <p>If a preset dictionary is needed at this point (see
           <c>inflateSetDictionary</c> below), <c>inflate/2</c> throws a
-- 
cgit v1.2.3