3 files changed, 66 insertions, 12 deletions
diff --git a/lib/inets/doc/src/http_uri.xml b/lib/inets/doc/src/http_uri.xml
index 696b7dfa31..acf0d2163a 100644
--- a/lib/inets/doc/src/http_uri.xml
+++ b/lib/inets/doc/src/http_uri.xml
@@ -45,6 +45,7 @@
       this module:</p>
     <p><c>boolean() = true | false</c></p>
     <p><c>string()</c> = list of ASCII characters</p>
+    <p><c>unicode_binary()</c> = binary() with characters encoded in the UTF-8 coding standard</p>
 
   </section>
   
@@ -53,22 +54,22 @@
     <p>Type definitions that are related to URI:</p>
     
 <taglist>
-       <tag><c>uri() = string()</c></tag>
+       <tag><c>uri() = string() | unicode:unicode_binary()</c></tag>
        <item><p>Syntax according to the URI definition in RFC 3986,
        for example, "http://www.erlang.org/"</p></item>
-       <tag><c>user_info() = string()</c></tag>
+       <tag><c>user_info() = string() | unicode:unicode_binary()</c></tag>
        <item><p></p></item>
        <tag><c>scheme() = atom()</c></tag>
        <item><p>Example: http, https</p></item>
-       <tag><c>host() = string()</c></tag>
+       <tag><c>host() = string() | unicode:unicode_binary()</c></tag>
        <item><p></p></item>
        <tag><c>port() = pos_integer()</c></tag>
        <item><p></p></item>
-       <tag><c>path() = string()</c></tag>
+       <tag><c>path() = string() | unicode:unicode_binary()</c></tag>
        <item><p>Represents a file path or directory path</p></item>
-       <tag><c>query() = string()</c></tag>
+       <tag><c>query() = string() | unicode:unicode_binary()</c></tag>
        <item><p></p></item>
-       <tag><c>fragment() = string()</c></tag>
+       <tag><c>fragment() = string() | unicode:unicode_binary()</c></tag>
        <item><p></p></item>
      </taglist>
    
@@ -83,7 +84,7 @@
       
       <fsummary>Decodes a hexadecimal encoded URI.</fsummary>
       <type>
-        <v>HexEncodedURI = string() - A possibly hexadecimal encoded URI</v>
+        <v>HexEncodedURI = string() | unicode:unicode_binary() - A possibly hexadecimal encoded URI</v>
         <v>URI = uri()</v>
       </type>
 
@@ -98,7 +99,7 @@
       <fsummary>Encodes a hexadecimal encoded URI.</fsummary>
       <type>
         <v>URI = uri()</v>
-        <v>HexEncodedURI = string() - Hexadecimal encoded URI</v>
+        <v>HexEncodedURI = string() | unicode:unicode_binary() - Hexadecimal encoded URI</v>
       </type>
 
       <desc>
@@ -145,7 +146,7 @@
         <p>Scheme validation fun is to be defined as follows:</p>
 
 	<code>
-fun(SchemeStr :: string()) ->
+fun(SchemeStr :: string() | unicode:unicode_binary()) ->
 	valid |	{error, Reason :: term()}.
 	</code>
 
diff --git a/lib/inets/doc/src/httpc.xml b/lib/inets/doc/src/httpc.xml
index 4217b3c4fb..46484977c9 100644
--- a/lib/inets/doc/src/httpc.xml
+++ b/lib/inets/doc/src/httpc.xml
@@ -344,7 +344,7 @@
           <tag><c><![CDATA[ssl]]></c></tag>
           <item>
             <p>This is the <c>SSL/TLS</c> connectin configuration option.</p>
-            <p>Defaults to <c>[]</c>. See <seealso marker="ssl:ssl">ssl:connect/[2, 3,4]</seealso>  for availble options.</p>
+            <p>Defaults to <c>[]</c>. See <seealso marker="ssl:ssl">ssl:connect/[2,3,4]</seealso>  for available options.</p>
 	  </item>
 
           <tag><c><![CDATA[autoredirect]]></c></tag>
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 2aa48cd50a..1fad94fac1 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2002</year><year>2016</year>
+      <year>2002</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -33,7 +33,38 @@
     <file>notes.xml</file>
   </header>
   
-  <section><title>Inets 6.3.7</title>
+  <section><title>Inets 6.3.9</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The close of a chunked file reception crashed in a
+	    certain timing sequence.</p>
+          <p>
+	    Own Id: OTP-14391 Aux Id: seq13306 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 6.3.8</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Added missing release note for inets-6.3.7</p>
+          <p>
+	    Own Id: OTP-14383</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 6.3.7</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
@@ -44,6 +75,13 @@
           <p>
 	    Own Id: OTP-14242</p>
         </item>
+
+        <item>
+          <p>Make default port, 80 and 443, implicit in automatic redirection.
+	  </p>
+          <p> Own Id: OTP-14301
+	  </p>
+        </item>        
       </list>
     </section>
 
@@ -361,6 +399,21 @@
 
 </section>
 
+  <section><title>Inets 6.1.1.1</title>
+  
+   <section><title>Fixed Bugs and Malfunctions</title>
+     <list>
+       <item>
+         <p>
+         Mend ipv6_host_with_brackets option in httpc</p>
+         <p>
+         Own Id: OTP-13417</p>
+       </item>
+     </list>
+   </section>
+  
+  </section>
+  
 <section><title>Inets 6.1.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>