From d794ba8845619322639f24602624b9acd71efc98 Mon Sep 17 00:00:00 2001
From: Fredrik Gustafsson <fredrik@erlang.org>
Date: Tue, 30 Jul 2013 15:37:34 +0200
Subject: kernel: clarified inet:parse_address/1 referrering to old code

---
 lib/kernel/doc/src/inet.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/kernel/doc')

diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index 7cd98914d1..f33ea3c57d 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -76,11 +76,11 @@ FFFF::192.168.42.2
                 {16#3ffe,16#b80,16#1f8d,16#2,16#204,16#acff,16#fe17,16#bf38}
 fe80::204:acff:fe17:bf38
                 {16#fe80,0,0,0,0,16#204,16#acff,16#fe17,16#bf38}</code>
-    <p>A function that may be useful is <c>inet_parse:address/1</c>:</p>
+    <p>A function that may be useful is <seealso marker="#parse_address/1">parse_address/1</seealso>:</p>
     <pre>
-1> <input>inet_parse:address("192.168.42.2").</input>
+1> <input>inet:parse_address("192.168.42.2").</input>
 {ok,{192,168,42,2}}
-2> <input>inet_parse:address("FFFF::192.168.42.2").</input>
+2> <input>inet:parse_address("FFFF::192.168.42.2").</input>
 {ok,{65535,0,0,0,0,0,49320,10754}}</pre>
   </description>
 
-- 
cgit v1.2.3


From e547c997a4e516d3474e577bd4747e249303a7c7 Mon Sep 17 00:00:00 2001
From: Fredrik Gustafsson <fredrik@erlang.org>
Date: Tue, 30 Jul 2013 16:06:40 +0200
Subject: kernel: added ntoa documentation and exported it in inet.erl

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

(limited to 'lib/kernel/doc')

diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index f33ea3c57d..254dfbf034 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -374,6 +374,13 @@ fe80::204:acff:fe17:bf38
         </taglist>
       </desc>
     </func>
+    <func>
+      <name name="ntoa" arity="1" />
+      <fsummary>Convert IPv6 / IPV4 adress to ascii</fsummary>
+      <desc>
+	<p>Parses an <a href="#type-ip_address">ip_address()</a> and returns an IPv4 or IPv6 address string.</p>
+      </desc>
+    </func>
     <func>
       <name name="parse_ipv4_address" arity="1" />
       <fsummary>Parse an IPv4 address</fsummary>
-- 
cgit v1.2.3