Prepare release

2 files changed, 139 insertions, 1 deletions

diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index d0ed674eee..87ebfc3c6a 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,144 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 4.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Updated ssh_connection:shell/2 documentation.</p>
+          <p>
+	    Own Id: OTP-14880</p>
+        </item>
+        <item>
+          <p>
+	    If the daemon port listener is restarted, it could
+	    potentially fail with <c>eaddrinuse</c> if the timing is
+	    unlucky. It will now retry and exponentially back off the
+	    listener restart a few times before failing.</p>
+          <p>
+	    Own Id: OTP-14955</p>
+        </item>
+        <item>
+          <p>
+	    A channel callback module always got the module name as
+	    reason in a call to terminate. Now it will get the proper
+	    Reason, usually 'normal'.</p>
+          <p>
+	    Own Id: OTP-15084</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    An option <c>exec</c> for daemons implementing the 'exec'
+	    has existed a long time but has been undocumented. The
+	    old behaviour is kept for compatibility EXCEPT that error
+	    messages are changed and are sent as "stderror" text.</p>
+          <p>
+	    A new option value is defined to make it much more easy
+	    to implement an own <c>exec</c> server.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-14851</p>
+        </item>
+        <item>
+          <p>
+	    The undocumented ssh_dbg module is completely re-written
+	    to facilitate tracing/debugging.</p>
+          <p>
+	    Own Id: OTP-14896</p>
+        </item>
+        <item>
+          <p>
+	    The SSH supervisor structure has been slightly changed.
+	    This makes stopping the ssh application considerably
+	    faster if there are open connections. This is important
+	    in for example restarts.</p>
+          <p>
+	    Own Id: OTP-14988</p>
+        </item>
+        <item>
+          <p>
+	    The type specifications in SSH are reworked and the
+	    following types are renamed:</p>
+          <p>
+	    ssh:ssh_connection_ref() is changed to
+	    ssh:connection_ref(), </p>
+          <p>
+	    ssh:ssh_daemon_ref() is changed to ssh:daemon_ref(),</p>
+          <p>
+	    ssh:ssh_channel_id() is changed to ssh:channel_id().</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15002 Aux Id: OTP-15030 </p>
+        </item>
+        <item>
+          <p>
+	    The internal timer handling in SSH is now based on the
+	    gen_statem timers.</p>
+          <p>
+	    Own Id: OTP-15019</p>
+        </item>
+        <item>
+          <p>
+	    Removed unused <c>ssh_client_key.erl</c> and
+	    <c>ssh_server_key.erl</c>.</p>
+          <p>
+	    Own Id: OTP-15028</p>
+        </item>
+        <item>
+          <p>
+	    The Reference Manual pages are partly updated.</p>
+          <p>
+	    The ssh page is now generated from specs and types, is
+	    restructured and is partly rephrased.</p>
+          <p>
+	    The ssh_channel, ssh_connection, ssh_client_key_api,
+	    ssh_server_key_api and ssh_sftp pages are updated with
+	    links, correct type names and some minor changes.</p>
+          <p>
+	    Own Id: OTP-15030 Aux Id: OTP-15002 </p>
+        </item>
+        <item>
+          <p>
+	    The behaviors <c>ssh_channel</c> and
+	    <c>ssh_daemon_channel</c> are renamed to
+	    <c>ssh_client_channel</c> and <c>ssh_server_channel</c>
+	    respectively.</p>
+          <p>
+	    The old modules are kept for compatibility but should
+	    preferably be replaced when updating callback modules
+	    referring them.</p>
+          <p>
+	    Own Id: OTP-15041</p>
+        </item>
+        <item>
+          <p>
+	    The <c>rekey_limit</c> option could now set the max time
+	    as well as the previously max data amount.</p>
+          <p>
+	    Own Id: OTP-15069 Aux Id: ERL-617 </p>
+        </item>
+        <item>
+          <p>
+	    Change process exit supervision with monitor instead of
+	    link</p>
+          <p>
+	    Own Id: OTP-15082</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 4.6.9</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index f10e7aa96a..6060e50d31 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,5 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 4.6.9
+SSH_VSN = 4.7
 
 APP_VSN    = "ssh-$(SSH_VSN)"