aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-05-13 09:40:16 +0200
committerHenrik Nord <[email protected]>2015-05-13 09:40:16 +0200
commit9a81b28598fadc44bf506354c9227e41aac786f6 (patch)
tree67b1db67c5050ce5cf37a182841ab34c6cbc5fe9 /lib/kernel
parent6a3e878126da1e8d75c704510c7a7339ff306138 (diff)
downloadotp-9a81b28598fadc44bf506354c9227e41aac786f6.tar.gz
otp-9a81b28598fadc44bf506354c9227e41aac786f6.tar.bz2
otp-9a81b28598fadc44bf506354c9227e41aac786f6.zip
Revert "Prepare release"
This reverts commit e09dd66dc4d89c62ddfd8c19791f9678d5d787c6.
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/doc/src/notes.xml73
-rw-r--r--lib/kernel/vsn.mk2
2 files changed, 1 insertions, 74 deletions
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index 0bd9a067ca..6f7f18a8e7 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -30,79 +30,6 @@
</header>
<p>This document describes the changes made to the Kernel application.</p>
-<section><title>Kernel 4.0</title>
-
- <section><title>Fixed Bugs and Malfunctions</title>
- <list>
- <item>
- <p>
- Fix error handling in <c>file:read_line/1</c> for Unicode
- contents.</p>
- <p>
- Own Id: OTP-12144</p>
- </item>
- <item>
- <p>
- Introduce <c>os:getenv/2</c> which is similar to
- <c>os:getenv/1</c> but returns the passed default value
- if the required environment variable is undefined.</p>
- <p>
- Own Id: OTP-12342</p>
- </item>
- <item>
- <p>
- It is now possible to paste text in JCL mode (using
- Ctrl-Y) that has been copied in the previous shell
- session. Also a bug that caused the JCL mode to crash
- when pasting text has been fixed.</p>
- <p>
- Own Id: OTP-12673</p>
- </item>
- </list>
- </section>
-
-
- <section><title>Improvements and New Features</title>
- <list>
- <item>
- <p>
- New BIF: <c>erlang:get_keys/0</c>, lists all keys
- associated with the process dictionary. Note:
- <c>erlang:get_keys/0</c> is auto-imported.</p>
- <p>
- *** POTENTIAL INCOMPATIBILITY ***</p>
- <p>
- Own Id: OTP-12151 Aux Id: seq12521 </p>
- </item>
- <item>
- <p>
- The internal group to user_drv protocol has been changed
- to be synchronous in order to guarantee that output sent
- to a process implementing the user_drv protocol is
- printed before replying. This protocol is used by the
- standard_output device and the ssh application when
- acting as a client. </p>
- <p>
- This change changes the previous unlimited buffer when
- printing to standard_io and other devices that end up in
- user_drv to 1KB.</p>
- <p>
- *** POTENTIAL INCOMPATIBILITY ***</p>
- <p>
- Own Id: OTP-12240</p>
- </item>
- <item>
- <p>The <c>inflateInit/2</c> and <c>deflateInit/6</c>
- functions now accepts a WindowBits argument equal to 8
- and -8.</p>
- <p>
- Own Id: OTP-12564</p>
- </item>
- </list>
- </section>
-
-</section>
-
<section><title>Kernel 3.2</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index c912da0091..e1d447a465 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 4.0
+KERNEL_VSN = 3.2