diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-11-13 14:17:26 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-11-13 14:17:26 +0100 |
| commit | 7cf7cad70ec2b10a46b1f1c01a1d609467918492 (patch) | |
| tree | 49943be69110215a353b8a0c2f68b47098d93ee1 /erts/doc | |
| parent | 509163307c31bf4f98a638b47ee03a5b99eb2c73 (diff) | |
| parent | e61f384adff0c9b134750ee239581296d25c10cd (diff) | |
| download | otp-7cf7cad70ec2b10a46b1f1c01a1d609467918492.tar.gz otp-7cf7cad70ec2b10a46b1f1c01a1d609467918492.tar.bz2 otp-7cf7cad70ec2b10a46b1f1c01a1d609467918492.zip | |
Merge branch 'maint' of git-server:otp into maint
Diffstat (limited to 'erts/doc')
| -rw-r--r-- | erts/doc/src/erlang.xml | 5 | ||||
| -rw-r--r-- | erts/doc/src/notes.xml | 25 | ||||
| -rw-r--r-- | erts/doc/src/zlib.xml | 2 |
3 files changed, 31 insertions, 1 deletions
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 "<major ver>.<minor ver>".</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 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> 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 |