From 6eb2a1e497207ca5bc94ddb7a89c2192fcbdd03b Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Wed, 21 Feb 2018 15:09:53 +0100
Subject: Prepare release

---
 lib/ssh/doc/src/notes.xml | 36 ++++++++++++++++++++++++++++++++++++
 lib/ssh/vsn.mk            |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 3a2f55a487..c559da911b 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,42 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 4.6.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Adjusted supervisor timeouts</p>
+          <p>
+	    Own Id: OTP-14907</p>
+        </item>
+        <item>
+          <p>
+	    Remove ERROR messages for slow process exits</p>
+          <p>
+	    Own Id: OTP-14930</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Add option <c>save_accepted_host</c> to
+	    <c>ssh:connection</c>. This option, if set to false,
+	    inhibits saving host keys to e.g the file
+	    <c>known_hosts</c>.</p>
+          <p>
+	    Own Id: OTP-14935</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 4.6.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 004db6e3a2..6aaa22a6b4 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.4
+SSH_VSN = 4.6.5
 
 APP_VSN    = "ssh-$(SSH_VSN)"
-- 
cgit v1.2.3