From 82e5a5df18e21e4220e51d89c666d1da70f12ec1 Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Fri, 26 Jan 2018 15:25:23 +0100
Subject: Implement function for IPv4-mapped IPv6 addresses

---
 lib/kernel/doc/src/inet.xml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'lib/kernel/doc/src')

diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index abb045b744..5c56247820 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2017</year>
+      <year>1997</year><year>2018</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -581,6 +581,19 @@ get_tcpi_sacked(Sock) ->
       </desc>
     </func>
 
+    <func>
+      <name name="ipv4_mapped_ipv6_address" arity="1" />
+      <fsummary>Convert to and from IPv4-mapped IPv6 address.</fsummary>
+      <desc>
+	<p>
+	  Convert an IPv4 address to an IPv4-mapped IPv6 address
+	  or the reverse.  When converting from an IPv6 address
+	  all but the 2 low words are ignored so this function also
+	  works on some other types of addresses than IPv4-mapped.
+	</p>
+      </desc>
+    </func>
+
     <func>
       <name name="parse_strict_address" arity="1" />
       <fsummary>Parse an IPv4 or IPv6 address strict.</fsummary>
-- 
cgit v1.2.3